haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 23:20:51 +00:00
Code Issues Releases Wiki Activity
5,082 Commits 142 Branches 460 Tags
3fac2a79c2e2569c74c4b58d79d932e6f838ba3c
Commit Graph

5082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Pan
45a7ba13e7 Restructure views 
Conflicts:
	seahub/templates/libraries.html
	static/scripts/app/router.js
	static/scripts/app/views/group.js
	static/scripts/app/views/organization.js
 2016-04-01 10:39:11 +08:00
Daniel Pan
dd906d7f68 Improve dropdown 2016-03-31 21:39:12 +08:00
Daniel Pan
b9ba54f635 use dropdown for publib create button 2016-03-31 21:11:19 +08:00
Daniel Pan
d07e7be840 Improve devices page to support focus 2016-03-31 19:56:36 +08:00
Daniel Pan
00566e24bc Improve login page 2016-03-31 19:55:14 +08: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
1ddd527eda Support contact_email in email headers 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
Daniel Pan
a07a959fa4 Merge pull request #1096 from haiwen/fix-device 
Fix a bug in device-item template
 2016-03-31 17:07:29 +08:00
Daniel Pan
e2095c469c Fix a bug in device-item template 2016-03-31 17:03:58 +08:00
llj
67a10ee4ce Merge pull request #1090 from haiwen/cleaning 
Clean
 2016-03-31 15:43:39 +08:00
llj
fc00fda841 [api2] removed unused template files 2016-03-31 15:02:17 +08:00
Daniel Pan
f87a016995 Merge pull request #1095 from haiwen/update 
update code when transfer org repo
 2016-03-31 14:54:49 +08:00
lian
61dbb5923e update code when transfer org repo 2016-03-31 14:35:53 +08:00
Daniel Pan
919ea35081 Clean simplemodal 2016-03-31 13:42:48 +08:00
Daniel Pan
94ace17c26 Replace folder-icon-24.png with folder-icon.png 
Conflicts:
	seahub/group/templates/group/group_discuss.html
	seahub/group/templates/group/new_msg_reply.html
 2016-03-31 13:42:47 +08:00
Daniel Pan
aa5d51880b Improve repo history list page 2016-03-31 13:39:33 +08:00
Daniel Pan
8c3c3a0402 Improve repo snapshot page 2016-03-31 13:39:33 +08:00
Daniel Pan
d5e9e7a7b0 Merge pull request #1080 from haiwen/HLItemView 
HL item view
 2016-03-31 13:37:46 +08:00
Daniel Pan
0c1e37cc02 Fixes 2016-03-31 13:19:13 +08:00
Daniel Pan
46a568d8bd Merge pull request #1094 from haiwen/pub-grp 
update perm check when anonymous user visit public group wiki
 2016-03-31 11:23:50 +08:00
lian
b2e247dab7 Merge pull request #1092 from hu-berlin-cms/fix/seahub_share_views 
Fix/seahub share views
 2016-03-31 10:47:51 +08:00
lian
c05cfcfc1a update perm check when anonymous user visit public group wiki 2016-03-31 10:35:48 +08:00
Daniel Pan
d66dc30179 remove _hideDropdown() in dropdown view 2016-03-30 17:10:25 +08:00
Daniel Pan
2ee496d4b8 Merge pull request #1091 from haiwen/update-code 
Update code
 2016-03-30 17:04:14 +08:00
lian
1ba944577f rm grpmsg_reply related code 2016-03-30 15:02:40 +08:00
lian
6f658cc61b rm file-priv-share related code 2016-03-30 15:02:31 +08:00
Enno Gröper
2bd341f529 is_valid_username -> is_valid_email 
In case of email addresses we should use the correct check.
Perhaps is_valid_username will change in the future.

I only changed it for the share links. They go to arbitrary email
addresses. Perhaps other occurrences of is_valid_username should/could
be changed, too.
 2016-03-30 09:02:10 +02:00
lian
afc1b48e1d rm urlencode when use "url" template tags 2016-03-30 15:01:47 +08:00
Enno Gröper
bd02d962e0 Cleanup: Removed unused imports and variables 2016-03-30 09:01:43 +02: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
llj
5d3d135f5d [group discuss] improved 'load more' & bugfix 2016-03-29 15:46:53 +08:00
zhengxie
cd0b0ac235 [tests] Fix group discussion 2016-03-29 11:45:27 +08:00
Daniel Pan
816c78e211 Merge pull request #1087 from haiwen/file-rename 
use new v2.1 file api when rename/lock/unlock/del file
 2016-03-28 19:11:43 +08:00
llj
8763a32af8 [group discuss] bugfix 2016-03-28 18:12:25 +08:00
lian
fe6dbcbb63 use new v2.1 file api when rename/lock/unlock/del file 2016-03-28 17:53:58 +08:00
lian
132dd1e7b8 update True/False check when use constance.config 2016-03-28 15:36:18 +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
Daniel Pan
f305ddd586 Merge pull request #1086 from hu-berlin-cms/hotfix/README_Build_From_Source 
Update README
 2016-03-28 10:29:59 +08:00
Enno Gröper
d62086ca70 Update README 
* update source build link
* update instructions for setenv.sh.template (respect 5.0 config layout)
 2016-03-28 00:26:11 +02:00
llj
025af00900 [group discussion] added 'load more' 2016-03-25 17:54:53 +08:00
llj
fdeec88eb3 [group discussion] added 'reply' icon 2016-03-25 15:03:55 +08:00
llj
63f30b3657 [group discussion] bugfix & improvement 2016-03-25 14:55:09 +08:00
Daniel Pan
dc373c956d Improve group discussion 2016-03-25 14:55:09 +08:00
Daniel Pan
13ee24aa8f Add reply action 2016-03-25 14:55:09 +08:00