haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-25 18:20:48 +00:00
Code Issues Releases Wiki Activity
8,103 Commits 140 Branches 457 Tags 2.7 GiB
c3ede4e834
Commit Graph

658 Commits

Author SHA1 Message Date
xiez
f2fc7a451d Merge pull request #1626 from haiwen/api_whitelist 
Api whitelist
 2017-06-07 16:44:44 +08:00
xiez
4c02004220 Merge pull request #1622 from haiwen/delete-files 
update delete multi file api
 2017-06-07 16:41:55 +08:00
zhengxie
c99d3b4035 [tests] Fix tests 2017-06-06 12:11:05 +08:00
zhengxie
2c2a84159d [role_permission] Add quota for a certain role 2017-06-05 17:52:04 +08:00
lian
1bd70c2f53 update delete multi file api 2017-06-05 17:17:28 +08:00
zming
e26d5b6aa8 [throtting] Add whitelist of throtting 2017-06-05 15:54:08 +08:00
lian
7c9ff51a65 update test of file history api 2017-06-05 11:41:03 +08:00
zhengxie
e9de086db3 Merge branch '6.1' 2017-06-03 11:21:08 +08:00
llj
f7ed342e2d Merge pull request #1593 from haiwen/custom 
admin update logo/favicon
 2017-05-27 16:50:54 +08:00
lian
e1d0169e64 update admin log 
1. add log when admin create repo
1. add log when admin batch delete user
1. update test
 2017-05-23 16:05:51 +08:00
zhengxie
f79159f9d6 Merge branch '6.0' into 6.1 2017-05-23 11:01:55 +08:00
xiez
df2de123ab Merge pull request #1590 from haiwen/encode-utf-8 
not encode utf-8 when do some file/dir operation
 2017-05-23 11:01:15 +08:00
zhengxie
ecb26403ac Merge branch '6.1' 2017-05-23 10:44:06 +08:00
zhengxie
1f7880ebc1 Merge branch '6.0' into 6.1 
Conflicts:
	seahub/urls.py
 2017-05-23 10:38:49 +08:00
zming
1ed03f96e1 [API2] add login_id field, and test case 
[api] update account and test

[template] increase the function of modifying logind

[review] trans

[review] trans again
 2017-05-22 15:33:50 +08:00
zhengxie
133522487a [api2] Add permissions to share link creation api 2017-05-18 17:32:28 +08:00
lian
0ca018fcf4 add admin create repo api 2017-05-18 10:43:31 +08:00
lian
2b1ae5b921 admin update logo/favicon 2017-05-17 16:59:38 +08:00
lian
0d4bdedb37 update user avatar 2017-05-13 16:16:34 +08:00
lian
610d607846 Revert "add create user avatar api" 
This reverts commit 3483783a28.
 2017-05-13 15:51:48 +08:00
Daniel Pan
2461f86211 Merge pull request #1588 from haiwen/repos-api 
add v2.1 repos api
 2017-05-13 11:04:34 +08:00
lian
f062ed4be4 add v2.1 repos api 
batch share repos to user/group
 2017-05-13 09:43:24 +08:00
lian
52f9a6a82f not encode utf-8 when do some file/dir operation 2017-05-13 07:38:55 +08:00
lian
3483783a28 add create user avatar api 2017-05-12 18:16:59 +08:00
zhengxie
b2b9495a35 [share] Add permission field to FileShare model 2017-05-05 15:35:56 +08:00
zhengxie
0c732638eb Merge branch '6.0' 2017-05-04 10:31:49 +08:00
xiez
d4fc5275e6 Merge pull request #1563 from haiwen/share-test 
update dir share item api test
 2017-04-28 15:16:40 +08:00
zhengxie
5c998cdb03 Merge branch '6.0' 2017-04-28 13:35:49 +08:00
zhengxie
764a63e705 Update sso login 2017-04-26 10:28:33 +08:00
lian
28c7fb5703 update dir share item api test 
test share failed when share the same item to the same user/group
 2017-04-25 16:12:56 +08:00
lian
bd0bbf3121 add test for file ops api 2017-04-25 15:54:42 +08:00
lian
c93d7a8736 update return value when copy/move file via web api 2017-04-24 18:17:58 +08:00
zhengxie
0c61a22100 Fix tests 2017-04-17 16:37:23 +08:00
zhengxie
e72cde9d0a Update Django to 1.8.18 2017-04-17 16:37:11 +08:00
zhengxie
e6e6e82b82 Merge branch '6.0' 
Conflicts:
	seahub/api2/endpoints/file.py
	seahub/urls.py
	static/scripts/app/views/share.js
 2017-04-17 16:21:22 +08:00
