haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-14 07:24:58 +00:00
Code Issues Releases Wiki Activity
13,486 Commits 136 Branches 453 Tags 2.3 GiB
c06d51a596
Commit Graph

733 Commits

Author SHA1 Message Date
llj
c66a0bf6a7 [fileupload] fixed error msg 2017-09-25 15:29:27 +08:00
xiez
d56e107613 Merge pull request #1812 from haiwen/master-limit-ip 
limit ip
 2017-09-18 17:17:02 +08:00
zhengxie
4b37a8afe3 Update translation and refactor 2017-09-18 17:07:30 +08:00
llj
2b5b811ec3 [favourites] modified file icon 2017-09-18 15:38:26 +08:00
zMingGit
12ba328119 limit ip 2017-09-18 14:21:11 +08:00
llj
45e053a2f2 [file tags] add translation 2017-09-13 16:58:34 +08:00
lian
bc492b9010 add admin role/log feature 2017-09-09 15:27:04 +08:00
llj
dafedd5f7f modified 'group-repo' 2017-09-06 16:14:27 +08:00
llj
667afb6a59 [share] share repo to group with 'admin' perm: fix 2017-09-06 16:02:12 +08:00
zming
dd7f5d5417 [API] share to groups, add test 2017-09-06 16:02:12 +08:00
llj
211d527e5a [home side nav] modified 'share admin' 2017-08-31 17:26:52 +08:00
Daniel Pan
834fc13d76 Merge pull request #1751 from haiwen/share-admin-permission 
[share] add admin permission
 2017-08-30 18:08:33 +08:00
llj
33266638ef [share] share repo with 'admin' perm: modification 2017-08-30 17:59:14 +08:00
llj
ab5c066a74 [lib icons] use new lib icons 2017-08-26 11:07:12 +08:00
zming
160e0b3027 [API] share to admin permission 2017-08-26 10:38:12 +08:00
zhengxie
21701ef3b3 Merge branch 'setLibHistory' 
Conflicts:
	seahub/urls.py
 2017-08-23 15:37:29 +08:00
llj
cb0aacd89d [UI] modified some 'file upload' buttons 2017-08-15 15:43:37 +08:00
lian
3e7275ec80 Merge branch '6.1' 2017-08-12 14:34:11 +08:00
llj
c6e8b64492 [system admin] libraries: added 'history setting' 2017-08-11 17:51:11 +08:00
llj
2409c7d938 [share] 'enable share to all groups': modification 2017-08-10 17:38:51 +08:00
zming
5d04ce0de2 [ share-repo ] can share repo to any groups 2017-08-10 17:35:39 +08:00
llj
11ddefb508 [repo snapshot labels] added 'label current state' for my libs; show labels in 'repo history' page 2017-08-02 15:07:44 +08:00
xiez
64832adc03 Merge pull request #1674 from haiwen/license 
license
 2017-07-15 15:37:06 +08:00
lian
89392f3061 Merge pull request #1693 from haiwen/gif 
Don't use 'big' thumbnail for gif files
 2017-07-15 15:14:11 +08:00
lian
3dc584ea97 update notification interval 
set 3 * 60 as the default interval for the js value.
 2017-07-15 11:05:58 +08:00
llj
a070329833 Don't use 'big' thumbnail for gif files 2017-07-12 16:35:09 +08:00
llj
8be017e917 [dirent details] add 'tags' 2017-07-12 10:47:52 +08:00
lian
96e2340a81 update user notifications 
1. use cache to store user unseen notifications count
1. add UNREAD_NOTIFICATIONS_REQUEST_INTERVAL
 2017-07-07 11:05:53 +08:00
llj
3905f7b3ef [dirent details] improvement 2017-07-05 12:17:11 +08:00
llj
5d48dac96c [dirent details] improvement; show more info for folders 2017-07-04 17:49:36 +08:00
llj
76d58cb025 [dir view] added 'details' for dirent 2017-07-04 14:28:40 +08:00
llj
0015a9a6c8 [system admin] enable user to upload a license file 2017-07-04 10:39:11 +08:00
xiez
4c5ca6292d Merge pull request #1669 from haiwen/fix 
fixed UI bugs for mv/del selected dirents; modified 'avatar'
 2017-07-03 15:00:18 +08:00
