haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-12 22:49:15 +00:00
Code Issues Releases Wiki Activity
5,247 Commits 133 Branches 453 Tags 2.2 GiB
c39b0b5ff3
Commit Graph

5247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Pan
26d25c6448 Add group discussion delete 2016-03-25 14:55:09 +08:00
Daniel Pan
077a2627f0 Update group discussion 2016-03-25 14:55:09 +08:00
Daniel Pan
4aa500203d Add group discussion 2016-03-25 14:37:58 +08:00
Daniel Pan
3b70297b13 Merge pull request #1085 from haiwen/shib_activate_email 
Fix activate request email not sent bug on registration, and apply to…
 2016-03-25 11:45:47 +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
Daniel Pan
f5498dd835 Remove log 2016-03-23 10:47:35 +08:00
Daniel Pan
cead30046b Merge pull request #1082 from haiwen/dir_view 
[dir view] modified op btns for selected item(s)
 2016-03-22 23:25:25 +08:00
Daniel Pan
0f335a8aa3 Rewrite repo.js with DropdownView 2016-03-22 18:32:42 +08:00
Daniel Pan
cb02bca661 Clean code and fix bugs 2016-03-22 16:09:40 +08:00
llj
e2f2067a2a [dir view] modified op btns for selected item(s) 2016-03-22 15:03:50 +08:00
zhengxie
7e1fad59aa [sql] Fix datetime(6) issue which is not support is mysql 5.5 2016-03-22 14:49:03 +08:00
zhengxie
c1046d8ef4 [i18n] Update po files 2016-03-22 12:10:15 +08:00
Daniel Pan
545eff0174 Merge pull request #1081 from haiwen/dir_view 
[dir view] hide some buttons(ops on current dir) when item(s) selected
 2016-03-22 11:54:23 +08:00
Daniel Pan
2e5ced905f Rewrite repo with HLItemView 2016-03-22 11:47:52 +08:00
llj
c2b1b0bf8d [dir view] hide some buttons(ops on current dir) when item(s) selected 2016-03-22 11:46:42 +08:00
Daniel Pan
6254417be8 Add hl-item-view and dropdown 2016-03-21 21:29:14 +08:00
llj
cb1224233f Merge pull request #1060 from haiwen/clean-css 
Clean code
 2016-03-21 21:01:18 +08:00
llj
0736b210a3 [setting, decrypt lib] clean code 2016-03-21 20:41:53 +08:00
Daniel Pan
05cac32228 Remove unused css 2016-03-21 20:38:17 +08:00
Daniel Pan
a8060db6ed Remove #sf 2016-03-21 20:38:17 +08:00
Daniel Pan
e4c8852a94 Remove .home-profile, clean profile settings page 2016-03-21 20:38:17 +08:00
Daniel Pan
d1559c829e Clean .hidden-op 2016-03-21 20:38:17 +08:00
Daniel Pan
3bea301096 Clean base_for_backbone.html 2016-03-21 20:38:17 +08:00
zhengxie
855318e003 [tests] Use static file storage instead of cached 2016-03-21 18:06:33 +08:00
llj
fa6d490ae8 Merge pull request #1079 from haiwen/update-encrypt-test 
update repo set password api test
 2016-03-21 18:01:43 +08:00
lian
90fc08bd49 update repo set password api test 2016-03-21 17:49:37 +08:00
llj
4af5a45872 Merge pull request #1074 from haiwen/fix-view-encrypt-file 
update decrypt_repo
 2016-03-21 17:22:17 +08:00
llj
05f3d353bf [lib decrypt] bugfix, improvement 2016-03-21 17:16:57 +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
Daniel Pan
6483dc2a39 Fix problem in devices code 2016-03-21 13:36:51 +08:00
zhengxie
d39f159ef5 [i18n] Update string 2016-03-21 12:22:16 +08:00
zhengxie
af6d22503c Update locale 2016-03-21 11:18:20 +08:00
Daniel Pan
ff1f7d9d44 Merge pull request #1077 from haiwen/sys_useradmin_admins 
[sys_useradmin_admins] clean code, bugfix
 2016-03-21 10:11:54 +08:00