lian
fef1d50ecd add name check 
1. create/rename repo
1. create/rename folder
1. create/rename file
 2017-04-14 13:21:16 +08:00
lian
132d181c3a update repo history api 
add 'name' and 'contact_email' to result
 2017-04-11 17:44:17 +08:00
lian
756ccf1303 add api 
1. add repo history api.
1. add repo trash api.
1. udpate search file api, add 'content_highlight' to search result
 2017-04-10 17:23:34 +08:00
lian
af4b430572 Revert "Fix tests" 
This reverts commit 375b270b53.
 2017-04-07 10:10:17 +08:00
lian
7de34634a0 Revert "Update Django to 1.8.18" 
This reverts commit 928cf4a09c.
 2017-04-07 10:09:59 +08:00
zhengxie
375b270b53 Fix tests 2017-04-06 17:01:58 +08:00
zhengxie
928cf4a09c Update Django to 1.8.18 2017-04-06 14:13:32 +08:00
zhengxie
2cb2bca2cd Add logout redirect url 2017-03-29 18:31:03 +08:00
lian
1f3b597336 add test for admin libraires api 2017-03-27 15:05:40 +08:00
zhengxie
f40aa6341b Update code styles 2017-03-27 13:58:12 +08:00
zhengxie
1b11350f80 Merge branch '6.0' 
Conflicts:
	seahub/templates/sysadmin/sysadmin_backbone.html
	seahub/urls.py
	seahub/views/sysadmin.py
	static/scripts/app/views/dir.js
 2017-03-27 13:53:35 +08:00
lian
b7d3a62b52 mock has permission 2017-03-24 18:12:27 +08:00
lian
54ec4bba63 add test for admin log api 2017-03-23 15:05:47 +08:00
lian
5427563233 add test for admin libraires api 2017-03-22 17:26:42 +08:00
lian
8286f73331 add api of amdin manage org user 2017-03-09 16:42:09 +08:00
lian
5e70dd8608 Merge pull request #1501 from haiwen/enhancement/share_link 
[share link] Enlarge token length
 2017-02-25 17:28:21 +08:00
zhengxie
ca399d38f8 [share link] Enlarge token length 2017-02-20 15:59:57 +08:00
zhengxie
d82df5fb52 Merge branch '6.0' 
Conflicts:
	media/js/base.js
	seahub/api2/views.py
	seahub/views/ajax.py
	tests/api/test_repo_user_folder_perm.py
 2017-02-17 17:11:33 +08:00
lian
b7cad9a707 add api of admin create default repo for common user 2017-02-17 11:46:37 +08:00
lian
fefb450b76 update api of out shared repos/folders 
return contact email when get info of out shared repos/folders
 2017-02-15 13:56:41 +08:00
lian
8f2df766a9 update search user when not use global address book 2017-02-14 18:38:39 +08:00
lian
2b43226d08 Merge pull request #1475 from haiwen/odf-view 
[ODF] modified file view for ODF; fix bugs
 2017-02-13 16:49:12 +08:00
Daniel Pan
f0a610cf69 Merge pull request #1480 from haiwen/search-user 
update search user
 2017-02-13 16:48:26 +08:00
lian
c904884526 update search user 
user can search if he/she has no permission of using global address book
 2017-02-13 16:03:31 +08:00
llj
5802a37628 [ODF] update test 2017-02-13 15:54:14 +08:00
xiez
801ec6455e Merge pull request #1479 from haiwen/virus 
Virus
 2017-02-13 13:36:31 +08:00
zhengxie
2cb9d4c753 [notification] Update virus scan notice 2017-02-13 11:37:53 +08:00
lian
f5ac28a38c rm unused dirent download api 2017-02-10 18:04:56 +08:00
xiez
6fd822f45f Merge pull request #1457 from haiwen/admin-group 
udpate admin groups page
 2017-02-09 18:11:09 +08:00
