haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-16 00:06:11 +00:00
Code Issues Releases Wiki Activity
13,486 Commits 138 Branches 453 Tags 2.3 GiB
c06d51a596
Commit Graph

862 Commits

Author SHA1 Message Date
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
Daniel Pan
c9fc63ae02 Merge pull request #986 from haiwen/check-audit-conf 
check if audit enabled
 2016-01-09 17:02:05 +08:00
lian
a7458622b7 check if audit enabled 2016-01-09 16:40:39 +08:00
lian
0d1bff5f0a update share link access check 2016-01-08 14:38:50 +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
Daniel Pan
098415212f Merge pull request #929 from haiwen/force_pwd 
[sysadmin] Force passwd change when add/reset user
 2015-12-20 11:19:24 +08:00
Daniel Pan
9e855459eb Merge pull request #930 from haiwen/post_office 
Add post_office app, and send async email to imported csv users
 2015-12-20 11:17:41 +08:00
zhengxie
3b0f3d475b Merge branch '4.4' into 5.0 
Conflicts:
	seahub/templates/share_access_validation.html
 2015-12-17 15:50:50 +08:00
lian
c809bd0390 update test shard dir 2015-12-16 19:24:51 +08:00
lian
001856f89f add password check when view file via share link 2015-12-16 19:09:55 +08:00
xiez
922b4411ba Merge pull request #942 from haiwen/redesign 
Redesign
 2015-12-15 11:59:52 +08:00
zhengxie
9404af609d Add post_office app, and send async email to imported csv users 2015-12-15 11:32:34 +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
957b3b4beb update user admin group test 2015-12-08 16:29:50 +08:00
zhengxie
054ef03687 [sysadmin] Force passwd change when add/reset user 2015-12-08 11:33:26 +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
0023d93aad [share] Update share link passwd 2015-12-05 16:29:31 +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
xiez
612abc605d Merge pull request #924 from haiwen/sysadmin-repo 
update sys admin repo view
 2015-12-04 16:20:52 +08:00
lian
c8b84eb47f update sys admin repo view & user info test 2015-12-04 16:19:32 +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
zhengxie
02bef78f7f [tests] Add user options tests 2015-12-04 11:25:26 +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
lian
643d036942 new file access log page 2015-11-27 10:55:56 +08:00
lian
427b51ae23 [user admin] add "groups" tab at user info page 2015-11-24 19:02:30 +08:00
zhengxie
6aa5b4fadd [tests] Update user export excel 2015-11-24 13:28:46 +08:00
lian
4bccc4abac udpate export excel 2015-11-24 13:19:58 +08:00
zhengxie
c72f9c6999 [api2] Refresh cache when update account 2015-11-19 11:38:39 +08:00
zhengxie
4813a496ed Add view raw file 2015-11-12 12:13:33 +08:00
zhengxie
623c4fb5f8 [wiki] Fix inner page links 2015-11-12 10:26:31 +08:00
zhengxie
b1bedaecfb [share] Update share link passwd 2015-11-10 15:37:47 +08:00
zhengxie
2bfe7fc32e [api2] Support username login 2015-11-10 14:07:56 +08:00
zhengxie
9b72657a84 Merge branch '4.4' 
Conflicts:
	seahub/views/repo.py
 2015-11-09 16:52:11 +08:00
zhengxie
06df69887f [file] Rename send_file_download_msg to send_file_access_msg 2015-11-09 16:37:32 +08:00
xiez
cbd4e9a69a Merge pull request #879 from haiwen/shared-folder 
update list shared folders
 2015-11-09 10:56:16 +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
