haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-30 22:34:53 +00:00
Code Issues Releases Wiki Activity
9,597 Commits 138 Branches 455 Tags 2.4 GiB
0e661f43a3
Commit Graph

484 Commits

Author SHA1 Message Date
lian
18c60fd306 update cp/mv file/dir 2017-01-19 14:40:49 +08:00
lian
cb837d5112 rm ajax toggle_group_modules 2017-01-19 14:40:49 +08:00
lian
734263b76e update cancel_cp 2017-01-19 14:40:49 +08:00
lian
4a120b5aa5 update cp_progress 2017-01-19 14:40:49 +08:00
lian
d05f72b7a0 update user personal wiki module 2017-01-19 14:40:49 +08:00
lian
7472c03bec rm user message related code 2017-01-19 14:40:49 +08:00
lian
312500c55e rm get_my_unenc_repos 2017-01-19 14:40:49 +08:00
lian
86f948aaa8 update set_notice_seen_by_id 2017-01-19 14:40:49 +08:00
lian
5a700d5f00 update set_notices_seen 2017-01-19 14:40:49 +08:00
lian
996c67fdb7 rm get_user_contacts 2017-01-19 14:40:49 +08:00
lian
8d62d3786e update get unseen notifications count 2017-01-19 14:40:49 +08:00
zhengxie
4ec3aaeafb Add ADFS auth 2017-01-12 14:47:21 +08:00
zhengxie
4ceddf23ab Update demo account url 2016-10-18 10:38:25 +08:00
lian
58737d62f7 update revert file/dir 2016-09-13 11:16:12 +08:00
lian
5c59b81466 add new admin share api 2016-08-16 10:19:56 +08:00
lian
92df1ef8d2 admin manage repo share 2016-08-10 10:21:19 +08:00
lian
d142f2ddc1 update usage of seafile_api & test 2016-08-01 14:38:54 +08:00
Daniel Pan
26d2a4d774 Merge pull request #1299 from haiwen/terms 
Terms
 2016-07-27 13:54:04 +08:00
Daniel Pan
02a8ae394b Merge pull request #1290 from haiwen/admin-groups 
new admin groups page
 2016-07-26 15:52:42 +08:00
zhengxie
5a2af77d44 Add copyright header 2016-07-26 10:51:29 +08:00
zhengxie
0f73921205 Update T&C 
Conflicts:
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/sysadmin/base.html
	seahub/urls.py
	seahub/views/sysadmin.py
 2016-07-22 16:39:05 +08:00
zhengxie
57cc2b4aba Merge branch '5.1' 
Conflicts:
	seahub/base/accounts.py
	seahub/share/views.py
	seahub/views/sysadmin.py
	tests/seahub/base/test_accounts.py
	tests/seahub/share/views/test_ajax_get_download_link.py
	tests/seahub/share/views/test_ajax_get_upload_link.py
 2016-07-21 10:55:50 +08:00
