haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-13 22:01:06 +00:00
Code Issues Releases Wiki Activity
6,683 Commits 144 Branches 460 Tags
aaa5f3a074326b649426e56f416fb65f1931e466
Commit Graph

562 Commits

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