1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-30 13:23:14 +00:00
Commit Graph

98 Commits

Author SHA1 Message Date
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
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
lian
267798b3f1 [api] add repo history limit api 2016-01-14 11:35:15 +08:00
lian
3c21b354be [api] add transfer repo api 2016-01-13 17:58:59 +08:00
zhengxie
cf3d96b46a Merge branch '5.0'
Conflicts:
	media/css/sf_font2/seafile-font2.eot
	media/css/sf_font2/seafile-font2.ttf
	media/css/sf_font2/seafile-font2.woff
	requirements.txt
	seahub/api2/endpoints/dir_shared_items.py
	seahub/templates/js/templates.html
	seahub/views/ajax.py
	static/scripts/app/views/group-repo.js
2016-01-13 10:19:56 +08:00
lian
115bcfb54c [api] remove more unused group/user messages code 2016-01-11 18:23:44 +08:00
Daniel Pan
af0ab3e221 Remove unused APIs
Group messages and personal messages related API is no longer used
2016-01-11 00:02:17 +08:00
lian
00444eee9e update insensitive search user test 2016-01-07 11:14:09 +08:00
lian
44d176a45c update group api test 2016-01-06 19:12:24 +08:00
zhengxie
c0d3d02341 Merge branch '4.4' into 5.0 2015-12-28 10:47:34 +08:00
zhengxie
042956c5a5 Merge branch '4.4' into 5.0 2015-12-28 10:36:30 +08:00
lian
a722448548 [api2] search user insensitive 2015-12-25 17:35:05 +08:00
lian
58550e3e59 [api2] fix share type info in "be shared" repos api 2015-12-24 14:53:29 +08:00
lian
bbb9e8664e [api] add delete be shared repo api 2015-12-23 18:53:12 +08:00
zhengxie
1672bbd5ff [api2] Add list shared upload links 2015-12-23 17:31:07 +08:00
xiez
922b4411ba Merge pull request #942 from haiwen/redesign
Redesign
2015-12-15 11:59:52 +08:00
lian
ce77796a49 Revert "[api] update search user api"
This reverts commit c33941e0e4.
2015-12-09 16:53:31 +08:00
xiez
41ff991f2b Merge pull request #939 from haiwen/search-user
[api] update search user api
2015-12-09 15:21:58 +08:00
lian
c33941e0e4 [api] update search user api
1. not return unregistered user
2. add arg to control if return myself
2015-12-09 15:12:48 +08:00
lian
2450f1f3b0 [api] update share dir item api
1. update perm check when share repo/dir
2. check if user registered when share repo/dir
2015-12-09 15:10:40 +08:00
lian
c31f201d5b update groups api 2015-12-08 18:43:32 +08:00
lian
46d9fea299 [api-v2.1] update transfer group api 2015-12-08 16:40:17 +08:00
lian
d1bcd3e113 [api2.1] add rename, transfer and delete group api 2015-12-07 11:33:49 +08:00
zhengxie
9ffb067af1 Fix tests 2015-12-05 16:35:51 +08:00
zhengxie
238d3d28d4 [api2] Support username login 2015-12-05 16:29:19 +08:00
zhengxie
b316c4decc [api2] Add more attributes to search-user and account info 2015-12-05 12:24:51 +08:00
zhengxie
107f383bc1 Merge branch '5.0' 2015-12-04 16:25:10 +08:00
zhengxie
e91e796efc [api2] Fix create dir shared item bug 2015-12-04 16:17:13 +08:00
zhengxie
5c3de620f8 Merge branch '5.0' 2015-12-04 11:57:53 +08:00
lian
e146e92331 [api2.1] new groups api 2015-12-03 16:45:08 +08:00
zhengxie
9d53430e4c Merge branch '4.4' into 5.0
Conflicts:
	media/css/seahub.css
	seahub/group/templates/group/group_manage.html
	seahub/utils/__init__.py
	seahub/views/repo.py
	tests/seahub/views/test_file.py
2015-12-02 17:37:50 +08:00
zhengxie
c72f9c6999 [api2] Refresh cache when update account 2015-11-19 11:38:39 +08:00
zhengxie
2bfe7fc32e [api2] Support username login 2015-11-10 14:07:56 +08:00