lian
|
4af7d0df3f
|
add translate for out of quota
|
2018-05-17 17:52:07 +08:00 |
|
xiez
|
148c4becd8
|
Merge pull request #2119 from haiwen/copy-move-file-quota
check quota when copy/move file/dir
|
2018-05-17 11:12:59 +08:00 |
|
lian
|
ae77f70a36
|
Merge pull request #2121 from haiwen/search-filter-obj-type
add obj_type filter for search
|
2018-05-16 19:53:04 -07:00 |
|
zming
|
98be047c69
|
add obj_type filter for search
|
2018-05-17 10:41:40 +08:00 |
|
xiez
|
b22c92f9de
|
Merge pull request #2118 from haiwen/update-oauth
Update OAuth
|
2018-05-17 10:18:46 +08:00 |
|
xiez
|
bf5a97dec5
|
Merge pull request #2120 from haiwen/hash-update-notification
[HASH]update notification
|
2018-05-16 13:51:48 +08:00 |
|
ilearnit
|
abb6800bdf
|
[HASH]update notification
|
2018-05-16 13:45:47 +08:00 |
|
zhengxie
|
bb8d1ce3b2
|
Update group avatar tag
|
2018-05-16 11:43:32 +08:00 |
|
lian
|
e85a6ff3d4
|
check quota when copy/move file/dir
|
2018-05-16 10:53:08 +08:00 |
|
xiez
|
0737b3b5d2
|
Merge pull request #2117 from haiwen/user-event
return timestamp when get user events
|
2018-05-15 17:30:39 +08:00 |
|
lian
|
70f62942e3
|
return timestamp when get user events
|
2018-05-15 17:28:04 +08:00 |
|
xiez
|
086e46d32f
|
Merge pull request #2106 from haiwen/search-repo-type
return repo type when search file via api
|
2018-05-15 17:08:30 +08:00 |
|
zhengxie
|
a51bf28e44
|
[admin api] Update/Remove reference id
|
2018-05-15 14:19:03 +08:00 |
|
lian
|
0019ec6de0
|
Update OAuth
1, custom for sjtu.edu.cn's 'user_id' field
2, add user auth token to cookie
|
2018-05-12 13:59:17 +08:00 |
|
Daniel Pan
|
2eed2b9e1d
|
Merge pull request #2107 from haiwen/guest-search-user
update search user api
|
2018-05-11 15:56:24 +08:00 |
|
llj
|
f4b3bd4c42
|
[system admin] modified 'user quota'
|
2018-05-11 13:57:27 +08:00 |
|
zhengxie
|
f6460759bb
|
Remove captcha from thirdpart, update requirements
|
2018-05-11 11:59:17 +08:00 |
|
lian
|
9d79577094
|
Merge branch '6.2'
|
2018-05-10 17:29:23 +08:00 |
|
Daniel Pan
|
096814e2c6
|
Merge pull request #2111 from haiwen/group-quota
[address book] modified group quota shown and etc.
|
2018-05-10 13:19:14 +08:00 |
|
lian
|
ed16e644c3
|
return repo type when search file via api
|
2018-05-10 12:41:31 +08:00 |
|
llj
|
97b0e98c7d
|
[address book] modified group quota shown and etc.
|
2018-05-10 12:13:47 +08:00 |
|
lian
|
243aa2f5c9
|
Merge pull request #2109 from haiwen/set-quota-fix
[address book] added check for invalid input when set group quota
|
2018-05-09 19:09:02 -07:00 |
|
llj
|
266b6330b1
|
[address book] added check for invalid input when set group quota
|
2018-05-09 18:01:02 +08:00 |
|
llj
|
7142ff1e9f
|
[system admin] modification
* [libraries] don't show owner for group owned library, and etc.
* [groups] don't show owner and operations for address book group.
|
2018-05-09 17:15:57 +08:00 |
|
lian
|
dc97762ee7
|
update search user api
disable full email searh if current user is a guest user
|
2018-05-09 15:14:02 +08:00 |
|
llj
|
c0c449db48
|
[group] removed arrows in 'group setting' & 'group members' popups
|
2018-05-09 11:24:08 +08:00 |
|
Daniel Pan
|
bfe85c666f
|
Merge pull request #2104 from haiwen/invite-people-link
added 'invite people' link to 'share' & 'group manage members' popup
|
2018-05-08 19:34:42 +08:00 |
|
llj
|
4a761aac0f
|
added 'invite people' link to 'share' & 'group manage members' popup
|
2018-05-08 16:12:04 +08:00 |
|
zhengxie
|
f9cbe0ddac
|
[locale] Update translation
|
2018-05-08 13:54:52 +08:00 |
|
zhengxie
|
f0f8dac374
|
[locale] Update source string
|
2018-05-08 13:35:30 +08:00 |
|
llj
|
0e0d9c600a
|
modification for trans
|
2018-05-08 13:29:03 +08:00 |
|
Daniel Pan
|
35a531c4af
|
Merge pull request #2103 from haiwen/onlyoffice
fix bug of saving file via onlyoffice
|
2018-05-08 12:24:52 +08:00 |
|
lian
|
31d0a28868
|
fix bug of saving file via onlyoffice
|
2018-05-08 12:22:39 +08:00 |
|
llj
|
3a78dc756d
|
small modification
|
2018-05-08 12:17:33 +08:00 |
|
zhengxie
|
03dac0bceb
|
[locale] Update source strings
|
2018-05-08 11:20:49 +08:00 |
|
C_Q
|
fe3ebd1f2a
|
fix hash url bug (#2097)
|
2018-05-08 10:45:58 +08:00 |
|
Daniel Pan
|
38a902b22d
|
Merge pull request #2099 from haiwen/address-book-group-lj0507
Address book group
|
2018-05-08 10:39:36 +08:00 |
|
llj
|
d31be081b0
|
[user panel] group: modified color of address book group icon
|
2018-05-08 10:37:03 +08:00 |
|
lian
|
1fd1f43177
|
filter out address book group when: (#2092)
1. share library/folder
2. set folder permission
|
2018-05-08 10:24:58 +08:00 |
|
llj
|
bed8636724
|
[address book] modification for UI
|
2018-05-07 19:55:41 +08:00 |
|
llj
|
862192514c
|
list all wikis (#2095)
* [wiki] Update list wikis
* [wikis] show wiki owner
|
2018-05-04 16:20:01 +08:00 |
|
llj
|
1b6a8479da
|
[user panel] added 'group owned library' function
|
2018-05-04 14:43:17 +08:00 |
|
zhengxie
|
2f5fff9b80
|
[settings] Add LOGOUT_URL which is removed in djagno 1.11
|
2018-05-02 11:58:14 +08:00 |
|
Daniel Pan
|
432ba6f1f5
|
Merge pull request #2091 from haiwen/post-dir-2
update create dir api v2.1
|
2018-04-28 16:21:29 +08:00 |
|
lian
|
ca77136586
|
update create dir api v2.1
recreate dir when failed when `file already exists'.
|
2018-04-28 16:14:24 +08:00 |
|
llj
|
b87f0312d7
|
[js] use uncompressed js.cookie.js, for the sake of 'dist'
|
2018-04-28 15:11:33 +08:00 |
|
Daniel Pan
|
454c5934c8
|
Merge pull request #2089 from haiwen/post-dir
update create dir api
|
2018-04-28 11:35:59 +08:00 |
|
lian
|
d6a9988a92
|
update create dir api
recreate dir when failed when `file already exists'.
|
2018-04-28 11:34:53 +08:00 |
|
lian
|
c82f040cc7
|
Refactor view edit file (#2084)
* remove unused code
remove api_convert_desc_link, prepare_events, view_repo_file
* refactor file view function
|
2018-04-27 16:45:44 +08:00 |
|
zhengxie
|
091b4d1933
|
Add dev requirements
|
2018-04-27 16:26:29 +08:00 |
|