Daniel Pan
|
c40b67b297
|
Merge pull request #1253 from haiwen/improve-nav
Improve navigation and tips
|
2016-07-18 22:08:42 +08:00 |
|
llj
|
b2a9291fc3
|
improved nav
|
2016-07-18 19:08:48 +08:00 |
|
Daniel Pan
|
7b171b9903
|
Improve navigation and tips
|
2016-07-18 19:06:06 +08:00 |
|
lian
|
efdc55ffd3
|
rm joined groups from middleware (#1287)
* rm joined groups from middleware
* rm "base_template" code from context_processors.py
* clean unused group add code
|
2016-07-18 18:30:50 +08:00 |
|
xiez
|
5c2616ed30
|
Merge pull request #1284 from haiwen/rm-org-user
[sysadmin] update rm org user
|
2016-07-15 18:13:45 +08:00 |
|
xiez
|
59ac32c652
|
Merge pull request #1286 from haiwen/two-factor-auth
update two factor auth code
|
2016-07-15 18:13:21 +08:00 |
|
lian
|
eabca58996
|
update two factor auth code
|
2016-07-15 18:03:27 +08:00 |
|
llj
|
3af253401d
|
[two factor auth] modified UI (#1273)
* [two factor auth] modified UI
* [2fa] login: modified UI
* WIP: update two-factor auth
* [2fa] improvement
|
2016-07-15 14:39:23 +08:00 |
|
lian
|
b5d9ece164
|
rm synced repos at devices page (#1285)
|
2016-07-14 13:54:17 +08:00 |
|
lian
|
12fd7a93d9
|
[sysadmin] update rm org user
|
2016-07-13 18:08:28 +08:00 |
|
lian
|
fe236eca03
|
[api] rm virtual repo related code (#1279)
|
2016-07-13 17:34:16 +08:00 |
|
Daniel Pan
|
8b8f374693
|
Merge pull request #1283 from haiwen/license-user
[api] return licensed to info when get sysinfo
|
2016-07-13 16:43:39 +08:00 |
|
lian
|
fcd3e836e3
|
[api] return licensed to info when get sysinfo
|
2016-07-13 16:31:05 +08:00 |
|
Daniel Pan
|
9ca09845ad
|
Merge pull request #1282 from haiwen/org
Org
|
2016-07-13 15:31:07 +08:00 |
|
llj
|
8c4df36598
|
rm unused files
|
2016-07-13 15:19:27 +08:00 |
|
llj
|
aa2e77e191
|
[org] bugfix
|
2016-07-13 15:04:43 +08:00 |
|
Daniel Pan
|
756fee89da
|
Merge pull request #1280 from haiwen/admin-search-user
[sysadmin] add search user by name & contact email
|
2016-07-13 11:46:15 +08:00 |
|
lian
|
70adf6d552
|
[sysadmin] add search user by name & contact email
|
2016-07-13 11:22:36 +08:00 |
|
Daniel Pan
|
b518955a28
|
Merge pull request #1278 from haiwen/search-user
[api2] update search user api
|
2016-07-12 15:16:55 +08:00 |
|
lian
|
8f1dbb7ea3
|
update search user api
|
2016-07-12 15:04:36 +08:00 |
|
Daniel Pan
|
fa629da91a
|
Merge pull request #1277 from haiwen/pdf_view
[pdf file view] fix for view with pdf2html
|
2016-07-12 12:13:30 +08:00 |
|
llj
|
dcb47532fc
|
[pdf file view] fix for view with pdf2html
|
2016-07-12 11:42:46 +08:00 |
|
Daniel Pan
|
9d57572b47
|
Merge pull request #1276 from haiwen/rm
rm unused files
|
2016-07-11 17:12:50 +08:00 |
|
llj
|
c39b0b5ff3
|
rm unused files
|
2016-07-11 17:03:58 +08:00 |
|
xiez
|
6dee46f7d1
|
Merge pull request #1275 from haiwen/license-info
update license info
|
2016-07-11 14:15:05 +08:00 |
|
lian
|
4f43f31468
|
[api] update license info
|
2016-07-11 12:08:44 +08:00 |
|
xiez
|
7bf6ed0d5d
|
Merge pull request #1272 from haiwen/dir-sub-repo
update create dir sub repo api
|
2016-07-08 15:40:22 +08:00 |
|
lian
|
d89c3bd906
|
update create dir sub repo api
|
2016-07-08 10:15:13 +08:00 |
|
zhengxie
|
decb3615ed
|
Enable institution admin to toggle user status
|
2016-07-06 15:57:41 +08:00 |
|
Daniel Pan
|
61161b5f20
|
Merge pull request #1270 from haiwen/user-group
remove user from group when a user is deleted
|
2016-07-06 15:50:35 +08:00 |
|
lian
|
53ef38f6a2
|
remove user from group when a user is deleted
|
2016-07-06 15:42:06 +08:00 |
|
Daniel Pan
|
977bfe0389
|
Merge pull request #1269 from haiwen/contact_email
[contact_email] modified 'share popup' & 'user profile'
|
2016-07-05 16:08:37 +08:00 |
|
llj
|
8bd80118b2
|
[contact_email] modified 'share popup' & 'user profile'
|
2016-07-05 16:02:33 +08:00 |
|
Daniel Pan
|
70692d1fb6
|
Merge pull request #1267 from haiwen/wopi
[OWA] udpate permission when view file via OWA
|
2016-07-05 14:03:13 +08:00 |
|
Daniel Pan
|
708cb750cc
|
Merge pull request #1262 from haiwen/download-dir-zip
update download dir/multi
|
2016-07-04 17:52:46 +08:00 |
|
llj
|
f9500c4f61
|
[download zip] improvement, bugfix
|
2016-07-04 15:40:11 +08:00 |
|
lian
|
6dca56e9d5
|
update download dir/multi
|
2016-07-04 15:31:55 +08:00 |
|
lian
|
8ccf782728
|
[OWA] udpate permission when view file via OWA
|
2016-07-01 17:18:09 +08:00 |
|
xiez
|
1e3b088e30
|
Merge pull request #1268 from haiwen/update-test
update share/upload link test
|
2016-07-01 17:17:27 +08:00 |
|
lian
|
369c9f3bf8
|
update share/upload link test
|
2016-07-01 17:06:27 +08:00 |
|
lian
|
c4fa072dc7
|
new share admin page (#1233)
|
2016-06-30 15:06:43 +08:00 |
|
zhengxie
|
532ae5357d
|
[sql] Remove lock statements
|
2016-06-30 10:45:35 +08:00 |
|
Daniel Pan
|
70021ebc18
|
Merge pull request #1264 from haiwen/transfer-repo-comment
[transfer repo] add more comment
|
2016-06-29 15:21:45 +08:00 |
|
lian
|
f39333c8c7
|
[transfer repo] add more comment
|
2016-06-29 15:17:48 +08:00 |
|
Daniel Pan
|
523c76864c
|
Merge pull request #1263 from haiwen/transfer-repo
update repo share
|
2016-06-29 14:52:31 +08:00 |
|
lian
|
ed10512a53
|
update repo share
1. reshare repo after user/admin transfer repo
2. show org repo share out list at share popup in org mode
|
2016-06-28 16:49:41 +08:00 |
|
Daniel Pan
|
85bb2cd076
|
Merge pull request #1261 from haiwen/enhancement/user_permissions
Add role permissions
|
2016-06-28 14:38:25 +08:00 |
|
zhengxie
|
cc82b46193
|
Fix unicode error in api response, ref https://forum.seafile.de/t/users-with-umlauts-in-their-display-name-breaks-group-management/4800
|
2016-06-28 11:09:13 +08:00 |
|
Daniel Pan
|
8f4b7648ac
|
Fix license file
|
2016-06-28 10:03:26 +08:00 |
|
Daniel Pan
|
a57e8b798c
|
Fix the license file
|
2016-06-28 10:00:15 +08:00 |
|