1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-28 03:31:23 +00:00
Commit Graph

129 Commits

Author SHA1 Message Date
lian
3ae74298b3 update permission check of share/upload link 2016-05-30 10:52:58 +08:00
lian
e4ac653e34 return head commit id info from repos api 2016-05-21 12:12:01 +08:00
lian
e71ca6d84b unset admin after transfer success 2016-05-06 14:52:28 +08:00
lian
65dc2ff54b add admin clean device errors api 2016-04-29 15:32:57 +08:00
lian
419645fdc2 add download multi dirents api 2016-04-28 15:16:58 +08:00
lian
bc2828969d new admin devices page; 2016-04-23 18:07:09 +08:00
lian
b3911c5081 [admin-api] update sysinfo.js & add admin info test 2016-04-23 17:14:01 +08:00
xiez
aaa51ea460 Merge pull request #1123 from haiwen/repo-tokens
update repo id check in repo-tokens api
2016-04-15 10:44:46 +08:00
lian
989ca5b600 update url of admin log api 2016-04-14 17:41:35 +08:00
lian
46e98b9943 update repo id check in repo-tokens api 2016-04-14 17:09:51 +08:00
lian
866aaed496 update log api 2016-04-13 10:40:23 +08:00
lian
106af0cfdd add test for admin log api 2016-04-12 18:08:28 +08:00
xiez
32b2532e48 Merge pull request #1099 from hu-berlin-cms/feature/contact_email_reply-to
Support contact_email in email sending
2016-04-09 15:54:31 +08:00
Enno Gröper
fd6fd1eec0 Sending Links: conform api to web gui code 2016-04-03 11:15:22 +00:00
Enno Gröper
f4741483ad Test searching by contact_email 2016-03-31 12:04:35 +02:00
lian
6f658cc61b rm file-priv-share related code 2016-03-30 15:02:31 +08:00
Daniel Pan
3665084ec9 Merge pull request #1053 from haiwen/discussion
Add group discussion
2016-03-29 17:46:49 +08:00
zhengxie
cd0b0ac235 [tests] Fix group discussion 2016-03-29 11:45:27 +08:00
zhengxie
0c71712661 [tests] Clear cache after change constance config 2016-03-28 15:06:25 +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
90fc08bd49 update repo set password api test 2016-03-21 17:49:37 +08:00
lian
69cbd56064 add new api & update code
1. add new repo set password api
2. update repo url related code
2016-03-21 15:38:22 +08:00
zhengxie
3d5d98ffb8 Update nickname cache invalidation 2016-03-18 16:23:39 +08:00
lian
a43b3f969e new devices page 2016-03-15 18:19:12 +08:00
lian
49ed1fd386 [api-v2.1] add new file/dir api according to old file/dir api 2016-03-09 10:12:16 +08:00
zhengxie
72d30b2495 Merge branch '5.0'
Conflicts:
	seahub/api2/endpoints/dir_shared_items.py
	seahub/api2/urls.py
	seahub/templates/repo.html
	seahub/utils/http.py
	seahub/views/__init__.py
	seahub/views/ajax.py
	seahub/views/repo.py
	tests/seahub/views/test_libraries.py
2016-03-07 16:04:36 +08:00
lian
7823d500e5 add dir revert api & update file revert api 2016-03-07 15:30:28 +08:00
lian
0f311f0c4e [api2] add send share/upload link api 2016-03-07 13:23:11 +08:00
lian
1992912ce1 [api-v2.1] add file share/upload links api 2016-02-26 17:59:05 +08:00
lian
62979d9af6 add err msg detail when share repo/folder failed 2016-02-24 15:02:01 +08:00
Daniel Pan
b8f6d61d4e Merge pull request #1019 from haiwen/grp-discus-api
[api2] Add list/post/delete group discussions
2016-02-23 22:08:50 +08:00
Daniel Pan
4179a13c4c Merge pull request #1014 from haiwen/turn-group-wiki
Turn on/off group Wiki
2016-02-19 17:29:41 +08:00
zhengxie
7e81ad7356 [tests] Fix tests 2016-02-17 16:17:00 +08:00
Daniel Pan
a7eecaeff4 Merge pull request #1018 from haiwen/repo-folder-perm
update args of repo user/group perm api
2016-02-02 18:08:51 +08:00
lian
413738f66e update args of repo user/group perm api 2016-02-02 15:27:39 +08:00
zhengxie
56f533c300 [api2] Add list/post/delete group discussions 2016-02-02 15:01:13 +08:00
zhengxie
cc5af51dec Merge branch '5.0'
Conflicts:
	seahub/templates/base_for_backbone.html
	seahub/templates/libraries.html
	seahub/templates/myhome_base.html
2016-02-02 12:19:46 +08:00
zhengxie
52b661147e Fix default repo re-creation bug when web login after desktop 2016-02-01 11:54:02 +08:00
Daniel Pan
735563e26d Fix group api tests 2016-01-30 17:32:13 +08:00
lian
93f13e7358 add test for web-api use new seafile api 2016-01-27 18:05:29 +08:00
lian
3d09dd9953 update seahub according to new seafile api 2016-01-27 15:52:33 +08:00
lian
08f929eb35 [api] add repo user/group folder perm api 2016-01-27 09:58:20 +08:00
zhengxie
df1e082e8c Update function name and error msg 2016-01-26 10:38:19 +08:00
Daniel Pan
d8a4b16a5b Merge pull request #1000 from haiwen/repo-share-link-api
[api] add repo share link api
2016-01-23 13:20:20 +08:00
zhengxie
c4d743b134 Add setting to enable/disable organization repo creation 2016-01-21 13:55:52 +08:00
lian
a84c603168 [api] add repo share link api 2016-01-20 16:29:46 +08:00
lian
fd01c06802 [api2] update repo history limit
still can get limit days if history limit setting not enabled
2016-01-20 11:46:17 +08:00
Daniel Pan
cac889406a Merge pull request #996 from haiwen/repo-history-limit-api
[api] add repo history limit api
2016-01-16 14:57:57 +08:00
zhengxie
6d1e5e9884 Fix tokenv2 error when platform_version is empty 2016-01-15 12:27:38 +08:00
lian
0e43a099ff [api] update search user api 2016-01-14 13:10:24 +08:00