lian
46a5473326 add amdin system library upload api 2017-07-03 14:42:12 +08:00
llj
735faec773 [deleted libs] list deleted libraries, and enable user to restore a library 2017-06-30 16:31:08 +08:00
llj
ce749810e4 [dir view] fix for 'dirent share/del' 2017-06-30 14:33:10 +08:00
llj
a4d5736c68 fixed UI bugs for mv/del selected dirents; modified 'avatar' 2017-06-30 13:39:30 +08:00
llj
aa6416d30d [repo details] improvement 2017-06-28 11:37:52 +08:00
llj
88c79b4894 [repo details] added 'file count' 2017-06-27 18:58:08 +08:00
llj
067a17b106 [my libraries] added 'repo details' 2017-06-27 18:35:24 +08:00
xiez
5f666ad754 Merge pull request #1601 from haiwen/share-link 
Share link
 2017-06-17 11:07:02 +08:00
zhengxie
e9de086db3 Merge branch '6.1' 2017-06-03 11:21:08 +08:00
llj
8dd8e1e7f0 [thumbnail] added 'thumbnail_size_for_original' 2017-05-31 16:32:00 +08:00
lian
37dc0354d9 update admin create repo log 2017-05-23 16:49:52 +08:00
lian
e1d0169e64 update admin log 
1. add log when admin create repo
1. add log when admin batch delete user
1. update test
 2017-05-23 16:05:51 +08:00
llj
42f2571da7 [share link] modified 'direct dl link' 2017-05-23 11:48:41 +08:00
llj
18f0764818 [share link] modification about permissions 2017-05-22 17:20:42 +08:00
lian
0ca018fcf4 add admin create repo api 2017-05-18 10:43:31 +08:00
llj
023a22ce23 [side nav] enable modules: fix 2017-05-09 16:24:19 +08:00
llj
ae241c341f Merge pull request #1573 from haiwen/upload-file 
update argument when get file upload/upload link via web api
 2017-05-09 11:48:26 +08:00
lian
48c370c8bc update argument when get file upload/upload link via web api 2017-05-06 17:04:40 +08:00
llj
a65499610c [dir view] move dir/file via drag & drop: modification, to remove the effect on 'upload file/folder via drag & drop', and other 'drag & drop' 2017-05-06 15:17:31 +08:00
llj
0169245045 [dir view] new dir/file: close the dropdown menu after clicking a menu item 2017-05-04 16:32:47 +08:00
Daniel Pan
5c69f79688 Merge pull request #1545 from haiwen/use-thumbnail 
[image] use thumbnail for magnificPopup & file view page
 2017-04-24 18:21:45 +08:00
xiez
a0286f1a6f Merge pull request #1553 from haiwen/video 
video thumbnail
 2017-04-24 16:26:23 +08:00
llj
dbc8d1b041 [dir view] rename: fix 2017-04-22 16:30:58 +08:00
llj
390424fe30 [dir view] enable 'select text' when rename 2017-04-22 15:47:25 +08:00
llj
055e860e87 [file icon] added file icon for video files 2017-04-20 16:13:54 +08:00
llj
3443479e75 [video] show thumbnail for video files in dir-view/favorites/view-shared-dir pages 2017-04-19 16:21:33 +08:00
llj
2a8e40c3c0 [image] use thumbnail for magnificPopups, file_view page & shared_file_view page 2017-04-18 17:28:29 +08:00
zhengxie
e6e6e82b82 Merge branch '6.0' 
Conflicts:
	seahub/api2/endpoints/file.py
	seahub/urls.py
	static/scripts/app/views/share.js
 2017-04-17 16:21:22 +08:00
llj
33eedef917 Merge pull request #1544 from haiwen/repo-name 
update name check when create repo
 2017-04-14 14:31:32 +08:00