lian
744efb2322 new admin groups page 2016-07-20 17:23:07 +08:00
zhengxie
7452c0cfc2 [api] Add guest invite feature 2016-07-20 15:38:15 +08:00
lian
6dca56e9d5 update download dir/multi 2016-07-04 15:31:55 +08:00
lian
c4fa072dc7 new share admin page (#1233) 2016-06-30 15:06:43 +08:00
Daniel Pan
e7aaae4363 Merge pull request #1251 from haiwen/trash-pagination 
[system admin] trash repos: list by page
 2016-06-27 11:01:44 +08:00
lian
93450debf7 update sysinfo api (#1254) 
only return useful info of license
 2016-06-22 11:31:14 +08:00
Daniel Pan
cf1017513a Code clean (#1217) 
* Use API to create file/folder instead of Ajax
* Remove sub_repo AJAX api
* Remove repo delete AJAX function
* Remove get_group_basic_info
* Add comment for get_unenc_group_repos
* Remove ajax_repo_change_basic_info and ajax_repo_transfer_owner
* Remove ajax_unset_inner_pub_repe and RepoPublic
* Remove ajax star/unstar a file
* update be shared repo api
* update test public repo
* Remove ajax_repo_remove_share
 2016-06-20 18:34:30 +08:00
llj
18a800cb5d [system admin] trash repos: list by page 2016-06-20 15:47:26 +08:00
llj
8c2e16ca36 [system repo admin] fix, improvement, supplement, clean 2016-06-14 14:47:44 +08:00
lian
72f4297934 new admin libraries page 2016-06-14 14:46:13 +08:00
Daniel Pan
b567379c2c Merge branch '5.1' 
Conflicts:
	seahub/templates/registration/password_change_form.html
	seahub/templates/sysadmin/base.html
	seahub/templates/sysadmin/sysadmin_backbone.html
 2016-06-13 18:25:20 +08:00
zhengxie
3fac2a79c2
[inst] Add search user and list admins 2016-06-08 16:56:52 +08:00
Daniel Pan
ee99d7aad8 Merge branch '5.1' 
Conflicts:
	seahub/group/templates/group/group_base.html
	seahub/templates/home_base.html
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/js/templates.html
	seahub/templates/libraries.html
	seahub/templates/pub_base.html
	static/scripts/app/views/group-discussions.js
 2016-05-21 13:42:04 +08:00
llj
35f7389227 layout: fix pages; rm unused code & files 2016-05-10 17:11:35 +08:00
lian
7fc60fb5cc update share link api url to make it more RESTful 2016-05-10 10:44:28 +08:00
lian
419645fdc2 add download multi dirents api 2016-04-28 15:16:58 +08:00
lian
bc2828969d new admin devices page; 2016-04-23 18:07:09 +08:00
Daniel Pan
bcc4e42142 Implement Sysinfo 2016-04-23 17:14:01 +08:00
Daniel Pan
899f5241d4 Reimplement sysadmin with backbone 2016-04-23 17:13:32 +08:00
lian
989ca5b600 update url of admin log api 2016-04-14 17:41:35 +08:00
zhengxie
b96672bc1c
Merge branch '5.0' 
Conflicts:
	seahub/urls.py
 2016-04-13 10:59:32 +08:00
lian
05d01cb356 add admin log api 2016-04-12 17:37:16 +08:00
zhengxie
e86118cfbc Update virus mail 2016-04-09 14:35:45 +08:00
zhengxie
b95a675050 [shib] Add shibboleth SSO success page for seafile zimlet 2016-04-05 16:32:27 +08:00
lian
6f658cc61b rm file-priv-share related code 2016-03-30 15:02:31 +08:00
llj
fa022ed9df [group discuss] add notice when post a discussion; removed unused files and code 2016-03-28 13:48:07 +08:00
zhengxie
65a336f573 [shib] Add shibboleth complete page 2016-03-24 16:25:45 +08:00
lian
69cbd56064 add new api & update code 
1. add new repo set password api
2. update repo url related code
 2016-03-21 15:38:22 +08:00
zhengxie
3aa29e5b1f [inst] Add institution feature 2016-03-17 13:57:43 +08:00
lian
a43b3f969e new devices page 2016-03-15 18:19:12 +08:00
llj
b51dab76eb [code clean] clean & fix 2016-03-14 19:51:09 +08:00
Daniel Pan
f0e40d9120 Clean public library related code 2016-03-09 20:54:33 +08:00
Daniel Pan
b75e8e8d9c clean code and icons 2016-03-09 15:12:53 +08:00
lian
49ed1fd386 [api-v2.1] add new file/dir api according to old file/dir api 2016-03-09 10:12:16 +08:00
zhengxie
72d30b2495 Merge branch '5.0' 
Conflicts:
	seahub/api2/endpoints/dir_shared_items.py
	seahub/api2/urls.py
	seahub/templates/repo.html
	seahub/utils/http.py
	seahub/views/__init__.py
	seahub/views/ajax.py
	seahub/views/repo.py
	tests/seahub/views/test_libraries.py
 2016-03-07 16:04:36 +08:00
lian
1992912ce1 [api-v2.1] add file share/upload links api 2016-02-26 17:59:05 +08:00
llj
442753f96a [lib setting] added 'change password' for enc libs; removed original setting pages 2016-02-23 19:54:33 +08:00
Daniel Pan
663a00e8ab Merge pull request #1025 from haiwen/5.0-virus-fix 
5.0 virus fix
 2016-02-23 13:49:55 +08:00
zhengxie
ebcd7ed44d [virus] Fix url error when records number more than 9 2016-02-23 11:53:16 +08:00
lian
8124fa4a79 update admin default repo view page & rm unused code 2016-02-19 15:47:04 +08:00
Daniel Pan
feb6f783a9 Merge pull request #992 from haiwen/group_info 
[group info] remove unused code & files, and other modification
 2016-01-13 16:25:08 +08:00
zhengxie
cf3d96b46a Merge branch '5.0' 
Conflicts:
	media/css/sf_font2/seafile-font2.eot
	media/css/sf_font2/seafile-font2.ttf
	media/css/sf_font2/seafile-font2.woff
	requirements.txt
	seahub/api2/endpoints/dir_shared_items.py
	seahub/templates/js/templates.html
	seahub/views/ajax.py
	static/scripts/app/views/group-repo.js
 2016-01-13 10:19:56 +08:00
lian
e75b1891e2 batch load repo/dir trash 2016-01-12 10:19:34 +08:00
llj
5afb6c56b6 [group info] remove unused code & files, and other modification 2016-01-11 14:42:25 +08:00
llj
8337812bae [group manage] remove unused code and file 2016-01-11 11:58:16 +08:00
lian
91211a683b ajax import group members 2016-01-08 15:26:15 +08:00
lian
ea963bb531 update grp api & add group members api 2015-12-31 12:58:48 +08:00
lian
a17025d158 Revert "clean code. remove view_repo_file function" 
This reverts commit d91bdd6305.
 2015-12-28 17:33:14 +08:00
lian
d91bdd6305 clean code. remove view_repo_file function 2015-12-21 14:13:45 +08:00
lian
5bbd92bb6d [api-v2.1] update groups api & add get group members api 2015-12-15 14:38:25 +08:00
xiez
922b4411ba Merge pull request #942 from haiwen/redesign 
Redesign
 2015-12-15 11:59:52 +08:00
llj
03d075a00b [group members] redesigned it 2015-12-11 20:58:29 +08:00
lian
d1bcd3e113 [api2.1] add rename, transfer and delete group api 2015-12-07 11:33:49 +08:00
zhengxie
68efe49481 [django 1.8] WIP 2015-12-05 16:32:01 +08:00
lian
e146e92331 [api2.1] new groups api 2015-12-03 16:45:08 +08:00
zhengxie
9d53430e4c Merge branch '4.4' into 5.0 
Conflicts:
	media/css/seahub.css
	seahub/group/templates/group/group_manage.html
	seahub/utils/__init__.py
	seahub/views/repo.py
	tests/seahub/views/test_file.py
 2015-12-02 17:37:50 +08:00
llj
1c18e3e716 [groups] redesigned it. 2015-12-02 11:39:36 +08:00
lian
643d036942 new file access log page 2015-11-27 10:55:56 +08:00
lian
97621875ac [sysadmin] export users/groups to excel 2015-11-21 10:49:00 +08:00
zhengxie
4cccfd1423 [auth] Add keberos login button 2015-11-17 14:41:10 +08:00
zhengxie
623c4fb5f8 [wiki] Fix inner page links 2015-11-12 10:26:31 +08:00
lian
3bcd5810d0 add trash page for folder & update indentation 2015-10-30 10:38:02 +08:00
llj
3fa2ab6a38 Merge pull request #859 from haiwen/license 
[sys-admin] check seafile license expiration
 2015-10-24 18:27:20 +08:00
lian
5d7761ee0f [sys-admin] check seafile license expiration 2015-10-24 15:53:02 +08:00
zhengxie
e9e8e59512 Refactor remove share, and clean code 2015-10-22 16:01:12 +08:00
xiez
494483f905 Merge pull request #843 from haiwen/sysadmin-view-repo 
enabel sysadmin view user's repo
 2015-10-21 15:22:16 +08:00
lian
c41ff45ea2 enable sysadmin view user's repo 2015-10-21 14:05:46 +08:00
zhengxie
9af79be996 Refactor revert ops 2015-10-20 18:24:27 +08:00
zhengxie
8fd9bebf45 Merge branch '4.4' 
Conflicts:
	seahub/auth/views.py
	seahub/templates/libraries.html
	seahub/templates/sysadmin/sys_admin_group_info.html
	seahub/templates/sysadmin/sys_publink_admin.html
	seahub/templates/sysadmin/userinfo.html
	seahub/urls.py
 2015-10-20 10:27:27 +08:00
zhengxie
54f76e77e5 Remove file private share in urls 2015-10-15 13:29:07 +08:00
zhengxie
6bdd2de0dd Remove repo_access_file function and refactor file_revisions function 2015-10-15 10:49:28 +08:00
zhengxie
1aa145e181 [share] Add owner checking for private file share 2015-10-14 17:01:28 +08:00
xiez
ba222a9665 Merge pull request #824 from haiwen/web-settings-2 
Web settings 2
 2015-10-10 10:39:56 +08:00
zhengxie
4ff4def9a6 [sysadmin] Change a few ops to POST 2015-09-28 14:37:42 +08:00
llj
aa30802fcf redesigned 'repo snapshot' top, deleted 'repo_view_snapshot'(repo snapshot list) 2015-09-23 11:59:58 +08:00
llj
9497b0d61a [library history] redesigned UI of 'modification history' & 'snapshot' pages 2015-09-22 13:59:34 +08:00
zhengxie
49fb5ca174 Add admin settings page to edit some configurations. Install django constance by pip install 'django-constance[database]' 2015-09-21 11:07:42 +08:00
zhengxie
8b1193368b [sysadmin] Enable delete an org 2015-09-17 16:14:09 +08:00
zhengxie
73b818a986 [sysadmin] Show org expiration date and search org 2015-09-15 17:34:30 +08:00
zhengxie
844dcf4a07 [sysadmin] Add virus scan records 2015-08-17 11:20:51 +08:00
llj
57fb0066e3 [file view] redesigned 'pdf file view with pdf.js' 2015-08-13 15:23:52 +08:00
llj
2f2e1b7524 [fileupload] enable resumable fileupload for 'dir view' & 'upload link' 
'resumable' is only enabled for 'upload files',
not for 'add folder' & 'file update'
 2015-08-07 15:03:59 +08:00
Shuai Lin
5dee3d44dc handle office convert perm check in cluster mode 2015-07-17 12:20:02 +08:00
Shuai Lin
fcf2c992ec handle office preview perm check in file revisions 2015-07-16 15:31:01 +08:00
Shuai Lin
075b0d04f6 handle office preview perm check from shared links 2015-07-16 15:28:35 +08:00
Shuai Lin
7f73d26339 improve office preview permission check 2015-07-16 15:28:18 +08:00
lian
2b95f4021a remove pub group tab 2015-07-11 14:26:43 +08:00
Shuai Lin
20ec383ed8 improve office documents online preview 2015-07-01 11:34:37 +08:00
zhengxie
5e9a8a98ce Use email in profile url, and clean code 2015-06-27 14:12:46 +08:00
lian
85f142b0a1 [user-admin] add ldap imported 2015-06-26 14:05:39 +08:00
llj
5a94089ce8 [lib setting] modified 'lib transfer success' 2015-05-26 12:04:29 +08:00
zhengxie
a23cf3db5e [sys admin] Add system info page 2015-05-08 15:21:54 +08:00
Shuai Lin
9b3d989b3c only login the session when necessary 2015-05-06 14:28:00 +08:00
Shuai Lin
c63f68dfc5 support logging in from desktop client directly 2015-05-06 14:28:00 +08:00
Shuai Lin
c449e3842c add "sudo mode": confirm password before doing sysadmin work 2015-05-04 13:57:10 +08:00
lian
2f7de987e9 [sys-admin] remove sys list orphan page 2015-04-27 10:40:01 +08:00
xiez
255cbb98e0 Merge pull request #519 from haiwen/new-url 
new repo/dir/group url
 2015-04-25 15:43:51 +08:00
lian
79efd306a9 new repo/dir/group url 2015-04-25 15:39:06 +08:00
Daniel Pan
c593d1f22e Merge pull request #522 from haiwen/folder-perm-lj 
Folder perm lj
 2015-04-25 14:35:46 +08:00
lian
69784c0025 [sys-admin] add group info page 2015-04-25 10:57:14 +08:00
lian
1721a5821d [dirent-view] add/modify/remove user/group folder perm 2015-04-23 10:18:50 +08:00
llj
c77585f9a1 [org repo] improvement 2015-04-22 15:47:04 +08:00
llj
be1e9762af [org repo] bugfix & improvment 2015-04-22 15:46:55 +08:00
lian
66e938868a enable/disable personal wiki 2015-04-22 15:31:51 +08:00
zhengxie
3f66a3932b [i18n] Offline js i18n 2015-04-22 15:31:51 +08:00
llj
fe84a428c1 [file view] modified url related code 2015-04-22 15:31:51 +08:00
llj
cfc7ad8934 [group nav] modified 'enable modules' 2015-04-22 15:31:51 +08:00
Daniel Pan
177d962f84 delete unused myhome.js, group.js, organization.js, redirect home/my/ to / 2015-04-22 15:31:50 +08:00
Daniel Pan
d60630b9eb Improve group nav and fix other urls 2015-04-22 15:31:50 +08:00
llj
628511aef8 added group side nav 2015-04-22 15:31:50 +08:00
Daniel Pan
fd3a150717 Finish URL design 2015-04-22 15:31:49 +08:00
Daniel Pan
9a25a52976 [backbone] Merge into one library app 2015-04-22 15:31:49 +08:00
llj
4c0f263cca [share] added lib/dir/file share 2015-04-22 15:31:40 +08:00
lian
b10d518ae2 show popup 2015-04-22 15:31:40 +08:00
Daniel Pan
254357c3f1 [backbone] Merge lj's work 2015-04-22 15:31:32 +08:00
zhengxie
92be0754bd Split js from django template, move js to scripts , add requirejs support, and i18n for js 2015-04-22 15:29:46 +08:00
xiez
50f07aea77 Merge pull request #436 from haiwen/file-audit 
[sysadmin-log] Show file-audit/update & permission log
 2015-03-25 13:44:57 +08:00
lian
7b51afe600 [sysadmin-log] Show file-audit/update & permission log 2015-03-25 13:36:24 +08:00
xiez
1e2756b128 Merge pull request #435 from haiwen/repo-trash 
[sysadmin] add repo trash
 2015-03-25 10:34:02 +08:00
lian
840e8d544b [sysadmin] add repo trash 2015-03-23 17:59:33 +08:00
lian
fa67e66f83 update repo settings url 2015-03-21 11:25:29 +08:00
zhengxie
f9c9f8be01 Add shibboleth login option 2015-03-05 14:57:28 +08:00
lian
d1fb67c78f [repo-setting] Set folder perm 2015-01-21 11:14:34 +08:00
zhengxie
24124d0d0a Modify trialuser 2015-01-10 12:07:33 +08:00
zhengxie
8ec8d7d424 Add trialuser 2015-01-08 16:23:18 +08:00
lian
95a3123354 [thumbnail] Show image file's thumbnail 
Conflicts:
	seahub/views/ajax.py
	seahub/views/repo.py
 2014-12-09 15:19:59 +08:00
lian
36310f1dbc [org] Limit org max user num at org-setting page 2014-12-03 18:39:12 +08:00
lins05
0740bf832f enable office preview for cluster 2014-11-21 16:12:48 +08:00
lian
10a31ca7e3 [org] improve org feature 2014-10-22 10:10:58 +08:00
llj
a5c5b463ab [online GC] modified it. 2014-10-17 15:03:19 +08:00
llj
c0553b304b [repo] online GC. 2014-10-14 11:38:12 +08:00
lian
c43f682b7b [org] New org-info UI & Improve quota feature 
Use <table> instead of <li> at org-info page.
Remove related repos when delete a org-user.
 2014-10-13 15:10:02 +08:00
zhengxie
63479c719c [org] Fix quota related 2014-09-26 14:06:07 +08:00
zhengxie
ed810b6205 Remove root function to reduce redirects 2014-09-24 10:55:28 +08:00
zhengxie
f4de68182e Refactor file download code, and send messge when downloading file 2014-09-15 13:45:58 +08:00
zhengxie
da498f746d Fix api bug and refactor repo code 
Conflicts:
	seahub/urls.py
	seahub/views/__init__.py
 2014-09-09 15:35:57 +08:00
zhengxie
ad39c6948f Fix multi-upload in dir share link 2014-08-29 10:55:58 +08:00
zhengxie
efdc52a65f Fix open document file preview 2014-08-28 17:19:29 +08:00
llj
fc62b92bd3 [repo] refactor multi-dirents mv/cp, improved file/dir mv/cp 
* when mv/cp multi-dirents to other library, mv/cp dirent one by one
 2014-08-25 19:09:18 +08:00
zhengxie
e9e01fd9d5 [sysadmin] Fix toggle user status bug 2014-07-18 11:55:16 +08:00
zhengxie
a787705fa2 Refactor user role 2014-07-15 17:38:31 +08:00
imwhatiam
1683a73e4e [user-role] Select role when add a user / change role at user admin page; 
Limit guest user's operation: can not create group and library.
 2014-07-07 16:05:14 +08:00
llj
da4d73a4a9 [repo_setting] improved ui & code, fixed bugs 2014-07-02 18:56:23 +08:00
llj
3a5ef8bfda [ajax] added decorator 'login_required_ajax', improved ajax related code, removed 'client_mgmt' 2014-07-01 15:25:22 +08:00
imwhatiam
af7020fca4 ajax popup notices & show priv/grp/grp-reply msg detail at popup page 2014-06-18 18:09:39 +08:00
imwhatiam
a35acab27f search group at Organization-Groups page 2014-06-10 13:50:24 +08:00
zhengxie
1974a195e0 Merge branch 'del-received-msg' of git://github.com/imwhatiam/seahub into imwhatiam-del-received-msg 2014-06-10 10:48:16 +08:00
imwhatiam
0ff15e7a96 [useradmin] add user from csv file 2014-05-09 18:18:08 +08:00
zhengxie
668c68132e Merge branch '3.0' 
Conflicts:
	seahub/templates/snippets/events_js.html
	seahub/urls.py
	seahub/views/__init__.py
	seahub/views/ajax.py
 2014-05-07 17:52:34 +08:00
llj
4d9ba15cfc [views] moved some functions from views/__init__.py to views/__ajax__.py 2014-04-28 17:18:41 +08:00
zhengxie
af1c1c7317 Squashed commit of the following: 
commit 7f31dc0701976e38ca805fd0fa564783d0bb534b
Author: zhengxie <xiez1989@gmail.com>
Date:   Thu Feb 27 17:26:36 2014 +0800

    Refactor and bugfix

commit f7388f65bbe294d79423a8b044bbec1e027b07be
Author: zhengxie <xiez1989@gmail.com>
Date:   Tue Feb 25 11:51:06 2014 +0800

    Added org file share

commit d8bca656a2d31041fb33ad049c7f94238373d02a
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Feb 24 15:40:40 2014 +0800

    Enable choose register

commit 7d653aea6612d9884405c53ea00536eb236b5074
Author: zhengxie <xiez1989@gmail.com>
Date:   Thu Feb 20 10:59:53 2014 +0800

    org admin

commit 07b6c98055c9c7ce47d1a604df75a796315aab42
Author: zhengxie <xiez1989@gmail.com>
Date:   Sat Feb 8 11:10:42 2014 +0800

    Share admin

commit 346cda657c4249cda5ea7ae8f5aa3c3d4772b2d6
Author: zhengxie <xiez1989@gmail.com>
Date:   Tue Jan 21 12:15:15 2014 +0800

    groups & share

commit 4e3a357f11db16992e1fd6915c96e97dbe2540cb
Author: zhengxie <xiez1989@gmail.com>
Date:   Wed Jan 15 16:21:11 2014 +0800

    personal & user admin
 2014-04-22 17:14:47 +08:00
zhengxie
71bff86e0a Remove ccnet applet root 2014-04-22 11:12:44 +08:00
imwhatiam
d161aaa673 [Messages] del received msg 2014-04-18 13:53:55 +08:00
zhengxie
416f42e064 Refactor sys/useradmin 2014-04-16 17:40:46 +08:00
imwhatiam
bf9bbaaa08 set admin debug 2014-04-16 17:40:46 +08:00
llj
930b5007ac [repo] show progress for multi-dirents mv/cp 2014-04-09 17:18:54 +08:00
llj
9e882b84c0 [repo] modified file/dir mv/cp: show progress, add 'cancel' func 2014-04-09 17:18:54 +08:00
imwhatiam
02a9b795e0 add 'add-admin' to sys/useradmin/ 2014-04-03 15:19:09 +08:00
lins05
28bd1f9d85 [api] use device specific token 2014-03-25 11:23:31 +08:00
zhengxie
bbdfa51e49 Merge branch '3.0' 2014-03-24 16:54:49 +08:00
llj
28b8884524 [repo] use ajax to fetch url for file upload/update 2014-03-19 15:05:03 +08:00
zhengxie
08062158d8 Added login admin 2014-03-17 14:49:25 +08:00
llj
c12e7fbaae Merge branch '3.0' 
Conflicts:
	seahub/templates/snippets/my_owned_repos.html
	seahub/urls.py
	seahub/views/__init__.py
	seahub/views/ajax.py
	seahub/views/repo.py
 2014-03-14 14:26:59 +08:00
llj
7860d263b3 [ajax] changed 'get_group_repos' to 'get_unenc_group_repos' 2014-03-14 13:32:00 +08:00
llj
f889c4668b [msg] rm grp discussions from msg list, rm 'send msg to grp' func, fixed msg del bugs 2014-03-12 13:51:32 +08:00
llj
d18fa834a5 [myhome lib] fetch shared/grp repos when DOM ready instead of when clicking tabs 2014-03-10 14:27:15 +08:00
zhengxie
63f5407400 Use ajax to fetch group/share repos in myhome 2014-03-04 17:06:08 +08:00
zhengxie
adada17a54 Merge branch 'discussion' of git://github.com/swpd/seahub into swpd-discussion 2014-03-04 15:29:48 +08:00
zhengxie
d6df3d035f Merge branch 'change_passwd' of git://github.com/swpd/seahub into swpd-change_passwd 
Conflicts:
	seahub/views/__init__.py
 2014-03-04 13:46:08 +08:00
zhengxie
cfde06f6cc Use ajax to fetch group/share repos in myhome 2014-03-03 15:52:16 +08:00
swpd
707a35462e [message] allow user to remove personal discussion 2014-03-02 10:47:02 -05:00
swpd
a47759e8d0 [message] integrate group discussion into personal discussion listing page 2014-03-02 00:29:52 -05:00
lins05
a9f39ab7df added traffic admin 2014-02-26 18:24:34 +08:00
llj
37a65f2890 [top nav] improved 'groups' nav 2014-02-26 17:01:04 +08:00
llj
652f1d8a8f added top-info-popup for 'group' in top nav 2014-02-26 17:01:03 +08:00
zhengxie
fe4abcf978 Merge branch '2.1' 2014-02-08 17:20:06 +08:00
swpd
96711c3f48 [repo] added new password setting 2014-01-29 14:11:47 -05:00
zhengxie
656716d0c4 [pubuser] Add search to template 2014-01-23 12:13:47 +08:00
zhengxie
1d4583424f Modified pubuser 2014-01-23 11:33:13 +08:00
zhengxie
b79eac041a [pubuser] search pubuser 2014-01-20 18:58:27 +08:00
zhengxie
56349dd7c3 Merge branch '2.1' 2014-01-18 12:23:55 +08:00
zhengxie
8e28ed4c88 Revert "WIP: multi-tenancy" 
This reverts commit 37d57c1639.
 2014-01-18 12:20:38 +08:00
swpd
8cfd795ef3 Squashed commit of the following: 
commit 1e791a50186ae10df65cf2f72b723f85301bf36a
Author: swpd <swpdtz@gmail.com>
Date:   Mon Dec 23 21:29:42 2013 +0800

    [group] allow staff to choose an existing group library to be used as group wiki

commit 23a3bc6ee4e95997ea402076d01980661a6aa2f4
Author: swpd <swpdtz@gmail.com>
Date:   Mon Dec 23 13:59:58 2013 +0800

    [wiki] allow user to choose an existing personal library to be used as personal wiki

commit fa3df2cf76b79a0593bb1eda2b413774c63b2676
Author: swpd <swpdtz@gmail.com>
Date:   Sun Dec 22 02:39:20 2013 +0800

    [wiki] generate within-page anchors for h1 and h2 tags automatically

commit 034a75626f825186a48b398e231f73185a54635c
Author: swpd <swpdtz@gmail.com>
Date:   Sun Dec 15 16:40:42 2013 +0800

    [group] allow group user to create wiki hierarchy index

commit 590b5c1488573d83eab636b0747d4f64d5f9d589
Author: swpd <swpdtz@gmail.com>
Date:   Sun Dec 15 16:23:46 2013 +0800

    [wiki] allow user to create personal wiki hierarchy index
 2014-01-17 17:47:36 +08:00
zhengxie
a37b91b2ae Merge branch 'avatar' 2014-01-17 11:10:19 +08:00
zhengxie
37d57c1639 WIP: multi-tenancy 2014-01-15 16:21:11 +08:00
poetwang
6b1144d7a4 [api2] Add api for ios device register push notification 2014-01-05 22:27:40 +08:00
llj
591dbbee2d [client download] improvement 2014-01-03 17:27:17 +08:00
llj
86f17ab441 [upload/download] fixed url pattern bug; improved file upload 2014-01-03 17:04:36 +08:00
zhengxie
614ea152d9 Added database storage for avatars 2014-01-02 11:26:00 +08:00
zhengxie
7b5ef67c29 Added unenc-rw-repos ajax call 2013-12-21 12:07:50 +08:00
zhengxie
5b2ce6d774 Improve download page 2013-12-19 17:02:16 +08:00
zhengxie
5e9c7defcb Merge branch 'download' 
Conflicts:
	seahub/templates/base.html
 2013-12-19 14:52:53 +08:00
zhengxie
b694b8013e Use static download page 2013-12-19 14:49:39 +08:00
zhengxie
2b72620f1c Added download page 2013-12-19 14:14:48 +08:00
llj
649fd02173 added 'help' app 2013-12-19 14:12:28 +08:00
zhengxie
e3ed8326a7 Modified default library, and refactor repo access permission checking 2013-12-17 12:15:23 +08:00
zhengxie
52575dc1ee Redesign myhome->libraries 2013-12-11 15:53:43 +08:00
llj
22680870c8 [redesign] modified topbar, top nav, use side nav 2013-12-10 12:30:41 +08:00
llj
d005354b33 [repo del] rewrite with ajax; [sysadmin] improved 'set_quota' & 'repo transfer' 2013-11-27 18:32:58 +08:00
zhengxie
7a6ff107f3 Merge branch 'user_notice' 2013-11-25 13:22:28 +08:00
zhengxie
0dd97e567b Merge branch '2.0' 
Conflicts:
	seahub/base/accounts.py
 2013-11-23 16:35:41 +08:00
zhengxie
4807598f8e List database and ldap users in sysadmin 2013-11-21 11:47:53 +08:00
hellaslubo
c930b3639d Update urls.py 
added url pattern for /robots.txt
 2013-11-20 10:23:15 +11:00
zhengxie
e85d7da190 Redesign user notifications. There are 5 types of user notifications: 
* group message, message reply
* repo sharing and file sharing
* user messages
 2013-11-19 16:38:20 +08:00
zhengxie
7138e65691 Send message when upload files to shared folder 2013-11-19 16:38:19 +08:00
llj
47cf0c6de7 [shared upload link] bug fix and improvement; [dir priv share] improved 2013-11-14 16:31:40 +08:00
llj
cab5c49735 [new feature, by swpd] allow user to share upload link 2013-11-14 16:31:40 +08:00
zhengxie
bdbe73f6bc Merge branch 'captcha' of git://github.com/swpd/seahub into swpd-captcha 2013-11-07 17:17:13 +08:00
zhengxie
089869d8a0 Added option for user to choose server/client encryption 2013-11-07 10:53:05 +08:00
llj
8e3d9d0b18 [repo] auto open cur_dir in jstree for mv/cp 2013-11-06 13:25:30 +08:00
swpd
00c9e33145 [auth] add captcha to prevent brute force attack 2013-10-20 00:37:41 +08:00
llj
2e270ca45e [v2] modified repo create, file upload, update, download, ... 
* repo create: myhome, pubrepo, group
* handled 'is_password_set' etc.
* view-online is not offered for file in enc repo in 'passwd local' mode
* removed 'open local file'
* added 'v2 tip' in seafile_access_check page
 2013-10-17 11:04:19 +08:00
zhengxie
6b9863f14c [sysadmin] Enable admin to activate/inactivate a user 2013-10-15 17:49:50 +08:00
zhengxie
f864718778 Seperate ownership transfer from settings 2013-10-11 17:41:17 +08:00
zhengxie
2705120536 Rewrite repo settings 2013-09-30 17:27:17 +08:00
zhengxie
b790f7b3d3 Modified sys list orphan repos 2013-09-28 16:50:34 +08:00
zhengxie
dae8c4b575 Enable library transfer for admin 2013-09-25 17:52:32 +08:00
zhengxie
afed88311d Added repo search 2013-09-25 17:52:31 +08:00
zhengxie
b4d187ad4a Added module configuration for personal wiki and group wiki 2013-09-25 17:52:31 +08:00
zhengxie
9219d9fd34 [sysadmin] Search user 2013-09-25 17:51:03 +08:00
zhengxie
3fb9a3dc28 Modified sub repo 2013-09-16 14:12:15 +08:00
llj
67a741e5a4 merge 'create_sub_lib' into 'check_sub_repo'; improved file/dir share js code 2013-09-13 17:59:59 +08:00
llj
aad993163e [repo] added feature 'select multi dirents, and del/mv/cp' and fixed sort bug 2013-08-30 13:47:57 +08:00
llj
251cc64005 [repo] added 'more' for dirents view 2013-08-20 18:30:17 +08:00
zhengxie
883a926f71 Do not list encrypted repos in ajax/repos/ 2013-08-14 10:16:19 +08:00
llj
af0d89743d [sub-lib] divided into 'sync' & 'syncable share' 2013-08-12 15:49:51 +08:00
zhengxie
cb28ba74bc Refactor private share, and fixed a few bugs 2013-08-01 14:44:09 +08:00
llj
3336d02ecc [repo] using ajax to update commit msg, fixed 'wrong head' bug for file update 2013-08-01 12:01:08 +08:00