haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 15:09:14 +00:00
Code Issues Releases Wiki Activity
6,245 Commits 142 Branches 460 Tags
b912c69c5ae9fc80c39d4efea0888ef73bf34c12
Commit Graph

478 Commits

Author SHA1 Message Date
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