lian
|
005eff0f5b
|
update system setting page
|
2017-07-26 11:41:29 +08:00 |
|
Daniel Pan
|
766cc95441
|
Merge pull request #1722 from haiwen/export-users
update role inf when export user to excel
|
2017-07-26 11:34:28 +08:00 |
|
lian
|
f9c2c10249
|
update role inf when export user to excel
|
2017-07-26 11:29:06 +08:00 |
|
Daniel Pan
|
dd4006abb4
|
Merge pull request #1721 from haiwen/sysinfo
update get count of devices
|
2017-07-26 11:28:39 +08:00 |
|
lian
|
7149391854
|
update get count of devices
|
2017-07-26 11:19:51 +08:00 |
|
lian
|
cf9e540330
|
Merge pull request #1687 from TMHBOFH/useradd-view-all-roles
Useradd dialog show all roles
|
2017-07-24 14:08:40 +08:00 |
|
Daniel Pan
|
672bd6fdc5
|
Merge pull request #1715 from haiwen/upload-bytes
rm authentication check when getting uploaded bytes
|
2017-07-22 08:51:12 +08:00 |
|
Daniel Pan
|
82adc738c5
|
Merge pull request #1676 from haiwen/revision-tag
Revision tag
|
2017-07-21 18:14:11 +08:00 |
|
lian
|
52f261b021
|
rm authentication check when getting uploaded bytes
|
2017-07-21 15:25:06 +08:00 |
|
zming
|
d28e597921
|
[API2] ReversionTag
|
2017-07-21 12:30:55 +08:00 |
|
Daniel Pan
|
33f3728dc8
|
Merge pull request #1714 from haiwen/org-user-info
update org quota
|
2017-07-21 10:14:07 +08:00 |
|
lian
|
958ba9b541
|
update org quota
seafile_api.get_org_quota(org_id)
seafile_api.set_org_user_quota(org_id, email, user_quota)
|
2017-07-21 10:00:00 +08:00 |
|
Daniel Pan
|
2cd4bc9930
|
Merge pull request #1713 from haiwen/ldap-user-role
add role feature for ladp imported user
|
2017-07-20 15:37:58 +08:00 |
|
lian
|
0ee40ee11d
|
add role feature for ladp imported user
|
2017-07-20 14:54:12 +08:00 |
|
Daniel Pan
|
4c776b0f17
|
Merge pull request #1705 from haiwen/org-user-info
update admin org user api
|
2017-07-20 14:07:48 +08:00 |
|
Daniel Pan
|
c0a616d0e2
|
Merge pull request #1709 from haiwen/thumbnail-size
update settings.py
|
2017-07-17 18:17:47 +08:00 |
|
lian
|
e68ef566b8
|
update settings.py
use 30(MB) as the default value of `THUMBNAIL_IMAGE_SIZE_LIMIT`
|
2017-07-17 18:14:09 +08:00 |
|
Daniel Pan
|
7a63a373de
|
Merge pull request #1708 from haiwen/wopi-settings
update `WOPI_ACCESS_TOKEN_EXPIRATION` to 12 hours
|
2017-07-17 10:38:44 +08:00 |
|
lian
|
3d7d3ea3c8
|
update WOPI_ACCESS_TOKEN_EXPIRATION to 12 hours
|
2017-07-17 10:36:36 +08:00 |
|
Daniel Pan
|
8a853b3061
|
Merge pull request #1670 from haiwen/file-tag
file tag
|
2017-07-16 16:16:49 +08:00 |
|
Daniel Pan
|
80e483c5c0
|
Merge pull request #1666 from haiwen/new-login
[UI] new login
|
2017-07-16 16:13:35 +08:00 |
|
zming
|
423a3f0e25
|
Merge branch 'clear-invitations' into 6.1
|
2017-07-15 17:52:08 +08:00 |
|
zming
|
9e1fb76166
|
update invalid args
|
2017-07-15 17:46:46 +08:00 |
|
llj
|
49cd320dff
|
[system admin] invitations: bugfix & improvement
|
2017-07-15 17:35:30 +08:00 |
|
xiez
|
de5340d526
|
Merge pull request #1673 from haiwen/access-log
update file audit/update api
|
2017-07-15 16:44:46 +08:00 |
|
lian
|
04699f3c07
|
use get org repo owner
|
2017-07-15 16:14:21 +08:00 |
|
lian
|
f62a206ed8
|
update admin org user api
|
2017-07-15 16:00:30 +08:00 |
|
lian
|
dfa336f96c
|
update api utils.py
|
2017-07-15 15:57:19 +08:00 |
|
lian
|
a45c9bd0a8
|
update file audit/update api
add library owner/ID info to file audit/update api
|
2017-07-15 15:57:19 +08:00 |
|
xiez
|
f8235ec7b2
|
Merge pull request #1704 from haiwen/is-org-user
update `is_org_user` func
|
2017-07-15 15:53:58 +08:00 |
|
lian
|
7e4c07d768
|
update is_org_user func
|
2017-07-15 15:52:47 +08:00 |
|
xiez
|
dbfd758067
|
Merge pull request #1688 from haiwen/org-share-repo
check if is org user before share repo/dir to user
|
2017-07-15 15:48:21 +08:00 |
|
lian
|
7b9c9bebcb
|
check if is org user before share repo/dir to user
|
2017-07-15 15:46:35 +08:00 |
|
xiez
|
64832adc03
|
Merge pull request #1674 from haiwen/license
license
|
2017-07-15 15:37:06 +08:00 |
|
zhengxie
|
b1e9f5beb3
|
reload license when updated and update tests
|
2017-07-15 15:28:41 +08:00 |
|
lian
|
89392f3061
|
Merge pull request #1693 from haiwen/gif
Don't use 'big' thumbnail for gif files
|
2017-07-15 15:14:11 +08:00 |
|
llj
|
0cd68a9a64
|
[login] modified UI
|
2017-07-15 14:16:21 +08:00 |
|
xiez
|
0de932bec9
|
Merge pull request #1703 from haiwen/two-factor-auth
Two factor auth
|
2017-07-15 13:48:33 +08:00 |
|
zming
|
c0f512aca6
|
update test
|
2017-07-15 12:24:52 +08:00 |
|
Daniel Pan
|
ae207a7f85
|
Merge pull request #1702 from haiwen/file-view-btns-fix
[file view] op btns: fixed UI
|
2017-07-15 11:45:00 +08:00 |
|
llj
|
dc27044a63
|
[file view] op btns: fixed UI
|
2017-07-15 11:35:02 +08:00 |
|
llj
|
49121c900c
|
Merge pull request #1701 from haiwen/notification-interval
update notification interval
|
2017-07-15 11:12:43 +08:00 |
|
lian
|
3dc584ea97
|
update notification interval
set 3 * 60 as the default interval for the js value.
|
2017-07-15 11:05:58 +08:00 |
|
Daniel Pan
|
49b1c43be5
|
Merge pull request #1700 from haiwen/image-rotate-expand
update thumbnail
|
2017-07-14 18:05:27 +08:00 |
|
lian
|
89d569af27
|
update thumbnail
add `expand` parameter when rotate a image 90 degrees
|
2017-07-14 17:53:16 +08:00 |
|
llj
|
9efb26eca8
|
[system admin] user info: added 'disable two-factor auth' & bug fix
|
2017-07-14 16:57:01 +08:00 |
|
zhengxie
|
1bcef1e7fb
|
[role perm] Use default role if not set in settings
|
2017-07-14 16:52:35 +08:00 |
|
Daniel Pan
|
c316f0e144
|
Merge pull request #1697 from haiwen/for-ie
[base.html] modification for IE
|
2017-07-13 17:30:36 +08:00 |
|
llj
|
6cfd0e2933
|
[base.html] modification for IE
|
2017-07-13 17:25:57 +08:00 |
|
zming
|
f51d8122e9
|
rm expire invitations
|
2017-07-13 15:41:30 +08:00 |
|