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
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
zhengxie
528b33ec0e
Add role permissions
2016-06-27 16:41:55 +08:00
zhengxie
421725c4c8
Fix tests
2016-06-27 13:44:15 +08:00
xiez
3259a9255c
Merge pull request #1260 from haiwen/update-device-test
...
update admin device test
2016-06-27 12:08:32 +08:00
lian
38c5485dd5
update admin device test
2016-06-27 11:59:01 +08:00
xiez
7204849d7f
Merge pull request #1121 from haiwen/2fa
...
support two factor authentication
2016-06-27 11:05:23 +08:00
Daniel Pan
e7aaae4363
Merge pull request #1251 from haiwen/trash-pagination
...
[system admin] trash repos: list by page
2016-06-27 11:01:44 +08:00
llj
b2cda939aa
UI fix ( #1257 )
2016-06-23 16:48:29 +08:00
llj
1a2cfee678
For mobile ( #1255 )
...
* [UI] bugfix; modified 'file view'
* [for mobile] modified shared/history file view
* modified 'header', 'dir view' for mobile
2016-06-22 16:51:03 +08:00
Daniel Pan
cf1017513a
Code clean ( #1217 )
...
* Use API to create file/folder instead of Ajax
* Remove sub_repo AJAX api
* Remove repo delete AJAX function
* Remove get_group_basic_info
* Add comment for get_unenc_group_repos
* Remove ajax_repo_change_basic_info and ajax_repo_transfer_owner
* Remove ajax_unset_inner_pub_repe and RepoPublic
* Remove ajax star/unstar a file
* update be shared repo api
* update test public repo
* Remove ajax_repo_remove_share
2016-06-20 18:34:30 +08:00
Daniel Pan
fd742d6b02
Merge pull request #1252 from haiwen/file-api
...
update file api
2016-06-20 18:31:17 +08:00
lian
8de5551991
update file api
...
1. return checked file name when creat a new file
2. update test
2016-06-20 18:19:53 +08:00
llj
18a800cb5d
[system admin] trash repos: list by page
2016-06-20 15:47:26 +08:00
Daniel Pan
8dba980b2e
Merge pull request #1244 from haiwen/file-dir-api-endpoint
...
[api-2.1] update file/dir api
2016-06-20 14:02:48 +08:00
lian
8af68348c3
[api2] check parent dir permission when in FileView
2016-06-17 18:33:40 +08:00
lian
3716c76750
[api-2.1] update file/dir api
2016-06-17 18:26:35 +08:00
Daniel Pan
c6bf00bde0
Merge pull request #1249 from haiwen/new-help
...
[help] new help
2016-06-17 16:35:27 +08:00
llj
9e2617e77b
[help] new help
2016-06-17 15:29:15 +08:00
Daniel Pan
b28413a38b
Merge pull request #1247 from haiwen/change-wiped-at-to-datetime-field
...
Updated wiped_at field to a DateTime type.
2016-06-17 12:10:22 +08:00
Shuai Lin
313216cde3
Updated wiped_at field to a DateTime type.
2016-06-17 11:51:11 +08:00
Daniel Pan
ca96fc1db9
Merge pull request #1243 from haiwen/admin-devices
...
[sysadmin] devices: fix & improvement
2016-06-16 10:51:29 +08:00
llj
8c0707c647
[sysadmin] devices: fix & improvement
2016-06-16 10:44:16 +08:00
Daniel Pan
54d1719857
Merge pull request #1242 from haiwen/dropdown-improvement
...
[dropdown widget] improved menu position
2016-06-15 19:58:56 +08:00
llj
341d029b9f
[dropdown widget] improved menu position
2016-06-15 17:20:21 +08:00
Daniel Pan
5487461541
Merge pull request #1241 from haiwen/revert-1240-dir-file-api
...
Revert "[api2] update return info when create new file/dir"
2016-06-15 13:25:12 +08:00
Daniel Pan
bfd4a8a174
Revert "[api2] update return info when create new file/dir"
2016-06-15 12:26:48 +08:00
Daniel Pan
bca2226c25
Merge pull request #1240 from haiwen/dir-file-api
...
[api2] update return info when create new file/dir
2016-06-15 11:03:02 +08:00
lian
ffdb9ad490
[api2] update return info when create new file/dir
2016-06-15 10:18:26 +08:00
Shuai Lin
4af51464ab
2fa: fixed api undefined variable error.
2016-06-14 15:32:23 +08:00
Daniel Pan
2bff5ef75a
Merge pull request #1209 from haiwen/admin-repos
...
new admin libraries page
2016-06-14 14:59:22 +08:00
lian
483c29ab92
update args check when search/delete repos
2016-06-14 14:47:44 +08:00
llj
2758713cea
[system repo admin] modification
2016-06-14 14:47:44 +08:00
llj
8c2e16ca36
[system repo admin] fix, improvement, supplement, clean
2016-06-14 14:47:44 +08:00
lian
a767aeb3d8
update
2016-06-14 14:47:02 +08:00
lian
72f4297934
new admin libraries page
2016-06-14 14:46:13 +08:00
Shuai Lin
e57a92107d
2fa: added dependencies in requirements.txt
2016-06-14 14:26:22 +08:00
Shuai Lin
ccabc4a907
2fa: do not require 2fa token in api when not enabled.
2016-06-14 14:26:22 +08:00
Shuai Lin
8f47b01619
2fa: disable client-login token when 2fa is enabled.
2016-06-14 14:26:22 +08:00
Shuai Lin
b5b4bbba4a
2fa: require 2fa token when getting api token.
2016-06-14 14:26:22 +08:00
Shuai Lin
3d04bfea6d
support two factor authentication
2016-06-14 14:26:22 +08:00
Daniel Pan
37f6648a12
Merge pull request #1237 from haiwen/repo_del
...
[repo del] rewrote it with simplemodal
2016-06-14 11:14:30 +08:00
llj
2091d20e4b
[repo del] rewrote it with simplemodal
2016-06-14 11:06:20 +08:00
Daniel Pan
b567379c2c
Merge branch '5.1'
...
Conflicts:
seahub/templates/registration/password_change_form.html
seahub/templates/sysadmin/base.html
seahub/templates/sysadmin/sysadmin_backbone.html
2016-06-13 18:25:20 +08:00
Daniel Pan
dd89b0d6d5
Merge pull request #1236 from haiwen/ui-fix
...
[repo del confirm] fix
2016-06-13 17:46:07 +08:00
llj
f635d6f125
[repo del confirm] fix
2016-06-13 17:41:36 +08:00
Daniel Pan
e7f973e0bd
Merge pull request #1235 from haiwen/ui-fix
...
[info bar] fix
2016-06-13 17:36:26 +08:00
Daniel Pan
1e66dca52e
Merge pull request #1234 from haiwen/seadrive-support
...
[api] Add version attribute to repo list api.
2016-06-13 17:36:10 +08:00
