haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 08:16:07 +00:00
Code Issues Releases Wiki Activity
5,733 Commits 146 Branches 461 Tags
b7d3a62b523ed2a5872b19e7eb8fc425ece799fd
Commit Graph

5733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lian
b7d3a62b52 mock has permission 2017-03-24 18:12:27 +08:00
lian
54ec4bba63 add test for admin log api 2017-03-23 15:05:47 +08:00
lian
5427563233 add test for admin libraires api 2017-03-22 17:26:42 +08:00
lian
72ffdd54e6 update admin log 2017-03-22 17:26:42 +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
893f3db8c0 Merge pull request #1517 from haiwen/batch-update 
update user batch api
 2017-03-22 16:55:48 +08:00
llj
2568d72e15 Merge pull request #1514 from haiwen/user-batch-op 
[system admin] users: added 'set quota / delete users in batch'
 2017-03-22 16:52:57 +08:00
llj
e2e9e6c127 [system admin] users: added 'set quota / delete users in batch' 2017-03-16 18:02:03 +08:00
lian
0cdbac5192 update user batch api 2017-03-16 17:46:16 +08:00
xiez
5d08286467 Merge pull request #1507 from haiwen/admin-user-batch-api 
admin user batch api
 2017-03-14 16:19:45 +08:00
xiez
d1f3dd154c Merge pull request #1440 from haiwen/org_user_quota 
Use seafile_api to set/get org user quota
 2017-03-13 17:42:21 +08:00
Daniel Pan
a42d2ebd13 Merge pull request #1510 from haiwen/file-view 
[file view] improvement
 2017-03-11 13:44:59 +08:00
llj
b697f7258a [file view] improvement 2017-03-11 11:12:07 +08:00
Daniel Pan
b42d11ccb4 Merge pull request #1509 from haiwen/upload-folder 
modified 'upload folder'
 2017-03-09 17:44:43 +08:00
llj
6fa7a778d0 modified 'upload folder' 2017-03-09 17:40:57 +08:00
Daniel Pan
f240691f07 Merge pull request #1505 from haiwen/pdf 
[pdf file view] for use_pdfjs: modification for high dpi
 2017-03-07 17:31:43 +08:00
llj
81c2fadcf3 [pdf file view] for use_pdfjs: modification for high dpi 2017-03-07 16:11:20 +08:00
Daniel Pan
479c6b2c47 Merge pull request #1504 from haiwen/share-link 
[share link] improvement
 2017-03-06 10:26:37 +08:00
lian
287bad0de7 admin user batch api 
set quota & delete user
 2017-03-04 09:59:34 +08:00
llj
d7079882ea [share link] improvement 2017-03-02 16:04:18 +08:00
lian
5e70dd8608 Merge pull request #1501 from haiwen/enhancement/share_link 
[share link] Enlarge token length
 2017-02-25 17:28:21 +08:00
Daniel Pan
bd655e1e69 Merge pull request #1496 from haiwen/file-view 
[file view] modification
 2017-02-24 10:19:42 +08:00
llj
e2282716da [history/snapshot/shared/trash file view] modified 'view-hd' 2017-02-22 17:52:35 +08:00
llj
059954689c [file view] fix 2017-02-22 11:30:07 +08:00
llj
65f591b431 [file view] modification 2017-02-21 18:23:14 +08:00
xiez
78a1384cae Merge pull request #1495 from haiwen/move-dir 
fix bug when move dir
 2017-02-21 15:35:31 +08:00
Daniel Pan
f9d08673a2 Merge pull request #1494 from haiwen/drag-drop-fix 
[dir view] fix for 'move via drag & drop'
 2017-02-21 11:52:05 +08:00
lian
616b80d188 fix bug when move dir 2017-02-20 17:55:34 +08:00
llj
8f54c031e4 [dir view] fix for 'move via drag & drop' 2017-02-20 17:40:36 +08:00
zhengxie
ca399d38f8 [share link] Enlarge token length 2017-02-20 15:59:57 +08:00
Daniel Pan
6eee32e805 Merge pull request #1492 from haiwen/side-nav 
[side nav] fix for non-backbone pages
 2017-02-20 11:20:43 +08:00
llj
bcef81c006 [side nav] fix for non-backbone pages 2017-02-20 11:13:33 +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
Daniel Pan
08ce98ec19 Merge pull request #1490 from haiwen/set-quota-ui 
[UI] modified <input> ui of set-quota-form
 2017-02-17 16:33:54 +08:00
llj
45fd5aa1b2 [UI] modified <input> ui of set-quota-form 2017-02-17 13:59:45 +08:00
Daniel Pan
096e2e06bb Merge pull request #1489 from haiwen/fix 
[dir view] '.repo-op' UI: bugfix
 2017-02-17 13:36:56 +08:00
llj
c8f5d4ed5d [dir view] '.repo-op' UI: bugfix 2017-02-17 13:26:43 +08:00
zhengxie
5c78328b08 [i18n] Update locales 2017-02-17 10:47:17 +08:00
zhengxie
5b7706e1c1 [i18n] Update source files 2017-02-17 10:30:33 +08:00
Daniel Pan
c86170f6ae Merge pull request #1487 from haiwen/img-view 
[file view] Image: redesigned it
 2017-02-17 10:24:01 +08:00
llj
8dde793b60 [file view] Image: redesigned it 2017-02-16 17:37:12 +08:00
xiez
93d62b761f Merge pull request #1483 from haiwen/share-admin 
update api of out shared repos/folders
 2017-02-16 13:03:49 +08:00
xiez
77d416bd6a Merge pull request #1485 from haiwen/repo_delete 
[api2] Send signal when sysadmin delete a repo
 2017-02-16 11:42:42 +08:00
zhengxie
e5a841ebf8 [api2] Send signal when sysadmin delete a repo 2017-02-16 11:32:31 +08:00
lian
fefb450b76 update api of out shared repos/folders 
return contact email when get info of out shared repos/folders
 2017-02-15 13:56:41 +08:00
Daniel Pan
8bfba7b0a2 Merge pull request #1482 from haiwen/search-user 
update search user
 2017-02-14 20:06:27 +08:00
lian
8f2df766a9 update search user when not use global address book 2017-02-14 18:38:39 +08:00