zming
c09c3d0c6b
fixed test
2017-10-13 13:10:05 +08:00
zhengxie
a9a6069979
[adfs] Fix sudo mode
2017-10-12 10:38:35 +08:00
zMingGit
2feb8ae575
[api] Add users in bulk from excel, export batch add user help file, add ( #1792 )
...
* [api] Add users in bulk from excel, export batch add user help file, add
test
* remove csv feature
* review
* column width, del tip, add head
* del write_xls_sample, modify head
* review
* download text
* option->optional, trans
2017-09-26 10:33:36 +08:00
zMingGit
12ba328119
limit ip
2017-09-18 14:21:11 +08:00
zhengxie
f364946310
Merge branch '6.1'
...
Conflicts:
seahub/api2/endpoints/admin/two_factor_auth.py
seahub/profile/views.py
seahub/views/sysadmin.py
2017-09-12 14:14:15 +08:00
llj
45fb407368
Merge pull request #1784 from haiwen/admin-role-log
...
add admin role/login feature
2017-09-09 16:19:38 +08:00
lian
bc492b9010
add admin role/log feature
2017-09-09 15:27:04 +08:00
zming
1044f11aea
[API] add user reference id
2017-09-07 15:22:15 +08:00
zming
4a9b657680
[two-factor-auth]modify variable name
2017-09-04 18:17:13 +08:00
zming
d23a17424c
[API] background image of login page
2017-08-25 11:50:50 +08:00
zhengxie
f15aa06978
[two factor] Refactor code
2017-08-23 14:46:02 +08:00
zming
d0975c7836
migrate two-factor
2017-08-21 14:02:57 +08:00
lian
3e7275ec80
Merge branch '6.1'
2017-08-12 14:34:11 +08:00
xiez
49605e79ff
Merge pull request #1743 from haiwen/master-sharing-groups
...
[ share-repo ] can share repo to any groups
2017-08-11 13:32:12 +08:00
zming
5d04ce0de2
[ share-repo ] can share repo to any groups
2017-08-10 17:35:39 +08:00
llj
dd95460024
Statistic ( #1749 )
...
* [system admin] added statistic for file operation
* [statistic] improvement
* [system admin] added statistic for 'total storage' & 'active users'
* [statistic] file: modification
2017-08-10 10:16:03 +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
xiez
1e03661d2d
Merge pull request #1728 from haiwen/clear-token
...
update clear token
2017-08-01 16:35:16 +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
lian
f9c2c10249
update role inf when export user to excel
2017-07-26 11:29:06 +08:00
lian
0ee40ee11d
add role feature for ladp imported user
2017-07-20 14:54:12 +08:00
zming
c2873b9112
two-factor-auth
2017-07-13 10:55:10 +08:00
zhengxie
25561d7e99
[invitation] Enable sysadmin to remove invitations
2017-06-26 17:11:38 +08:00
xiez
6723b42d07
Merge pull request #1629 from haiwen/wopi
...
update wopi
2017-06-13 13:40:47 +08:00
zming
11f45979a5
[seahub] Added the ability to modify the format of the text preview suffix
2017-06-12 11:31:51 +08:00
lian
f0b2527bcc
update wopi
...
1. add `ui` and `rs` parameters
1. get org repo owner
2017-06-08 18:27:33 +08:00
lian
e1d0169e64
update admin log
...
1. add log when admin create repo
1. add log when admin batch delete user
1. update test
2017-05-23 16:05:51 +08:00
Daniel Pan
bcde41a24a
Merge pull request #1549 from haiwen/org-user-quota
...
update usage of seafile api
2017-04-28 13:26:53 +08:00
zhengxie
81db6a7a0a
[institution] Add institution quota
2017-04-18 14:12:29 +08:00
zhengxie
e6e6e82b82
Merge branch '6.0'
...
Conflicts:
seahub/api2/endpoints/file.py
seahub/urls.py
static/scripts/app/views/share.js
2017-04-17 16:21:22 +08:00
lian
9829bb2e86
update usage of seafile api
...
1. seafile_api.get_org_user_quota_usage
1. seafile_api.get_org_user_quota
2017-04-17 16:10:12 +08:00
lian
c2140bc3d7
update ccnet api usage
2017-03-29 10:28:51 +08:00
zhengxie
1b11350f80
Merge branch '6.0'
...
Conflicts:
seahub/templates/sysadmin/sysadmin_backbone.html
seahub/urls.py
seahub/views/sysadmin.py
static/scripts/app/views/dir.js
2017-03-27 13:53:35 +08:00
lian
72ffdd54e6
update admin log
2017-03-22 17:26:42 +08:00
lian
dd88c4e043
add admin operation logs page
2017-03-22 17:26:42 +08:00
xiez
d1f3dd154c
Merge pull request #1440 from haiwen/org_user_quota
...
Use seafile_api to set/get org user quota
2017-03-13 17:42:21 +08:00
lian
86b7925d5f
update import users
2017-02-21 18:14:04 +08:00
lian
385a2ef096
update import users
...
fix bug when user upload a invalid csv file
2017-02-21 17:19:20 +08:00
zhengxie
d82df5fb52
Merge branch '6.0'
...
Conflicts:
media/js/base.js
seahub/api2/views.py
seahub/views/ajax.py
tests/api/test_repo_user_folder_perm.py
2017-02-17 17:11:33 +08:00
Daniel Pan
4baaa29d17
Merge pull request #1467 from haiwen/ldap
...
Update LDAP checking
2017-02-10 14:26:04 +08:00
xiez
6fd822f45f
Merge pull request #1457 from haiwen/admin-group
...
udpate admin groups page
2017-02-09 18:11:09 +08:00
lian
5743c3879e
update admin import user from csv file
2017-02-09 17:58:04 +08:00
lian
718bdbb59b
update admin manage group page
2017-02-09 14:59:49 +08:00
lian
287257dd7c
force change password after batch add user
2017-02-07 17:45:36 +08:00
zhengxie
b01034e6bb
Update LDAP checking
2017-01-20 16:07:53 +08:00
lian
23dd6c57de
rm unused code in ajax.py & sysadmin.py
2017-01-19 14:40:49 +08:00
zhengxie
622fe2705e
Fix reset email message
2017-01-17 16:08:03 +08:00
zhengxie
df70fd1b5e
Use contact email in password resetting
2017-01-16 15:46:00 +08:00