lian
534272ecd2 add name check at front end by js 2017-04-14 14:03:25 +08:00
lian
fef1d50ecd add name check 
1. create/rename repo
1. create/rename folder
1. create/rename file
 2017-04-14 13:21:16 +08:00
llj
6706bbce89 [favorites] fixed magnificPopup 2017-04-11 18:09:45 +08:00
llj
ab67b1b5a3 [favorites] show thumbnail for image files 2017-04-01 16:59:17 +08:00
llj
59ff3fb180 [UI] top-bar: bugfix & improvement 2017-03-30 12:12:41 +08:00
zhengxie
1b11350f80 Merge branch '6.0' 
Conflicts:
	seahub/templates/sysadmin/sysadmin_backbone.html
	seahub/urls.py
	seahub/views/sysadmin.py
	static/scripts/app/views/dir.js
 2017-03-27 13:53:35 +08:00
llj
b9b02cee57 [share popup] fixed 'direct download link' 2017-03-27 12:06:39 +08:00
lian
54ec4bba63 add test for admin log api 2017-03-23 15:05:47 +08:00
llj
acf79cf1aa [system admin] admin logs: fix 2017-03-22 17:26:42 +08:00
lian
dd88c4e043 add admin operation logs page 2017-03-22 17:26:42 +08:00
llj
acc1ebb6eb [dir view] bugfix for 'magnificPopup' & 'grid-item download' 2017-02-25 17:36:07 +08:00
llj
e65a95c707 [fileupload] update-confirm-popup: fix 2017-02-22 16:44:14 +08:00
llj
8f54c031e4 [dir view] fix for 'move via drag & drop' 2017-02-20 17:40:36 +08:00
Daniel Pan
b84c09e972 Merge pull request #1491 from haiwen/mobile-side-nav 
[mobile] side nav: modified for sysadmin-backbone pages & all non-bac…
 2017-02-17 22:55:12 +08:00
llj
b0d6304852 [mobile] side nav: modified for sysadmin-backbone pages & all non-backbone pages 2017-02-17 18:43:38 +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
llj
c8f5d4ed5d [dir view] '.repo-op' UI: bugfix 2017-02-17 13:26:43 +08:00
xiez
6fd822f45f Merge pull request #1457 from haiwen/admin-group 
udpate admin groups page
 2017-02-09 18:11:09 +08:00
llj
f85d9e8e67 [dir view] bugfix for img view with magnificPopup 2017-02-09 16:00:36 +08:00
lian
718bdbb59b update admin manage group page 2017-02-09 14:59:49 +08:00
llj
51fae749a5 Merge pull request #1336 from haiwen/rm-ajax 
Rm ajax
 2017-02-07 17:01:11 +08:00
lian
7c1c1e2977 update rm ajax 2017-02-07 16:03:46 +08:00
lian
d43a2e5eb3 admin search group by name 2017-01-19 18:21:04 +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
lian
f13b61e497 add remote wipe option when admin unlink device 2017-01-17 13:30:25 +08:00
Daniel Pan
86e9eb5fbc Merge pull request #1435 from haiwen/mobile 
Mobile
 2017-01-16 14:31:14 +08:00
llj
01fb83c9b2 [mobile] added 'updateDirOpBarUI' 2017-01-12 11:39:21 +08:00
llj
5f4935f6ce fix 2017-01-09 14:17:22 +08:00
zhengxie
fc680148e5 [locale] Update source 2017-01-09 11:15:44 +08:00
llj
38226256cd Merge pull request #1444 from haiwen/download-dir 
update zip download dir
 2017-01-07 17:58:38 +08:00
