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

733 Commits

Author SHA1 Message Date
Daniel Pan
38a902b22d
Merge pull request #2099 from haiwen/address-book-group-lj0507 
Address book group
 2018-05-08 10:39:36 +08:00
lian
1fd1f43177 filter out address book group when: (#2092) 
1. share library/folder
2. set folder permission
 2018-05-08 10:24:58 +08:00
llj
bed8636724 [address book] modification for UI 2018-05-07 19:55:41 +08:00
llj
1b6a8479da [user panel] added 'group owned library' function 2018-05-04 14:43:17 +08:00
llj
b87f0312d7 [js] use uncompressed js.cookie.js, for the sake of 'dist' 2018-04-28 15:11:33 +08:00
zhengxie
8d10466ce9 Merge branch '6.2' 
Conflicts:
	media/css/seahub.css
	seahub/notifications/management/commands/send_notices.py
	seahub/notifications/models.py
	seahub/templates/js/templates.html
	seahub/views/__init__.py
	seahub/views/file.py
	tests/seahub/notifications/management/commands/test_send_notices.py
	tests/seahub/notifications/test_models.py
 2018-04-27 11:00:43 +08:00
llj
0ed1dd4c58
Merge pull request #1973 from haiwen/address-book 
Address book
 2018-04-25 16:26:12 +08:00
llj
5e5813072c [address book] modification 2018-04-25 16:19:15 +08:00
llj
f1a24470ad [address book] add 'show/set group quota', 'list/create/delete group libraries' functions 2018-04-24 20:08:20 +08:00
llj
30c0636791 [address book] modification: nav icon, group owner 2018-04-20 12:04:48 +08:00
llj
b383846e87 [group discussion] fixup for 'enable' option 2018-04-18 16:39:20 +08:00
llj
9306c4762f [wiki] modification 2018-04-17 16:57:59 +08:00
haiwen
3a82e7694e Merge branch '6.2' 2018-04-14 03:00:03 +00:00
lian
488c8802a3 update multi storages backend 
1. use $.isEmptyObject() check if app.pageOptions.storages is empty
2. return [] if no storage_ids setting for user role
 2018-04-13 13:27:05 +08:00
xiez
2ade5eb2de
Merge pull request #2049 from haiwen/stop-zip-process 
cancel zip task
 2018-03-30 15:19:37 +08:00
llj
26dd0baff4 [cancel zip task] fixup & improvement; also added it for 'shared dir view' page 2018-03-30 14:53:20 +08:00
ilearnit
d29ab8a9ac if close query zip window then stop zip process 2018-03-30 12:24:40 +08:00
llj
cd0c7a1170 [wiki] added 'wiki list' and 'wiki' pages 
Conflicts:
	seahub/wiki/urls.py
	static/scripts/app/views/side-nav.js
 2018-03-26 13:31:41 +08:00
llj
a6026628fb [my libs] fixed js 2018-03-16 14:55:00 +08:00
llj
1182a80989 Merge branch '6.2' 2018-03-15 11:26:02 +08:00
zming
f870a6d556 trash event 2018-03-13 18:31:01 +08:00
llj
6d4000fc20 [fileupload] show error message when failed to get upload url 2018-03-02 16:11:27 +08:00
llj
88478dee1d [upgrade jquery] modifications, & cleaned up code & files 2018-02-05 16:47:56 +08:00
llj
4fd7b7acd7 [share] fix 2018-01-30 18:04:50 +08:00
zming
5f9033b5ff sysadmin can share repo with admin permission 2018-01-30 17:38:30 +08:00
lian
ed8200b52a add api for getting groups that user can share repo to 2018-01-17 18:22:48 +08:00
llj
5d2aa8af05 [system admin] added 'address book' 2018-01-04 18:06:05 +08:00
zhengxie
d37144ef75 Merge branch '6.2' 
Conflicts:
	seahub/templates/base.html
	static/scripts/app/views/dir.js
	static/scripts/common.js
 2017-12-28 15:47:18 +08:00
llj
32019fe305
Merge pull request #1963 from haiwen/mv-multi-fix 
[dir view] mv multi: fix
 2017-12-27 16:53:18 +08:00
llj
f88c9c5f74 [dir view] mv multi: fix 2017-12-27 16:49:11 +08:00
lian
2fe5db8c76 update lock feature 
Don't allow delete/rename/move a file when it is locked
 2017-12-27 15:03:47 +08:00
xiez
baeb8ccacf
Merge pull request #1952 from haiwen/invite-multi 
[invite people] enable to invite multiple guests at one time
 2017-12-25 13:32:42 +08:00
lian
d4cf67e324 multi storage backend 
1. add multi storage backend support
2. add 'storage_ids' user role
 2017-12-19 15:41:36 +08:00
llj
d621e79bba [invite people] enable to invite multiple guests at one time 2017-12-19 12:05:51 +08:00
llj
a3600ff488 [fileupload] improvement: always full show the popup when upload files; close the popup when navigate away from a 'dir view' page 2017-12-14 17:23:01 +08:00
Daniel Pan
0dac3d38ca
Merge pull request #1941 from haiwen/feedback 
added transition to show/hide of feedback messages
 2017-12-13 18:15:47 +08:00
llj
b16a829ead added transition to show/hide of feedback messages 2017-12-12 17:13:01 +08:00
llj
6b31bae382 [dir view] mv/cp multi dirents: add feedback msg 2017-12-11 16:55:21 +08:00
llj
07dea7eca4 new design 2017-12-05 17:53:45 +08:00
Daniel Pan
c35ca85e1f
Merge pull request #1895 from haiwen/click-to-select 
[share.js] download/upload link: added 'click to select' feature
 2017-11-14 10:29:58 +08:00
llj
fbbfebe09a [group] fix 2017-11-13 14:28:21 +08:00
llj
ac18d5ee85 [share.js] download/upload link: added 'click to select' feature 2017-11-13 13:45:40 +08:00
zMingGit
f5d1be1f59 share permission refactor (#1843) 
* rebuild

* share admin

* use seafile_api

* rebase 6.2

* complete test

* api changed

* some error

* break up to two method

* review

* js review
 2017-11-01 18:13:51 +08:00
llj
1577275095 small fix 2017-11-01 15:42:03 +08:00
llj
946002b5c6 [dir view] file comment: fix 2017-10-13 18:00:37 +08:00
llj
b772a62b1a [my libs] repo 'folder perm': fix 2017-10-13 16:08:43 +08:00
llj
101872d5c4 [my libs] repo 'share links': fixed 'icon url' 2017-10-13 14:53:26 +08:00
llj
6ac3f5ae6e [devices] fix 2017-10-10 16:16:37 +08:00
Daniel Pan
5c095ee516 Merge pull request #1842 from haiwen/file-comment 
[dir view] added 'file comment'
 2017-09-26 02:06:09 -05:00
llj
b55446551b [dir view] added 'file comment' 2017-09-26 10:35:16 +08:00
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