1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-06-22 05:08:33 +00:00
Commit Graph

177 Commits

Author SHA1 Message Date
llj
ce23a58edf [group owned repo] share: enable 'share to user/group' 2018-06-15 14:22:10 +08:00
llj
b0df96a948 [user panel] group owned library: enable group admin to set folder perm 2018-05-18 12:12:01 +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
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
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
1182a80989 Merge branch '6.2' 2018-03-15 11:26:02 +08:00
llj
88478dee1d [upgrade jquery] modifications, & cleaned up code & files 2018-02-05 16:47:56 +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
d621e79bba [invite people] enable to invite multiple guests at one time 2017-12-19 12:05:51 +08:00
llj
b16a829ead added transition to show/hide of feedback messages 2017-12-12 17:13:01 +08:00
llj
07dea7eca4 new design 2017-12-05 17:53:45 +08:00
llj
b55446551b [dir view] added 'file comment' 2017-09-26 10:35:16 +08:00
zMingGit
12ba328119 limit ip 2017-09-18 14:21:11 +08:00
lian
bc492b9010 add admin role/log feature 2017-09-09 15:27:04 +08:00
llj
ab5c066a74 [lib icons] use new lib icons 2017-08-26 11:07:12 +08:00
zhengxie
21701ef3b3 Merge branch 'setLibHistory'
Conflicts:
	seahub/urls.py
2017-08-23 15:37:29 +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
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
llj
8be017e917 [dirent details] add 'tags' 2017-07-12 10:47:52 +08:00
llj
5d48dac96c [dirent details] improvement; show more info for folders 2017-07-04 17:49:36 +08:00
llj
0015a9a6c8 [system admin] enable user to upload a license file 2017-07-04 10:39:11 +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
88c79b4894 [repo details] added 'file count' 2017-06-27 18:58:08 +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
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
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
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