haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-06-23 21:58:53 +00:00
Code Issues Releases Wiki Activity
7,264 Commits 133 Branches 449 Tags 2.1 GiB
28cc3762b0
Commit Graph

188 Commits

Author SHA1 Message Date
lian
dd88c4e043 add admin operation logs page 2017-03-22 17:26:42 +08:00
zhengxie
d82df5fb52 Merge branch '6.0' 
Conflicts:
	media/js/base.js
	seahub/api2/views.py
	seahub/views/ajax.py
	tests/api/test_repo_user_folder_perm.py
 2017-02-17 17:11:33 +08:00
lian
718bdbb59b update admin manage group page 2017-02-09 14:59:49 +08:00
lian
7a8eb038e2 update get file uploaded bytes 2017-01-19 14:40:49 +08:00
lian
06bc49d17b rm ajax get file op url 2017-01-19 14:40:49 +08:00
lian
6d577d83e3 rm repo change password 2017-01-19 14:40:49 +08:00
lian
a862fad836 rm set repo user/group perm 2017-01-19 14:40:49 +08:00
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
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
llj
fd4df3792c [dir view] modification 2017-01-07 17:55:16 +08:00
lian
77fa8c0c7a update zip download dir 2017-01-07 14:18:57 +08:00
lian
38a06be960 update sysinfo page 2017-01-07 10:12:17 +08:00
zhengxie
d4e00402af Merge branch '6.0' 
Conflicts:
	media/css/seahub.css
 2016-12-26 14:22:35 +08:00
llj
1785171a14 [sysadmin] groups: modification 2016-12-22 19:15:21 +08:00
Daniel Pan
625573a669 Merge pull request #1361 from haiwen/fileupload 
Fileupload
 2016-11-18 11:29:52 +08:00
Daniel Pan
2c6070085a Merge pull request #1337 from haiwen/jstree-update 
[jstree] updated jstree to the latest v3.3.2, rewrote/modified relate…
 2016-11-18 11:27:11 +08:00
llj
65405ad84f [sort libs] fix for broken libraries 2016-10-25 18:21:48 +08:00
llj
0128cc25ad [jstree] updated jstree to the latest v3.3.2, rewrote/modified related code, & bugfix 2016-10-25 11:39:52 +08:00
llj
7ecf62d970 [fileupload] upgrade fileupload plugin to the latest version 2016-09-19 20:41:54 +08:00
llj
585d0163d0 [sort] fix, rewrote 2016-09-08 16:26:23 +08:00
lian
a11925b033 remember sort mode after sort repos/dirents 2016-09-07 10:03:21 +08:00
lian
5c59b81466 add new admin share api 2016-08-16 10:19:56 +08:00
llj
a3b15e6f62 [system admin] repo share: fix 2016-08-10 10:21:19 +08:00
lian
92df1ef8d2 admin manage repo share 2016-08-10 10:21:19 +08:00
llj
1bd1aaef91 modified compare of strings which have digits in them 2016-08-09 17:16:06 +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
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
lian
782fbb38ed add ENABLE_GUEST_INVITATION setting 2016-07-20 15:45:38 +08:00
lian
6688dc760b new invitation page 2016-07-20 15:40:58 +08:00
llj
8bd80118b2 [contact_email] modified 'share popup' & 'user profile' 2016-07-05 16:02:33 +08:00
llj
f9500c4f61 [download zip] improvement, bugfix 2016-07-04 15:40:11 +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
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
lian
72f4297934 new admin libraries page 2016-06-14 14:46:13 +08:00
lian
400bcde5ce only show extra msg in pro edition when unlink a device 2016-05-27 14:19:53 +08:00
Shuai Lin
7514c587d5 Added a helper function "showConfirmWithExtraOption". 2016-05-27 13:54:21 +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
llj
59d4689e73 [notice, account] modification 2016-04-23 13:27:56 +08:00
Daniel Pan
2fd36afd01 Rewrite account info popup and clean css 2016-04-23 13:27:17 +08:00
Daniel Pan
6b0f05bd34 Rewrite notifications with popover class 2016-04-23 13:27:17 +08:00
llj
d4f5bc4817 [icons] modification 2016-04-12 15:53:51 +08:00
llj
3f23a1685e [icons] modification 2016-04-12 11:22:04 +08:00
Daniel Pan
3665084ec9 Merge pull request #1053 from haiwen/discussion 
Add group discussion
 2016-03-29 17:46:49 +08:00