llj
fd4df3792c [dir view] modification 2017-01-07 17:55:16 +08:00
llj
6c65d06b3e [dir view] mv/cp multi: fix 2017-01-07 15:06:49 +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
llj
7c4d32ac24 [dir view] fixed 'window scroll' related bugs 2017-01-04 17:32:42 +08:00
llj
90a5552a9d [my libs, dir view] improvement: enlarge clickable area, and etc. 2017-01-04 17:19:57 +08:00
llj
cffc0743d2 [mobile] favourites: redesigned it. 2017-01-04 17:19:57 +08:00
llj
f4eacae253 [mobile] dir view, group: modification 2017-01-04 17:19:57 +08:00
llj
2d7f5339c3 [mobile] dir view: redesigned it 2017-01-04 17:19:57 +08:00
llj
943804c00e [mobile] my libs: modified details 2017-01-04 17:19:57 +08:00
llj
591ab5e517 [mobile] redesigned big modal popups 2017-01-04 17:19:57 +08:00
llj
a0ff7afaf8 [mobile] redesigned 'libs list' UI for shared/org/groups/group 2017-01-04 17:19:57 +08:00
llj
7a9a89a7d1 [mobile] my libs: redesigned it 2017-01-04 17:19:57 +08:00
llj
b2a8efe654 [mobile] modified side-nav for touch devices 2017-01-04 17:19:57 +08:00
Daniel Pan
493e0093d6 Merge pull request #1438 from haiwen/drag-drop 
[dir view] drag & drop: highlight the dir item
 2017-01-04 14:01:30 +08:00
Daniel Pan
1273ffa83d Merge pull request #1423 from haiwen/new 
[dir view] redesigned 'new folder/file'
 2017-01-04 13:53:04 +08:00
llj
4d4762b1af [dir view] drag & drop: modified highlight effect 2017-01-04 13:51:38 +08:00
llj
0075764bae [dir view] drag & drop: highlight the dir item 2017-01-03 18:39:14 +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
lian
d6e216dda5 admin add group 2016-12-16 15:02:21 +08:00
llj
13fac0efa0 [dir view] redesigned 'new folder/file' 2016-12-15 12:12:30 +08:00
Daniel Pan
92e9d6cb9a Merge pull request #1402 from haiwen/show-logout 
Show logout
 2016-12-06 10:20:32 +08:00
llj
81bbaace7a [repo-folder-perm-admin] fix 2016-12-03 14:12:04 +08:00
llj
3534b5836e [fileupload] fix for Firefox 50 2016-11-25 16:59:21 +08:00
llj
a076a934f9 [dir view] added 'move dirents by drag & drop' 2016-11-18 12:21:11 +08:00
llj
dbd104e7d0 show log-out message 2016-11-18 11:56:11 +08:00
Daniel Pan
8b54e37d1f Merge pull request #1400 from haiwen/share 
[share.js] show error msg
 2016-11-18 11:36:24 +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
9ba72b4b47 [UI] top-bar: bugfix & improvement 2016-11-17 17:51:27 +08:00
llj
2d26c57a66 [share.js] show error msg 2016-11-17 11:53:43 +08:00
lian
f20b90da1f update condition check when display share icon for guest user 2016-11-15 16:16:12 +08:00
llj
25a2fd91c4 [dir view] fix for dirs with more than 100 dirents 2016-11-01 18:01:41 +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
lian
04f6b71441 Not allowed to set folder perm if repo not shared out 2016-10-18 13:34:36 +08:00
Daniel Pan
34640eb3e5 Merge pull request #1374 from haiwen/magnificPopup 
Magnific popup
 2016-10-17 15:13:53 +08:00
llj
90ab3746b3 [dirent-mvcp] bugfix 2016-10-14 16:16:33 +08:00
llj
82f3622a29 [dir view] rewrote 'view image file with magnificPopup' 2016-10-13 17:53:31 +08:00
lian
c24f871a7c not allow user set folder perm in virtual repo 2016-10-10 15:23:01 +08:00
llj
ada3365e15 [dir view] check quota for fileupload 2016-09-19 20:42:47 +08:00
llj
7ecf62d970 [fileupload] upgrade fileupload plugin to the latest version 2016-09-19 20:41:54 +08:00
Daniel Pan
b1778698b9 Merge pull request #1354 from haiwen/repo-pattern 
add library pattern feature
 2016-09-19 13:57:02 +08:00