lian
cac171ecff update list shared folders 2015-11-03 17:27:27 +08:00
zhengxie
05bf93824f [tests] Add file view tests 2015-11-03 14:43:26 +08:00
zhengxie
4b03a55685 Fix circular import and add test case 2015-11-02 15:08:52 +08:00
zhengxie
e6a68d4d5c [file] Fix file download bug 2015-10-26 18:02:23 +08:00
lian
a65f94656a [sys-admin] change http request from "GET" to "POST" 2015-10-22 10:14:57 +08:00
zhengxie
df1ff9e0f6 [tests] Fix shared file tests 2015-10-20 12:17:22 +08:00
zhengxie
8fd9bebf45 Merge branch '4.4' 
Conflicts:
	seahub/auth/views.py
	seahub/templates/libraries.html
	seahub/templates/sysadmin/sys_admin_group_info.html
	seahub/templates/sysadmin/sys_publink_admin.html
	seahub/templates/sysadmin/userinfo.html
	seahub/urls.py
 2015-10-20 10:27:27 +08:00
zhengxie
550bade69a [tests] Fix fails 2015-10-19 18:34:30 +08:00
zhengxie
04bb5a60c1 Fix tests and fix bug in sudo mode 2015-10-19 18:34:29 +08:00
zhengxie
f27639744d Fix cache key length error 2015-10-16 11:09:24 +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
xiez
dc9e31ea2c Merge pull request #822 from haiwen/reuse-access-token 
[web-api] update download file api
 2015-09-22 11:46:24 +08:00
zhengxie
4993e43497 Fix set lang code bug when user profile is empty. 2015-09-21 16:06:15 +08:00
zhengxie
b37e52add8 [file] Change file download url 2015-09-21 15:30:47 +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
82ff4b3f2a [sysadmin] Refactor and fix tests 2015-09-02 11:14:54 +08:00
zhengxie
753efdb082 Fix shared file view count, issue https://github.com/haiwen/seahub/issues/742 2015-08-25 11:10:27 +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
512d522b7a [test] Add test case for profile 2015-06-27 17:22:28 +08:00
zhengxie
fb1ee8e784 Fix user remove bug 2015-06-27 16:32:59 +08:00
zhengxie
dfec4103b5 [tests] Update group tests 2015-06-27 13:12:57 +08:00
zhengxie
a037b9b638 [api2] Add DISABLE_SYNC_WITH_ANY_FOLDER config to server info 2015-06-25 16:08:14 +08:00
zhengxie
f33d756308 Add test cases for issue 1283, https://github.com/haiwen/seafile/issues/1283 2015-06-25 13:28:25 +08:00
zhengxie
e58a28ccde Fix download share file token bug 2015-06-19 13:43:00 +08:00
zhengxie
7cdb70368a Fix auth tokens 2015-06-16 10:27:17 +08:00
zhengxie
ec138440fb Fix encrypt shared dir password loop bug 2015-06-16 10:27:17 +08:00
zhengxie
20c20c3f48 [test] Test case for https://github.com/haiwen/seafile/issues/1248 2015-05-29 12:15:30 +08:00
zhengxie
3086adc246 [tests] Add dir download related tests 2015-05-28 16:29:45 +08:00
zhengxie
81d72ed599 [tests] Fix shared file tests 2015-05-27 14:32:44 +08:00
zhengxie
78b166b5c7 Refactor shared dir, update url 2015-05-27 10:18:55 +08:00
zhengxie
7295e14c7d [tests] Added a few tests 2015-05-26 14:36:31 +08:00
zhengxie
1211677746 [tests] Fix error 2015-05-15 11:23:56 +08:00
zhengxie
af498d2d20 [tests] Add tests for registraion 2015-05-14 18:15:26 +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
Shuai Lin
1ad6c30b35 sudo mode: fix bugs in the code 2015-05-05 13:34:03 +08:00
Shuai Lin
763e760c7e sudo mode: allow the tests to fail before we figure out how to test it 2015-05-04 15:52:28 +08:00
Shuai Lin
c6ae62f4e0 require phantomjs to be installed 2015-05-04 15:01:08 +08:00
Shuai Lin
c449e3842c add "sudo mode": confirm password before doing sysadmin work 2015-05-04 13:57:10 +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
zhengxie
629687c865 [tests] Fix auth test 2015-04-14 11:22:32 +08:00
zhengxie
94dcfe338a [api2] Return 401 if api token is invalid 2015-04-13 11:59:57 +08:00
zhengxie
b8764f4f21 [tests] Add unittest for seahub 2015-03-18 18:14:59 +08:00
Shuai Lin
f4ed79bd3e ignore repos that are no longer accessible when regenerating tokens 2015-03-13 11:01:13 +08:00
Shuai Lin
18bc135a53 [api] support logging out an accout from seafile clients 2015-03-10 08:28:02 +08:00
xiez
d5d34eca68 Merge pull request #324 from haiwen/server-info-api 
added /api2/server-info/ endpoint
 2015-01-12 10:50:44 +08:00
