1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-30 22:34:53 +00:00
Commit Graph

61 Commits

Author SHA1 Message Date
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
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
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
e91e796efc [api2] Fix create dir shared item bug 2015-12-04 16:17:13 +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
e2b7e88094 Merge branch '4.4' 2015-11-05 16:33:13 +08:00
zhengxie
178ff33a58 Remove share links when delete repo 2015-11-05 16:04:19 +08:00
zhengxie
df1ff9e0f6 [tests] Fix shared file tests 2015-10-20 12:17:22 +08:00
lian
25fd35a2e5 add copy file api 2015-10-10 14:41:16 +08:00
zhengxie
75eabf7583 [api2] Refactor account api, and add migrate accout endpoint 2015-09-25 15:50:39 +08:00
xiez
563052f93e Merge pull request #823 from haiwen/dir-api
Dir api
2015-09-22 13:38:14 +08:00
lian
652639ef7e [dir-api] get recursive dir
add 'recursive' argument to control if return recursive dir list
2015-09-22 11:56:18 +08:00
lian
68276cbe52 [web-api] update download file api
add 'reuse' argument to control if reuse fileserver access token
2015-09-21 11:02:50 +08:00
lian
8f688faaee [dir-api] update get dirents api
add 't' argument to control if only return file or dir list
2015-09-21 10:38:56 +08:00
zhengxie
5fca43ef89 Merge branch '4.3'
Conflicts:
	seahub/api2/views.py
2015-09-14 13:43:39 +08:00
lian
152aeea19c [web/api] update group name validation check
can only contain letters, numbers, blank, hyphen or underscore
2015-09-14 12:17:12 +08:00
zhengxie
3b7fab00d6 [tests] Fix star files 2015-09-12 12:13:16 +08:00
Shuai Lin
d64e733001 Merge pull request #789 from haiwen/client-side-keygen
create repo api: accept magic and random_key generated on client side
2015-09-12 11:44:45 +08:00
Shuai Lin
7532ed394a client side keygen: update create repo api 2015-09-12 11:38:30 +08:00
Shuai Lin
981db6618f client side keygen: add tests 2015-09-12 11:38:30 +08:00
Shuai Lin
3287f4448a add api to create a dir with parents 2015-09-12 10:33:38 +08:00
zhengxie
c0b6e57471 [tests] Ignore 3 random test errors 2015-07-23 11:59:28 +08:00
lian
e00dbcef45 add test of copy file in sub dir to dst dir 2015-07-22 17:13:55 +08:00
zhengxie
00f64782ad Merge branch 'dir-share-popup'
Conflicts:
	seahub/api2/views.py
	static/scripts/app/views/share.js
	static/scripts/common.js
	tests/api/test_shares.py
2015-07-15 15:06:56 +08:00
lian
24ee9fe983 [web-api] update share link api
not use 'type' argument when create share download link
2015-07-15 11:30:00 +08:00
zhengxie
986a07d0cf [tests] Workaround for test_misc failed, seeems django::reverse will cause new settings failed 2015-07-14 18:19:36 +08:00
lian
8b36281eb8 add test for shared link api 2015-07-14 17:05:18 +08:00
zhengxie
0b61259b9d Add permission check and quota check 2015-07-14 13:26:13 +08:00
zhengxie
1c6475d7d1 WIP: finish dir_shared_items 2015-07-14 11:07:05 +08:00
zhengxie
7d6b84ecc5 WIP: update return fields 2015-07-14 11:03:59 +08:00
zhengxie
beee7a8fa6 [api] WIP: add dir shared items endpoint
Conflicts:
	seahub/test_utils.py
2015-07-14 11:03:58 +08:00
zhengxie
45c16e9a93 [api2] Add tests and remove unused code 2015-07-07 15:49:34 +08:00
zhengxie
a037b9b638 [api2] Add DISABLE_SYNC_WITH_ANY_FOLDER config to server info 2015-06-25 16:08:14 +08:00
Shuai Lin
6f5b329f65 do not update sudo mode ts if loggin in from client 2015-05-06 14:39:14 +08:00
Shuai Lin
c63f68dfc5 support logging in from desktop client directly 2015-05-06 14:28:00 +08:00
zhengxie
2e0ff97e16 [api] Fix group repos 2015-04-25 15:04:40 +08:00
zhengxie
e5c5719ea7 [api2] Fix group repos 2015-04-24 13:35:45 +08:00
zhengxie
f30cb39ef5 [api2] Add root id back when list repos 2015-04-22 15:31:45 +08:00
zhengxie
0ff3feaf24 [api] Refactor list owned repos, fetch size from repo object, remove root field in response
Conflicts:
	seahub/api2/views.py
2015-04-22 15:31:43 +08:00
zhengxie
bffa7b9c61 [tests] Fix grouprepo api test 2015-04-22 15:31:42 +08:00
zhengxie
93dee8ed6a Fix group repo related apis, and add a few unittests 2015-04-22 15:31:41 +08:00
zhengxie
cd8be43149 [api2] Improve account api 2015-04-15 10:44:51 +08:00