haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 13:24:52 +00:00
Code Issues Releases Wiki Activity
5,082 Commits 145 Branches 460 Tags
3fac2a79c2e2569c74c4b58d79d932e6f838ba3c
Commit Graph

5082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
zhengxie
0d57b3f060 [sql] Update schema 2016-03-19 16:35:39 +08:00
llj
6d50509168 [sys_useradmin_admins] clean code, bugfix 2016-03-19 16:28:23 +08:00
Daniel Pan
c59294edf5 Merge pull request #1076 from haiwen/urlquote 
remove urlquote when reverse
 2016-03-19 15:20:59 +08:00
lian
b4bdbd01a3 remove urlquote when reverse 2016-03-19 15:04:00 +08:00
xiez
70870dde35 Update footer.html 2016-03-19 14:49:53 +08:00
Daniel Pan
95e764fc0c Merge pull request #1067 from haiwen/multi_institution 
[inst] Add institution feature
 2016-03-19 13:34:01 +08:00
Daniel Pan
6f2014593f Merge pull request #1075 from haiwen/clean_share 
[file view] clean 'share'
 2016-03-19 13:09:31 +08:00
llj
55c1c08ccf [file view] clean 'share' 2016-03-19 12:04:28 +08:00
Daniel Pan
c0eb07b311 Merge pull request #1073 from haiwen/fix-repo-create 
fix repo create error
 2016-03-19 11:00:49 +08:00
lian
cca0f52a9d fix repo create error 2016-03-19 10:36:18 +08:00
Daniel Pan
fbfa175ece Merge pull request #1072 from haiwen/upgrade_jquery 
[non backbone] upgrade jquery.js, bugfix for some pages
 2016-03-18 18:21:47 +08:00
llj
4ebf0d79ce [non backbone] upgrade jquery.js, bugfix for some pages 2016-03-18 17:05:36 +08:00
Daniel Pan
b4b026ab8d Merge pull request #1071 from haiwen/5.0-nickname_cache 
Update nickname cache invalidation
 2016-03-18 16:54:00 +08:00
zhengxie
3d5d98ffb8 Update nickname cache invalidation 2016-03-18 16:23:39 +08:00
Daniel Pan
865429e5ec Merge pull request #1069 from haiwen/5.0-fix_target_blank 
Fix target blank, issue: https://github.com/haiwen/seahub/issues/1066
 2016-03-18 12:05:28 +08:00