zhengxie
9139b71e36 [tests] enlarge throttle rates 2015-01-06 15:31:41 +08:00
lins05
4a9f7ed454 added /api2/server-info/ endpoint 2014-12-25 12:27:44 +09:00
lins05
4983c52f28 fixed tests 2014-11-21 16:12:01 +08:00
lins05
e7232c4050 comment out ui tests temporarily 2014-09-25 20:51:52 +08:00
lins05
aebba20a97 dump seahub logs when test failed 2014-09-06 12:37:52 +08:00
lins05
74ed9ac174 disable api rate limit when testing 2014-09-06 11:53:46 +08:00
lins05
f65c783fb6 improved tests 2014-09-06 11:38:20 +08:00
lins05
2687bdbea4 test with a normal user instead of an admin user 2014-09-05 13:51:44 +08:00
lins05
26c773371f improve tests 2014-09-05 13:51:44 +08:00
lins05
041752e214 improve tests 2014-09-05 13:51:44 +08:00
lins05
f702b9bb91 improved tests 2014-09-05 13:51:44 +08:00
Chilledheart
f291595eda [tests] follow python codestyle 2014-09-05 13:51:44 +08:00
Chilledheart
b6b8970a96 [tests] add the rest of web api test 2014-09-05 13:51:44 +08:00
Chilledheart
4e825fd854 [tests] add web api test for directories 2014-09-05 13:51:44 +08:00
Chilledheart
072ee6588f [tests] add web api test for files 2014-09-05 13:51:44 +08:00
Chilledheart
9f0979c402 disable CheckOrCreateSublibrary test temporarily 2014-09-05 13:51:44 +08:00
Chilledheart
878f9dfc5b [tests] add web api test for libraries 2014-09-05 13:51:44 +08:00
Chilledheart
ba84dc87b3 [tests] add web api test for miscs 2014-09-05 13:51:44 +08:00
Chilledheart
913dcf694a [tests] add web api test for avatar service 2014-09-05 13:51:44 +08:00
Chilledheart
e65248bcc2 [tests] add api test for group members, groups, group msgs, user msgs 2014-09-05 13:51:44 +08:00
Chilledheart
f7f304096b [tests] add account api test 2014-09-05 13:51:44 +08:00
Chilledheart
3044d2de20 clean up test code 2014-09-05 13:51:44 +08:00
Chilledheart
a882caec03 replace casperjs with selenium 2014-09-05 13:51:44 +08:00
lins05
863d053e08 fixed casper demo.js 2014-09-05 13:51:44 +08:00
lins05
1527b77d82 redirect test server stdout 2014-09-05 13:51:43 +08:00
lins05
e556ad13c0 rename run-test.sh to seahubtests 2014-09-05 13:51:43 +08:00
lins05
145399eed3 fixed casperjs command 2014-09-05 13:51:43 +08:00
lins05
e45f0da330 updated test configs and scripts 2014-09-05 13:51:43 +08:00
Chilledheart
e8b9d2b638 [tests] add casperjs test 2014-09-05 13:51:43 +08:00