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
xiez
1c08c67d24
Merge pull request #1672 from haiwen/system-lib
...
add admin system library upload api
2017-07-03 14:55:45 +08:00
lian
46a5473326
add amdin system library upload api
2017-07-03 14:42:12 +08:00
xiez
0100d6da8b
Merge pull request #1675 from haiwen/multi-copy-move
...
update multi copy/move dirents api
2017-07-03 13:12:51 +08:00
lian
0f32bf26fe
update multi copy/move dirents api
2017-07-03 12:24:07 +08:00
lian
101a2015ba
rm system lib check when get user folder permission
2017-07-03 11:32:51 +08:00
zhengxie
da4918d7a9
[tests] Update phantomjs installation
2017-07-03 11:22:59 +08:00
zhengxie
d36be41630
Update travis
2017-07-03 10:52:56 +08:00
Daniel Pan
696a2e667d
Merge pull request #1655 from haiwen/deleted-repos
...
Deleted repos
2017-07-01 12:04:11 +08:00
llj
c9292a2e9e
[deleted libs] modification
2017-07-01 12:00:17 +08:00
llj
2df50901f8
modified avatar
2017-06-30 18:30:10 +08:00
llj
735faec773
[deleted libs] list deleted libraries, and enable user to restore a library
2017-06-30 16:31:08 +08:00
zming
734766391a
[api2] get deleted-repos,and restore deleted-repos
2017-06-30 16:22:29 +08:00
xiez
aab90d8ab9
Merge pull request #1671 from haiwen/dirent-op-fix
...
[dir view] fix for 'dirent share/del'
2017-06-30 15:50:02 +08:00
fanghao
3149a4d49d
license
2017-06-30 15:35:31 +08:00
xiez
5fa44a771e
Merge pull request #1664 from TMHBOFH/ONLYOFFICE_EDIT_FILE_EXTENSION
...
Onlyoffice edit file extension
2017-06-30 15:00:12 +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
Daniel Pan
149a591528
Merge pull request #1668 from haiwen/admin-upload-link
...
admin upload links
2017-06-30 13:09:01 +08:00
lian
d4716acf11
admin upload links
...
fix bug: use upload token
2017-06-30 11:41:22 +08:00
Daniel Pan
b2cc92da36
Merge pull request #1665 from haiwen/lib-details
...
[repo details] improvement
2017-06-28 11:42:13 +08:00
llj
aa6416d30d
[repo details] improvement
2017-06-28 11:37:52 +08:00
TMHBOFH
6184c2631f
Update file.py
2017-06-27 13:43:29 +02:00
TMHBOFH
b6307540c7
Update settings.py
2017-06-27 13:40:38 +02:00
TMHBOFH
e383fbdf33
Merge pull request #2 from haiwen/6.1
...
6.1
2017-06-27 13:37:33 +02:00
llj
1ce4c18f9c
Merge pull request #1660 from haiwen/lib-details
...
[my libraries] added 'repo details'
2017-06-27 19:01:26 +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
1ef77ef036
Merge pull request #1661 from haiwen/normalize_path
...
normalize file/dir path
2017-06-27 18:08:10 +08:00
xiez
2269e8ed2c
Merge pull request #1662 from haiwen/repo-info
...
add `file_count` info
2017-06-27 18:06:13 +08:00
lian
070f68e3e4
add get repo info api for v2.1
2017-06-27 17:23:10 +08:00
lian
2e5d8bc1ed
update get repo info api
...
add `file_count` and rm `desc`
2017-06-27 16:32:19 +08:00
lian
68c5e764d6
normalize file/dir path
...
1. Add '/' at the end of directory path if necessary.
1. And make sure path starts with '/'
2017-06-27 11:34:09 +08:00
zhengxie
25561d7e99
[invitation] Enable sysadmin to remove invitations
2017-06-26 17:11:38 +08:00
Daniel Pan
12b8a1502c
Merge pull request #1657 from haiwen/trash-api
...
sort item by `delete_time` when get repo trash via api
2017-06-26 15:02:35 +08:00
lian
6d0a49c742
sort item by delete_time when get repo trash via api
2017-06-26 14:03:40 +08:00
zhengxie
e30d19c791
[shibboleth] Fix empty role quota issue which will cause page unavailable
2017-06-26 10:33:54 +08:00
Daniel Pan
93dae41ca5
Merge pull request #1654 from haiwen/info-icon
...
[system admin] side nav: modified icon for 'Info'
2017-06-22 16:49:27 +08:00
llj
9215defff4
[system admin] side nav: modified icon for 'Info'
2017-06-22 16:40:41 +08:00
zhengxie
966e0bcb9c
[api] Improve dir list performance
2017-06-22 15:38:59 +08:00
Daniel Pan
b0bd1176f2
Merge pull request #1653 from haiwen/wopi-update
...
update wopi api
2017-06-22 14:36:20 +08:00
lian
d1049dda8e
update wopi api
...
1. use utc timestamp for access_token_ttl
1. return 404 when user/repo/file not found
2017-06-22 14:32:20 +08:00
Daniel Pan
d83d689300
Merge pull request #1651 from haiwen/wopi-excel
...
rm x_wopi_oldlock check for xlsx file
2017-06-22 11:32:46 +08:00
lian
c0a7456c3a
rm x_wopi_oldlock check for xlsx file
2017-06-22 11:30:49 +08:00
xiez
9674334932
Merge pull request #1642 from haiwen/admin-share-link
...
add admin share link api
2017-06-22 10:02:18 +08:00
lian
018544112d
use email2contact_email
2017-06-21 16:43:08 +08:00
lian
9750e8baaf
add admin share/upload links api
...
1. get share/upload link info by token
1. get dirents of shared dir
1. get download/upload fileserver url of shared file/dir
1. check share/upload link password
2017-06-21 15:15:24 +08:00
xiez
0fd34dcb57
Merge pull request #1647 from haiwen/fix-location-header-after-creating-directory
...
Fixed the location header after creating directory.
2017-06-20 11:34:37 +08:00
xiez
1a61efe05e
Merge pull request #1643 from haiwen/access-token
...
Access token
2017-06-20 11:33:06 +08:00