lian
5743c3879e update admin import user from csv file 2017-02-09 17:58:04 +08:00
lian
718bdbb59b update admin manage group page 2017-02-09 14:59:49 +08:00
lian
287257dd7c force change password after batch add user 2017-02-07 17:45:36 +08:00
lian
d43a2e5eb3 admin search group by name 2017-01-19 18:21:04 +08:00
lian
9848514e7d update test 2017-01-19 14:40:49 +08:00
lian
d05f72b7a0 update user personal wiki module 2017-01-19 14:40:49 +08:00
lian
86f948aaa8 update set_notice_seen_by_id 2017-01-19 14:40:49 +08:00
lian
5a700d5f00 update set_notices_seen 2017-01-19 14:40:49 +08:00
lian
8d62d3786e update get unseen notifications count 2017-01-19 14:40:49 +08:00
zhengxie
622fe2705e Fix reset email message 2017-01-17 16:08:03 +08:00
zhengxie
1832b2b0c0 [shib] Add affiliation role map 2017-01-17 13:24:08 +08:00
zhengxie
19beb9a7c8 [tests] Fix user reset 2017-01-17 12:01:03 +08:00
zhengxie
df70fd1b5e Use contact email in password resetting 2017-01-16 15:46:00 +08:00
lian
2ecae4162b update remove folder permission 
not check path existence when delete user/group folder permission
 2017-01-13 16:54:38 +08:00
lian
53d09bae5e update account api 
remove 'note' releated operation
 2017-01-07 17:00:16 +08:00
lian
38a06be960 update sysinfo page 2017-01-07 10:12:17 +08:00
xiez
9a9b6eb9e1 Merge pull request #1429 from haiwen/useradmin 
Useradmin
 2017-01-06 14:01:59 +08:00
lian
625db696af use api to set user quota/profile 2017-01-05 13:33:12 +08:00
Daniel Pan
65325da7de Merge pull request #1434 from haiwen/fix/group_wiki 
Fix group wiki for system admin
 2016-12-26 14:38:21 +08:00
zhengxie
b92a370658 Fix group wiki for system admin 2016-12-26 14:18:29 +08:00
Daniel Pan
c28f684c22 Merge pull request #1428 from haiwen/enhancement/invitation 
[invitation] Check duplicated accepter and add blocklist for accepter
 2016-12-26 12:02:57 +08:00
zhengxie
11fdfe7299 [invitation] Check duplicated accepter and add blocklist for accepter 2016-12-26 11:49:45 +08:00
lian
d6e216dda5 admin add group 2016-12-16 15:02:21 +08:00
xiez
048d6df0ba Merge pull request #1388 from haiwen/new-user 
check if user num exceed limit before add user
 2016-11-05 13:49:23 +08:00
lian
34a350d623 check if user num exceed limit before add user 2016-11-05 12:09:58 +08:00
lian
41dbebaa86 check if repo/folder exist before upload/update file 2016-11-02 18:04:59 +08:00
lian
7a2ad81be2 fix bug when admin searching unexisting user 2016-11-01 11:45:32 +08:00
lian
74b5e840db filter out sub repos 2016-09-22 11:32:21 +08:00
lian
58737d62f7 update revert file/dir 2016-09-13 11:16:12 +08:00
zhengxie
f4253ad806 [role perm] Update settings of role permissions 2016-09-05 15:16:31 +08:00
zhengxie
de9f8a0aea [invitations] Fix mail and role 2016-09-05 10:37:18 +08:00
lian
fd917c0007 update user permission 
1. update user generate share/upload link permission
2. update user connect iso/android/desktop clients permission
 2016-08-22 11:20:48 +08:00
lian
b66e1b8364 reshare repo to user/group/pub when admin transfer a repo 2016-08-18 17:49:12 +08:00
lian
5c59b81466 add new admin share api 2016-08-16 10:19:56 +08:00
lian
92df1ef8d2 admin manage repo share 2016-08-10 10:21:19 +08:00
xiez
929731ec0d Merge pull request #1318 from haiwen/feature/virus_check 
Add virus check when upload files to upload link
 2016-08-09 11:28:26 +08:00
zhengxie
c255735326 Fix api error when 2fa enabled 2016-08-08 15:59:19 +08:00
lian
c7acdce7de update admin transfer group 2016-08-04 18:01:44 +08:00
zhengxie
bfbd6f05a5 Add virus check when upload files to upload link 2016-08-04 16:09:05 +08:00
lian
d142f2ddc1 update usage of seafile_api & test 2016-08-01 14:38:54 +08:00
Daniel Pan
02a8ae394b Merge pull request #1290 from haiwen/admin-groups 
new admin groups page
 2016-07-26 15:52:42 +08:00
xiez
126da528b5 Merge pull request #1295 from haiwen/fix/api2 
[api2] Add "created at" field in token V2
 2016-07-21 13:23:17 +08:00
