haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-14 06:11:16 +00:00
Code Issues Releases Wiki Activity
9,453 Commits 144 Branches 460 Tags
7b7055bd19a72f2823ff81d1d95e0afd7d8564bc
Commit Graph

626 Commits

Author SHA1 Message Date
lian
9642fd129d [api2] add new owa file api 2016-03-10 10:46:42 +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
Daniel Pan
7449608a0f Merge pull request #1040 from haiwen/library-settings 
[lib setting] folder perm: add 'add folder', bugfix & etc.
 2016-03-02 18:33:36 +08:00
lian
c257b6deb8 [api2] update err msg of owa api 2016-03-02 13:39:25 +08:00
lian
edd4d96de2 [api2] add new owa file api 2016-03-02 10:04:59 +08:00
llj
b90c3d5bf7 [lib setting] folder perm: add 'add folder', bugfix & etc. 2016-02-29 17:01:12 +08:00
lian
6ebb295b55 [api] update msg when user/group perm operation successed 2016-02-26 14:36:31 +08:00
zhengxie
acb1a5e51e Use GB instead of GiB in filesizeformat and quota calculation 2016-02-24 11:53:32 +08:00
poetwang
c760c1a26d [api2] Add api to check missing blocks before uploading 2016-02-20 10:29:13 +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
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
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
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
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
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
Daniel Pan
26029be96e Merge pull request #968 from haiwen/search-user-insensitive 
[api2] search user insensitive
 2015-12-26 14:22:20 +08:00
lian
a722448548 [api2] search user insensitive 2015-12-25 17:35:05 +08:00
lian
e81ae994e3 show broken repo at my owned repo list page 2015-12-25 16:26:06 +08:00
lian
58550e3e59 [api2] fix share type info in "be shared" repos api 2015-12-24 14:53:29 +08:00
lian
5bbd92bb6d [api-v2.1] update groups api & add get group members api 2015-12-15 14:38:25 +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
poetwang
08a5c17fb3 [api2] make upload blocks token reusable 2015-12-07 11:35:55 +08:00
zhengxie
83d7e8b404 Update rest framework to latest (v3.3.1) 2015-12-05 16:35:51 +08:00
zhengxie
333c0a9966 Upgrade rest framwork, check memcached at startup 2015-12-05 16:35:51 +08:00
zhengxie
b316c4decc [api2] Add more attributes to search-user and account info 2015-12-05 12:24:51 +08:00
zhengxie
8410afdba2 Fix api mkdir error when parent dir is nonexistent, and clean duplicated code in account 2015-12-05 11:46:08 +08:00
lian
aedbf5174b return group member avatar url 2015-12-04 16:33:51 +08:00
lian
4293deceb3 [api] add get group members api 2015-12-04 16:27:26 +08:00
lian
ad37820ea7 [api] return absolute avatar url 2015-12-03 12:04:15 +08:00
lian
2b5d444e60 [api] return avatar url when search user 2015-12-03 11:00:34 +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