lian
fe6dbcbb63 use new v2.1 file api when rename/lock/unlock/del file 2016-03-28 17:53:58 +08:00
llj
63f30b3657 [group discussion] bugfix & improvement 2016-03-25 14:55:09 +08:00
Daniel Pan
077a2627f0 Update group discussion 2016-03-25 14:55:09 +08:00
Daniel Pan
4aa500203d Add group discussion 2016-03-25 14:37:58 +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
Daniel Pan
2ac6a8859c Improve Moment related code 2016-03-17 11:15:28 +08:00
lian
a43b3f969e new devices page 2016-03-15 18:19:12 +08:00
llj
585b48e3c4 Merge pull request #1056 from haiwen/code-clean 
clean code and icons
 2016-03-14 19:57:08 +08:00
llj
6cc1aa7d94 Merge pull request #1059 from haiwen/lib-icon 
Improve library icon
 2016-03-14 12:18:14 +08:00
Daniel Pan
0931bd0103 Improve library icon 2016-03-11 13:41:51 +08:00
llj
6fce263e42 [details] modified 'grid view', 'share popup', 'repo folder perm', 'select2' & etc. 2016-03-10 13:56:00 +08:00
Daniel Pan
f0e40d9120 Clean public library related code 2016-03-09 20:54:33 +08:00
Daniel Pan
24e2870831 Show 24px file icon for low DPI screen 2016-03-04 18:29:12 +08:00
Daniel Pan
463b48c788 Make open-via-client in community edition and clean code for file/dir icons 2016-02-29 15:29:29 +08:00
Daniel Pan
3de67a1f15 Add rename 2016-02-28 19:35:33 +08:00
Daniel Pan
e5766ec06e Update dirent del function 2016-02-28 19:35:32 +08:00
Daniel Pan
5873f1af95 Remember view mode in cookie 2016-02-28 19:35:32 +08:00
llj
442753f96a [lib setting] added 'change password' for enc libs; removed original setting pages 2016-02-23 19:54:33 +08:00
llj
9b4e4d0460 [lib setting] add 'folder perm' 2016-02-19 17:38:32 +08:00
llj
eaba92f544 [lib setting] added 'shared links' 2016-02-19 17:38:32 +08:00
llj
f6ed190d5b [lib settings] modification 2016-02-19 17:38:32 +08:00
Daniel Pan
adf9837337 Add setting library history 2016-02-19 17:38:32 +08:00
Daniel Pan
54a29bc743 Add library transfer 2016-02-19 17:38:32 +08:00
Daniel Pan
b0ccc76bee Finish rename repo 2016-02-19 17:38:32 +08:00
lian
0e43a099ff [api] update search user api 2016-01-14 13:10:24 +08:00
llj
5f3c030a52 ['search user'] select2: enable 'directly enter email' 
* the separator is 'Enter', i.e., clicking the Enter key
 2016-01-14 11:42:28 +08:00
llj
53fddee277 [group dir view] modification 2016-01-13 16:04:04 +08:00
Daniel Pan
6592cfa747 Clean getUrl() in common.js 2016-01-11 16:12:30 +08:00
llj
0c86fb539c [group settings] complete 'import members' 2016-01-09 16:50:46 +08:00
llj
ec6679e448 add 'updateGroups' for side-nav, and other improvement 2016-01-09 14:35:16 +08:00
llj
bda85406ca [group settings] manage members: added 'add multi members once' and other improvement 2016-01-08 12:18:33 +08:00
llj
e9150cf555 add 'group settings' 2016-01-06 16:46:25 +08:00
llj
03d075a00b [group members] redesigned it 2015-12-11 20:58:29 +08:00
llj
51b44c40a3 [groups] use new collection url 2015-12-02 11:39:36 +08:00
llj
1c18e3e716 [groups] redesigned it. 2015-12-02 11:39:36 +08:00
llj
0dc31715d4 use 'POST' instead of 'GET' for some requests, and modified 'share' in repo, file view 2015-10-19 15:04:37 +08:00
llj
1dfcfc58c1 [simplemodal] updated simplemodal.js to fix IE problems 2015-10-08 17:26:33 +08:00
zhengxie
5fca43ef89 Merge branch '4.3' 
Conflicts:
	seahub/api2/views.py
 2015-09-14 13:43:39 +08:00
llj
1c1e9870a9 [common.js] modified ajaxErrorHandler 2015-09-07 17:55:35 +08:00
lian
acc2f75235 update api err msg and common.ajaxErrorHandler 2015-09-01 17:42:54 +08:00
llj
dfd5316966 [select2] added translation 2015-08-19 17:59:59 +08:00
llj
32249b1f78 [common.js] added translation for select2 2015-08-18 11:01:58 +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
lian
dfc7f1856f new activity page 2015-07-28 19:55:05 +08:00
llj
97ebba6f2b [file lock] 'dir view' & 'file view': improvement & bugfix 2015-07-20 13:50:42 +08:00