zhengxie
57cc2b4aba Merge branch '5.1' 
Conflicts:
	seahub/base/accounts.py
	seahub/share/views.py
	seahub/views/sysadmin.py
	tests/seahub/base/test_accounts.py
	tests/seahub/share/views/test_ajax_get_download_link.py
	tests/seahub/share/views/test_ajax_get_upload_link.py
 2016-07-21 10:55:50 +08:00
lian
744efb2322 new admin groups page 2016-07-20 17:23:07 +08:00
zhengxie
f1aaea96f1 [api2] Add "created at" field in token V2 2016-07-20 16:02:17 +08:00
lian
782fbb38ed add ENABLE_GUEST_INVITATION setting 2016-07-20 15:45:38 +08:00
lian
6688dc760b new invitation page 2016-07-20 15:40:58 +08:00
zhengxie
7452c0cfc2 [api] Add guest invite feature 2016-07-20 15:38:15 +08:00
lian
efdc55ffd3 rm joined groups from middleware (#1287) 
* rm joined groups from middleware

* rm "base_template" code from context_processors.py

* clean unused group add code
 2016-07-18 18:30:50 +08:00
lian
b5d9ece164 rm synced repos at devices page (#1285) 2016-07-14 13:54:17 +08:00
lian
fe236eca03 [api] rm virtual repo related code (#1279) 2016-07-13 17:34:16 +08:00
lian
fcd3e836e3 [api] return licensed to info when get sysinfo 2016-07-13 16:31:05 +08:00
lian
70adf6d552 [sysadmin] add search user by name & contact email 2016-07-13 11:22:36 +08:00
lian
8f1dbb7ea3 update search user api 2016-07-12 15:04:36 +08:00
lian
4f43f31468 [api] update license info 2016-07-11 12:08:44 +08:00
lian
d89c3bd906 update create dir sub repo api 2016-07-08 10:15:13 +08:00
zhengxie
decb3615ed Enable institution admin to toggle user status 2016-07-06 15:57:41 +08:00
lian
6dca56e9d5 update download dir/multi 2016-07-04 15:31:55 +08:00
lian
369c9f3bf8 update share/upload link test 2016-07-01 17:06:27 +08:00
lian
c4fa072dc7 new share admin page (#1233) 2016-06-30 15:06:43 +08:00
lian
ed10512a53 update repo share 
1. reshare repo after user/admin transfer repo
2. show org repo share out list at share popup in org mode
 2016-06-28 16:49:41 +08:00
zhengxie
528b33ec0e Add role permissions 2016-06-27 16:41:55 +08:00
lian
38c5485dd5 update admin device test 2016-06-27 11:59:01 +08:00
lian
2f35cd01a9 update ajax get download link & update test (#1259) 2016-06-25 15:54:06 +08:00
zhengxie
7b3f3a429b
Fix tests 2016-06-25 12:02:09 +08:00
Daniel Pan
cf1017513a Code clean (#1217) 
* Use API to create file/folder instead of Ajax
* Remove sub_repo AJAX api
* Remove repo delete AJAX function
* Remove get_group_basic_info
* Add comment for get_unenc_group_repos
* Remove ajax_repo_change_basic_info and ajax_repo_transfer_owner
* Remove ajax_unset_inner_pub_repe and RepoPublic
* Remove ajax star/unstar a file
* update be shared repo api
* update test public repo
* Remove ajax_repo_remove_share
 2016-06-20 18:34:30 +08:00
lian
8de5551991 update file api 
1. return checked file name when creat a new file
2. update test
 2016-06-20 18:19:53 +08:00
lian
3716c76750 [api-2.1] update file/dir api 2016-06-17 18:26:35 +08:00
zhengxie
798a69d6db
Fix invalid email in register issue, https://github.com/haiwen/seafile/issues/1672 2016-06-14 14:22:59 +08:00
Daniel Pan
b567379c2c Merge branch '5.1' 
Conflicts:
	seahub/templates/registration/password_change_form.html
	seahub/templates/sysadmin/base.html
	seahub/templates/sysadmin/sysadmin_backbone.html
 2016-06-13 18:25:20 +08:00
zhengxie
2e5016b1a3
[test] Update dir_shared_items 2016-06-13 10:50:26 +08:00
Daniel Pan
ad47cedfd8 Merge pull request #1232 from haiwen/enhancement/inst_admin 
[inst] Add search user and list admins
 2016-06-12 17:12:00 +08:00
zhengxie
3fac2a79c2
[inst] Add search user and list admins 2016-06-08 16:56:52 +08:00
Daniel Pan
6e2a275762 Merge pull request #1227 from haiwen/fix/add_group_member_notice 
Nofity user when add group member
 2016-06-07 11:32:23 +08:00
zhengxie
43e1136896
Fix anonymous user issue in get repos 2016-06-07 11:10:21 +08:00
zhengxie
4281f0ec57 Nofity user when add group member 2016-06-06 15:06:05 +08:00
zhengxie
00661b9be1
Add notification when comment a file 2016-06-04 17:25:27 +08:00
lian
8b5446c05d update test 2016-05-30 18:14:21 +08:00
lian
cb7414be67 update permission check when set an exist repo as personal/gorup wiki repo 2016-05-30 10:53:23 +08:00
lian
3ae74298b3 update permission check of share/upload link 2016-05-30 10:52:58 +08:00
Daniel Pan
f2e1ebcb26 Merge pull request #1212 from haiwen/enhancement/constance 
Add setting to enable/disable constance(web settings)
 2016-05-27 11:11:34 +08:00
zhengxie
346c228495
Add ENABLE_SETTINGS_VIA_WEB setting and remoke CONSTANCE_ENABLED 2016-05-27 10:33:10 +08:00
zhengxie
1b9b18c2cb
Add setting to enable/disable constance(web settings) 2016-05-26 15:57:37 +08:00
zhengxie
0936f360bd
Fix clear login attempts bug, and update login tests 2016-05-26 11:38:49 +08:00
zhengxie
2f3091093c Fix comment author issue 2016-05-25 11:48:09 +08:00
zhengxie
fe999b7559 [api2] Add user info to file comment obj 2016-05-23 17:51:23 +08:00
zhengxie
c19b781713 [file comment] Fix hash bug and improve sql 2016-05-23 17:51:23 +08:00
zhengxie
e8579d0742 [api] Add file comment endpoints 2016-05-23 17:51:23 +08:00
Daniel Pan
ee99d7aad8 Merge branch '5.1' 
Conflicts:
	seahub/group/templates/group/group_base.html
	seahub/templates/home_base.html
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/js/templates.html
	seahub/templates/libraries.html
	seahub/templates/pub_base.html
	static/scripts/app/views/group-discussions.js
 2016-05-21 13:42:04 +08:00
lian
e4ac653e34 return head commit id info from repos api 2016-05-21 12:12:01 +08:00
lian
160963c272 update audit when view file via shared dir 2016-05-18 17:11:56 +08:00
zhengxie
c4fb7d51b4
[tests] Update tests 2016-05-17 18:14:17 +08:00
zhengxie
f12215ec5e
[shib] Fix shib complete url bug 2016-05-17 17:48:57 +08:00
Shuai Lin
aa41bb9bc3 travis ci: download phantomjs from bintray instead of bitbucket. 2016-05-17 11:11:18 +08:00
zhengxie
2e4839dcf1
[test] Update test 2016-05-13 16:17:55 +08:00
lian
97a39ead0d remember username when upload file from upload-link 2016-05-13 14:46:20 +08:00
Daniel Pan
671186dd60 Merge pull request #1163 from haiwen/full-screen 
Full screen
 2016-05-12 10:57:20 +08:00
llj
35f7389227 layout: fix pages; rm unused code & files 2016-05-10 17:11:35 +08:00
lian
e71ca6d84b unset admin after transfer success 2016-05-06 14:52:28 +08:00
zhengxie
03ed21d8f4 [tests] Update shared files 2016-04-29 17:41:50 +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
Daniel Pan
21ebd19b49 Merge pull request #1146 from haiwen/freeze_on_login_failed 
Freeze on login failed
 2016-04-25 17:40:15 +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
zhengxie
f57a435298 tmp 2016-04-21 10:48:23 +08:00
zhengxie
8e2adf9564
Nofity admins on account froze 2016-04-19 19:03:47 +08:00
zhengxie
9b921f08e7 [base] Update database storage 2016-04-15 11:59:29 +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
zhengxie
5801349d30 [tests] Add test 2016-04-09 14:35:56 +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
d85fdccddf Tests for contact_email support in share link emails 2016-03-31 12:06:16 +02:00
Enno Gröper
b64e882a54 Improve share-link tests 
Tests for correct from header and support testing Reply-To header and rewrite of From.
Support testing shared_link email, too.
 2016-03-31 12:06:15 +02: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
8c95c8acca Merge pull request #1089 from haiwen/force_pwd_change 
[sysadmin] Add force_password_change option on settings
 2016-03-29 23:01:04 +08:00
Daniel Pan
3665084ec9 Merge pull request #1053 from haiwen/discussion 
Add group discussion
 2016-03-29 17:46:49 +08:00
zhengxie
f40c1374b8 [sysadmin] Add force_password_change option on settings 2016-03-29 17:03:50 +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
llj
fa022ed9df [group discuss] add notice when post a discussion; removed unused files and code 2016-03-28 13:48:07 +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
zhengxie
f43cdb3f35 [tests] Make shib test pass 2016-03-24 16:58:55 +08:00
zhengxie
65a336f573 [shib] Add shibboleth complete page 2016-03-24 16:25:45 +08:00
zhengxie
42c90bda2e Fix activate request email not sent bug on registration, and apply to shibboleth login 2016-03-24 15:21:11 +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
lian
b4bdbd01a3 remove urlquote when reverse 2016-03-19 15:04:00 +08:00
zhengxie
3d5d98ffb8 Update nickname cache invalidation 2016-03-18 16:23:39 +08:00
Daniel Pan
99e8c1c99d Merge pull request #1062 from haiwen/devices 
new devices page
 2016-03-17 10:24:55 +08:00
Daniel Pan
49ac5b9ec2 Merge pull request #1061 from haiwen/render-dirents 
update render dirents
 2016-03-15 18:19:12 +08:00
lian
a43b3f969e new devices page 2016-03-15 18:19:12 +08:00
lian
e4a468eb8f update render dirents 2016-03-15 12:04:31 +08:00
zhengxie
eb799b516e [tests] Add password change test 2016-03-14 16:45:41 +08:00
Daniel Pan
8f368f3231 Merge pull request #1036 from haiwen/restore-file-dir-api 
add dir revert api & update file revert api
 2016-03-10 10:36:24 +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
e844735cc2 [tests] Update tests 2016-03-08 10:59:46 +08:00
zhengxie
56ad0d3f04 Fix travis config, and send share link api 2016-03-07 16:41:26 +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
zhengxie
4d0ac16a47 [utils] Update is_safe_url 2016-03-04 16:17:47 +08:00
lian
1992912ce1 [api-v2.1] add file share/upload links api 2016-02-26 17:59:05 +08:00
lian
8b4e78484e rm unused test 2016-02-26 15:52:53 +08:00
lian
62979d9af6 add err msg detail when share repo/folder failed 2016-02-24 15:02:01 +08:00
zhengxie
acb1a5e51e Use GB instead of GiB in filesizeformat and quota calculation 2016-02-24 11:53:32 +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
fa24c0c5d1 Merge pull request #1028 from haiwen/5.0-shib-nickname 
[shib] Use display_name in shib_meta as nickname, fallback to givenna…
 2016-02-23 16:11:33 +08:00
Daniel Pan
eb0f749b82 Merge pull request #1029 from haiwen/5.0-email2nickname 
[seahub tags] Handle empty nickname in email2nickname
 2016-02-23 16:10:26 +08:00
zhengxie
d01c21a9cc [test] Update shib test 2016-02-23 15:23:45 +08:00
zhengxie
f98b97b60b [seahub tags] Handle empty nickname in email2nickname 2016-02-23 15:13:12 +08:00
zhengxie
11e645cae0 [shib] Use display_name in shib_meta as nickname, fallback to givenname + surname if missing 2016-02-23 14:26:10 +08:00
Daniel Pan
663a00e8ab Merge pull request #1025 from haiwen/5.0-virus-fix 
5.0 virus fix
 2016-02-23 13:49:55 +08:00
zhengxie
a5f262b1a6 [test] Workaround for virus scan test 2016-02-23 13:38:22 +08:00
zhengxie
ebcd7ed44d [virus] Fix url error when records number more than 9 2016-02-23 11:53:16 +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
lian
8124fa4a79 update admin default repo view page & rm unused code 2016-02-19 15:47:04 +08:00
Daniel Pan
a5056c7a67 Merge pull request #1021 from haiwen/5.0-notice 
[notice] Fix notification email bug
 2016-02-18 23:04:22 +08:00
zhengxie
7e81ad7356 [tests] Fix tests 2016-02-17 16:17:00 +08:00
zhengxie
ae1c8f0a0a [notice] Fix notification email bug 2016-02-17 16:01:54 +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
dc6420a440 [tests] Fix pub repo tests 2016-02-02 13:32:12 +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
zhengxie
a988e52153 [tests] add seahub uts 2016-01-28 15:38:25 +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
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