Daniel Pan
|
a42d2ebd13
|
Merge pull request #1510 from haiwen/file-view
[file view] improvement
|
2017-03-11 13:44:59 +08:00 |
|
llj
|
75261cfaf6
|
[settings] modification for custom
|
2017-03-11 13:43:37 +08:00 |
|
lian
|
c4b527302f
|
admin remove unexisted user's deivce
|
2017-03-11 11:29:05 +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 |
|
lian
|
8286f73331
|
add api of amdin manage org user
|
2017-03-09 16:42:09 +08:00 |
|
Daniel Pan
|
4cf035986c
|
Merge pull request #1508 from haiwen/delete-repo
update admin delete repo api
|
2017-03-09 12:58:58 +08:00 |
|
lian
|
735654d6b9
|
update admin delete repo api
for case of `seafile-data` has been damaged
no `repo object` will be returned from seafile api
delete the database record anyway
|
2017-03-08 18:20:49 +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 |
|
Daniel Pan
|
fdba056093
|
Merge pull request #1502 from haiwen/magnific-fix
[dir view] bugfix for 'magnificPopup' & 'grid-item download'
|
2017-02-28 17:13:00 +08:00 |
|
llj
|
acc1ebb6eb
|
[dir view] bugfix for 'magnificPopup' & 'grid-item download'
|
2017-02-25 17:36:07 +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 |
|
xiez
|
e9035a29f2
|
Merge pull request #1499 from haiwen/download-file
update permission check when download file from history
|
2017-02-24 18:14:24 +08:00 |
|
lian
|
f99e53680e
|
update permission check when download file from history
|
2017-02-24 18:13:20 +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
|
8a113bf1eb
|
Merge pull request #1497 from haiwen/update-fix
[fileupload] update-confirm-popup: fix
|
2017-02-22 17:05:51 +08:00 |
|
llj
|
e65a95c707
|
[fileupload] update-confirm-popup: fix
|
2017-02-22 16:44:14 +08:00 |
|
llj
|
059954689c
|
[file view] fix
|
2017-02-22 11:30:07 +08:00 |
|
xiez
|
ff0bc5af47
|
Merge pull request #1486 from haiwen/import-users
update import users
|
2017-02-22 10:17:28 +08:00 |
|
llj
|
65f591b431
|
[file view] modification
|
2017-02-21 18:23:14 +08:00 |
|
lian
|
86b7925d5f
|
update import users
|
2017-02-21 18:14:04 +08:00 |
|
lian
|
385a2ef096
|
update import users
fix bug when user upload a invalid csv file
|
2017-02-21 17:19:20 +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 |
|
xiez
|
1d96513cb6
|
Merge pull request #1488 from haiwen/default-lib
add api of admin create default repo for common user
|
2017-02-20 12:06:49 +08:00 |
|
lian
|
c396babd67
|
use "My Library" as default repo name
|
2017-02-20 11:58:59 +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 |
|
lian
|
b7cad9a707
|
add api of admin create default repo for common user
|
2017-02-17 11:46:37 +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 |
|