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 |
|
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 |
|
xiez
|
24d63565ef
|
Merge pull request #1481 from haiwen/virus
[notificaion] Handle the case that filename contains :
|
2017-02-13 16:59:52 +08:00 |
|
zhengxie
|
e52aa50fe6
|
[notificaion] Handle the case that filename contains :
|
2017-02-13 16:57:01 +08:00 |
|
lian
|
2b43226d08
|
Merge pull request #1475 from haiwen/odf-view
[ODF] modified file view for ODF; fix bugs
|
2017-02-13 16:49:12 +08:00 |
|
Daniel Pan
|
f0a610cf69
|
Merge pull request #1480 from haiwen/search-user
update search user
|
2017-02-13 16:48:26 +08:00 |
|
lian
|
c904884526
|
update search user
user can search if he/she has no permission of using global address book
|
2017-02-13 16:03:31 +08:00 |
|
llj
|
5802a37628
|
[ODF] update test
|
2017-02-13 15:54:14 +08:00 |
|
xiez
|
801ec6455e
|
Merge pull request #1479 from haiwen/virus
Virus
|
2017-02-13 13:36:31 +08:00 |
|
zhengxie
|
2cb9d4c753
|
[notification] Update virus scan notice
|
2017-02-13 11:37:53 +08:00 |
|
Daniel Pan
|
7736ff0893
|
Merge pull request #1478 from haiwen/group-name
add exception check when get user joined groups
|
2017-02-10 18:20:24 +08:00 |
|
Daniel Pan
|
08c6cc69ce
|
Merge pull request #1477 from haiwen/dirent-download-api
rm unused dirent download api
|
2017-02-10 18:19:28 +08:00 |
|
lian
|
edf0707d5b
|
add exception check when get user joined groups
|
2017-02-10 18:15:58 +08:00 |
|
lian
|
f5ac28a38c
|
rm unused dirent download api
|
2017-02-10 18:04:56 +08:00 |
|
Daniel Pan
|
4baaa29d17
|
Merge pull request #1467 from haiwen/ldap
Update LDAP checking
|
2017-02-10 14:26:04 +08:00 |
|
xiez
|
6fd822f45f
|
Merge pull request #1457 from haiwen/admin-group
udpate admin groups page
|
2017-02-09 18:11:09 +08:00 |
|
xiez
|
94dc6e3488
|
Merge pull request #1474 from haiwen/update-import-user
update admin import user
|
2017-02-09 18:04:40 +08:00 |
|