1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-13 05:39:59 +00:00
Commit Graph

626 Commits

Author SHA1 Message Date
lian
2620002898 update perm check when transfer repo 2017-01-11 13:52:57 +08:00
lian
9c0e37bf18 [api2] update perm check when generate share/upload link 2017-01-11 11:26:19 +08:00
lian
41dbebaa86 check if repo/folder exist before upload/update file 2016-11-02 18:04:59 +08:00
lian
04f6b71441 Not allowed to set folder perm if repo not shared out 2016-10-18 13:34:36 +08:00
lian
74b5e840db filter out sub repos 2016-09-22 11:32:21 +08:00
lian
b23fc5dbf3 udpate repo_created_cb 2016-09-19 13:54:17 +08:00
lian
2e098b628e enable library template when create group/pub repo 2016-09-18 11:58:14 +08:00
lian
94e91265cc add library pattern feature 2016-09-14 13:47:12 +08:00
lian
3f7cea8160 return head commit id when create repo via web api 2016-08-23 11:26:11 +08:00
lian
b66e1b8364 reshare repo to user/group/pub when admin transfer a repo 2016-08-18 17:49:12 +08:00
lian
3fff8e64c4 add LDAPImport scope when get accounts 2016-08-04 13:58:49 +08:00
lian
d142f2ddc1 update usage of seafile_api & test 2016-08-01 14:38:54 +08:00
lian
7e2585d7e8 update device code 2016-08-01 13:50:31 +08:00
zhengxie
5a2af77d44 Add copyright header 2016-07-26 10:51:29 +08:00
zhengxie
57cc2b4aba Merge branch '5.1'
Conflicts:
	seahub/base/accounts.py
	seahub/share/views.py
	seahub/views/sysadmin.py
	tests/seahub/base/test_accounts.py
	tests/seahub/share/views/test_ajax_get_download_link.py
	tests/seahub/share/views/test_ajax_get_upload_link.py
2016-07-21 10:55:50 +08:00
lian
b5d9ece164 rm synced repos at devices page (#1285) 2016-07-14 13:54:17 +08:00
lian
d89c3bd906 update create dir sub repo api 2016-07-08 10:15:13 +08:00
lian
c4fa072dc7 new share admin page (#1233) 2016-06-30 15:06:43 +08:00
lian
f39333c8c7 [transfer repo] add more comment 2016-06-29 15:17:48 +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
xiez
7204849d7f Merge pull request #1121 from haiwen/2fa
support two factor authentication
2016-06-27 11:05:23 +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
lian
8af68348c3 [api2] check parent dir permission when in FileView 2016-06-17 18:33:40 +08:00
Daniel Pan
bfd4a8a174 Revert "[api2] update return info when create new file/dir" 2016-06-15 12:26:48 +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
Shuai Lin
b5b4bbba4a 2fa: require 2fa token when getting api token. 2016-06-14 14:26:22 +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
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
Shuai Lin
163663cc86 remote wipe: no need for an extra table. 2016-06-04 15:14:25 +08:00
Jiaqiang Xu
0a3363bbcf [api] Add version attribute to repo list api. 2016-05-30 10:40:34 +08:00
lian
2258067cd8 update device remote wipe 2016-05-27 13:59:12 +08:00
Shuai Lin
7dc7034de4 Added remote wipe option when unlinking a device. 2016-05-27 13:57:25 +08:00
lian
08bb474d11 update search user api 2016-05-26 11:48:26 +08:00
Daniel Pan
ee99d7aad8 Merge branch '5.1'
Conflicts:
	seahub/group/templates/group/group_base.html
	seahub/templates/home_base.html
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/js/templates.html
	seahub/templates/libraries.html
	seahub/templates/pub_base.html
	static/scripts/app/views/group-discussions.js
2016-05-21 13:42:04 +08:00
lian
e4ac653e34 return head commit id info from repos api 2016-05-21 12:12:01 +08:00
lian
2d7f2a8416 rm encrypted repo password check when get repo history 2016-05-09 15:01:35 +08:00
Daniel Pan
b41333902b Merge pull request #1179 from haiwen/uploadblks
[api2] Add api to check missing blocks before uploading
2016-05-07 16:27:27 +08:00
lian
93befba419 add avatar_url info when get activities 2016-05-07 11:48:26 +08:00
lian
db81d636b8 notice group member when share library to group 2016-04-29 11:07:48 +08:00
Daniel Pan
86df7ee836 Refactor html templates 2016-04-28 20:30:00 +08:00
Shuai Lin
54beacc042 Fixed generating shared link for sub libraries. 2016-04-22 18:07:15 +08:00
lian
46e98b9943 update repo id check in repo-tokens api 2016-04-14 17:09:51 +08:00
lian
61dbb5923e update code when transfer org repo 2016-03-31 14:35:53 +08:00
lian
1ba944577f rm grpmsg_reply related code 2016-03-30 15:02:40 +08:00
lian
6f658cc61b rm file-priv-share related code 2016-03-30 15:02:31 +08:00
zhengxie
ec9be6975d Merge branch '5.0'
Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py
	seahub/group/templates/group/group_discuss.html
	seahub/options/models.py
	seahub/templates/repo_folder_perm.html
	seahub/templates/repo_share_manage.html
	seahub/templates/snippets/shared_link_js.html
	seahub/test_utils.py
2016-03-28 12:16:30 +08:00
lian
c4b8652507 force convert UUID obj to JSON serializable obj 2016-03-17 17:50:29 +08:00
lian
a43b3f969e new devices page 2016-03-15 18:19:12 +08:00
lian
d750019b84 [api2] update err msg of owa api 2016-03-10 10:46:51 +08:00