lian
2e098b628e enable library template when create group/pub repo 2016-09-18 11:58:14 +08:00
llj
fb6430b027 [fileupload] modified 'maxNumberOfFiles' 2016-09-14 17:35:42 +08:00
lian
94e91265cc add library pattern feature 2016-09-14 13:47:12 +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
llj
f5042956ce [share/perm popup] fix 2016-08-22 15:19:44 +08:00
lian
fd917c0007 update user permission 
1. update user generate share/upload link permission
2. update user connect iso/android/desktop clients permission
 2016-08-22 11:20:48 +08:00
Daniel Pan
2836931021 Merge pull request #1320 from haiwen/side-nav-fix 
[side nav] group list: fix
 2016-08-19 18:09:18 +08:00
lian
7ce3001d67 fix bug when create an encrypted share link 2016-08-16 17:28:49 +08:00
Daniel Pan
16e9f6296e Merge pull request #1325 from haiwen/rename-improvement 
[lib/dirent] improved 'rename'
 2016-08-16 13:34:19 +08:00
llj
1e0d94b694 [share] fix 2016-08-16 10:20:05 +08:00
lian
5c59b81466 add new admin share api 2016-08-16 10:19:56 +08:00
llj
ab380bf361 [lib/dirent] improved 'rename' 2016-08-12 19:10:49 +08:00
llj
70b04525b2 [side nav] group list: fix 2016-08-10 14:22:04 +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
llj
a62dc674d3 [dir view] fixed 'loading more' 2016-08-05 14:21:28 +08:00
lian
c7acdce7de update admin transfer group 2016-08-04 18:01:44 +08:00
llj
271eacabd0 [zip download] modified progress 2016-08-02 11:35:05 +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
llj
d9ac225f87 [system admin] groups: bugfix & improvement 2016-07-21 15:13:48 +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
llj
e5b0d1ee31 [invitations] bugfix & improvment 2016-07-20 15:45:05 +08:00
lian
6688dc760b new invitation page 2016-07-20 15:40:58 +08:00
llj
2f5cf202d9 [misc] fix 2016-07-20 14:20:19 +08:00
lian
b5d9ece164 rm synced repos at devices page (#1285) 2016-07-14 13:54:17 +08:00
llj
c39b0b5ff3 rm unused files 2016-07-11 17:03: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
e7aaae4363 Merge pull request #1251 from haiwen/trash-pagination 
[system admin] trash repos: list by page
 2016-06-27 11:01:44 +08:00
llj
b2cda939aa UI fix (#1257) 2016-06-23 16:48:29 +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
Daniel Pan
ca96fc1db9 Merge pull request #1243 from haiwen/admin-devices 
[sysadmin] devices: fix & improvement
 2016-06-16 10:51:29 +08:00
llj
8c0707c647 [sysadmin] devices: fix & improvement 2016-06-16 10:44:16 +08:00
llj
341d029b9f [dropdown widget] improved menu position 2016-06-15 17:20:21 +08:00
llj
1bee4c4afb [dir view] mv/del multi items: bugfix 2016-06-14 16:39:31 +08:00
llj
2758713cea [system repo admin] modification 2016-06-14 14:47:44 +08:00
llj
8c2e16ca36 [system repo admin] fix, improvement, supplement, clean 2016-06-14 14:47:44 +08:00
lian
a767aeb3d8 update 2016-06-14 14:47:02 +08:00
lian
72f4297934 new admin libraries page 2016-06-14 14:46:13 +08:00
Daniel Pan
37f6648a12 Merge pull request #1237 from haiwen/repo_del 
[repo del] rewrote it with simplemodal
 2016-06-14 11:14:30 +08:00
llj
2091d20e4b [repo del] rewrote it with simplemodal 2016-06-14 11:06:20 +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
lian
bec227de26 update dir page 
when visit a invalid repo dir page, error msg will show.
but then visit a valid repo, error msg still there and no dir page show.
 2016-06-04 10:24:08 +08:00
Daniel Pan
6561269301 Fix sometimes dirents duplicated in Firefox 2016-06-01 17:22:10 +08:00