Daniel Pan
|
0505d1054d
|
Merge pull request #1746 from haiwen/logout
[header] added 'log out' icon
|
2017-08-08 12:24:57 +08:00 |
|
llj
|
15455fd45c
|
[base.html] removed 'log out' icon
|
2017-08-07 18:29:05 +08:00 |
|
llj
|
23d4c2dd1e
|
[system admin] removed 'log out' icon
|
2017-08-07 18:15:51 +08:00 |
|
llj
|
073e4b5d28
|
[header] added 'log out' icon
|
2017-08-07 13:56:25 +08:00 |
|
Daniel Pan
|
87a52538be
|
Merge pull request #1744 from haiwen/user-export-excel
admin export users to excel
|
2017-08-06 11:14:56 +08:00 |
|
Daniel Pan
|
3f3a8bee81
|
Merge pull request #1742 from haiwen/batch-copy-dir
batch copy folders
|
2017-08-04 17:45:18 +08:00 |
|
lian
|
45f0d9cd9a
|
update parameter and tests
|
2017-08-04 15:01:55 +08:00 |
|
lian
|
2748d82ad3
|
admin export users to excel
Optimize database query when get user's name and contact email
|
2017-08-04 14:32:42 +08:00 |
|
lian
|
e15f6c6737
|
batch copy folders
|
2017-08-04 10:55:33 +08:00 |
|
xiez
|
57e7b89eb6
|
Merge pull request #1745 from haiwen/account-test
update account test
|
2017-08-04 10:48:36 +08:00 |
|
lian
|
44e2889abf
|
update account test
|
2017-08-03 18:06:08 +08:00 |
|
xiez
|
622931dec4
|
Merge pull request #1739 from haiwen/shib_role_map
[shibboleth] Add joker * in affiliation role map
|
2017-08-02 18:32:22 +08:00 |
|
zhengxie
|
9a5aae50ab
|
[shibboleth] Add joker * in affiliation role map
|
2017-08-02 18:31:15 +08:00 |
|
zhengxie
|
190bf7d66b
|
[role perm] Update default values
|
2017-08-02 16:18:33 +08:00 |
|
xiez
|
1e03661d2d
|
Merge pull request #1728 from haiwen/clear-token
update clear token
|
2017-08-01 16:35:16 +08:00 |
|
Daniel Pan
|
f031cbe74e
|
Merge pull request #1727 from haiwen/institution
Institution
|
2017-07-29 10:34:19 +08:00 |
|
lian
|
259655b6bd
|
update clear token
clear token when inactive user, delete user, change user password
|
2017-07-28 16:37:11 +08:00 |
|
llj
|
d3769826c9
|
[system admin] set inst for users, add members to inst: improvement & bugfix
|
2017-07-28 16:10:48 +08:00 |
|
zming
|
53b795faf8
|
[institutions] Inst add user
|
2017-07-28 16:06:54 +08:00 |
|
zming
|
d597623b14
|
update test_get_enabled_role_permissions_by_role
|
2017-07-28 11:17:24 +08:00 |
|
Daniel Pan
|
8ba6a36c92
|
Merge pull request #1726 from haiwen/account-info
update account info api
|
2017-07-27 18:58:18 +08:00 |
|
lian
|
6bdd4bbe67
|
update account info api
update get quota total/usage of org user
|
2017-07-27 18:52:28 +08:00 |
|
TMHBOFH
|
baa38ef705
|
add role permission to hide send mail button on share/uplink link dialog (#1681)
* Update settings.py
* Update permissions.py
* Update accounts.py
* Update templates.html
* Update permissions.py
* Update accounts.py
* Update settings.py
* Update templates.html
|
2017-07-26 15:07:25 +08:00 |
|
Daniel Pan
|
0bddb5ecb6
|
Merge pull request #1723 from haiwen/sys-setting
update system setting page
|
2017-07-26 11:43:41 +08:00 |
|
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 |
|
lian
|
52f261b021
|
rm authentication check when getting uploaded bytes
|
2017-07-21 15:25:06 +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 |
|
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 |
|