zhengxie
|
7e81ad7356
|
[tests] Fix tests
|
2016-02-17 16:17:00 +08:00 |
|
zhengxie
|
ae1c8f0a0a
|
[notice] Fix notification email bug
|
2016-02-17 16:01:54 +08:00 |
|
zhengxie
|
602355381f
|
[settings] Update pub repo creation and sync with folder
|
2016-02-17 16:00:53 +08:00 |
|
zhengxie
|
7ec15def66
|
[travis] Fix error
|
2016-02-17 15:40:25 +08:00 |
|
zhengxie
|
b29b543d62
|
[api2] Update group discussion error msg
|
2016-02-02 18:18:19 +08:00 |
|
Daniel Pan
|
a7eecaeff4
|
Merge pull request #1018 from haiwen/repo-folder-perm
update args of repo user/group perm api
|
2016-02-02 18:08:51 +08:00 |
|
lian
|
413738f66e
|
update args of repo user/group perm api
|
2016-02-02 15:27:39 +08:00 |
|
zhengxie
|
56f533c300
|
[api2] Add list/post/delete group discussions
|
2016-02-02 15:01:13 +08:00 |
|
zhengxie
|
dc6420a440
|
[tests] Fix pub repo tests
|
2016-02-02 13:32:12 +08:00 |
|
zhengxie
|
cc5af51dec
|
Merge branch '5.0'
Conflicts:
seahub/templates/base_for_backbone.html
seahub/templates/libraries.html
seahub/templates/myhome_base.html
|
2016-02-02 12:19:46 +08:00 |
|
Daniel Pan
|
f2b4cdad3d
|
Merge pull request #1016 from haiwen/5.0-default_repo
Fix default repo re-creation bug when web login after desktop
|
2016-02-01 14:10:29 +08:00 |
|
zhengxie
|
52b661147e
|
Fix default repo re-creation bug when web login after desktop
|
2016-02-01 11:54:02 +08:00 |
|
Daniel Pan
|
5f462a5f63
|
Merge pull request #1013 from haiwen/sub-repo
not show sub repo at some page
|
2016-02-01 11:47:00 +08:00 |
|
Daniel Pan
|
d1912a6d4d
|
Merge pull request #1012 from haiwen/revert-file-dir
refresh current page when revert file/dir
|
2016-02-01 11:45:53 +08:00 |
|
lian
|
905c81a57b
|
not show sub-repo at web front page
|
2016-02-01 11:21:05 +08:00 |
|
Daniel Pan
|
735563e26d
|
Fix group api tests
|
2016-01-30 17:32:13 +08:00 |
|
Daniel Pan
|
e0934161bc
|
Clean group wiki page
|
2016-01-30 17:13:46 +08:00 |
|
Daniel Pan
|
6a88d50b02
|
Turn on/off group Wiki
|
2016-01-30 16:23:52 +08:00 |
|
Daniel Pan
|
d3eaf26773
|
Merge pull request #999 from haiwen/update-icons
Update icon for group settings
|
2016-01-30 14:49:59 +08:00 |
|
lian
|
07ef3f7e73
|
refresh current page when revert file/dir
|
2016-01-29 16:45:24 +08:00 |
|
Daniel Pan
|
55a23c6926
|
Merge pull request #1011 from haiwen/view-trash-file
update trash file view page
|
2016-01-29 14:33:34 +08:00 |
|
lian
|
0756c56e32
|
update trash file view page
|
2016-01-29 14:20:46 +08:00 |
|
zhengxie
|
d420e50da0
|
[i18n] Update locales
|
2016-01-29 13:42:26 +08:00 |
|
xiez
|
4966be7a69
|
Merge pull request #978 from haiwen/5.0-login_url
Enable LOGIN_URL to be configured
|
2016-01-29 13:36:34 +08:00 |
|
xiez
|
f0b8979775
|
Merge pull request #1007 from haiwen/update-seahub
update seahub according to new seafile api
|
2016-01-28 15:45:55 +08:00 |
|
zhengxie
|
a988e52153
|
[tests] add seahub uts
|
2016-01-28 15:38:25 +08:00 |
|
Daniel Pan
|
b667a675c8
|
Merge pull request #1009 from haiwen/fileupload_fix
[fileupload] show error msg instead of 'errorThrown'
|
2016-01-27 18:49:51 +08:00 |
|
Daniel Pan
|
2079b8d68e
|
Merge pull request #1008 from haiwen/5.0-shib
[shibboleth] Record nickname, contact email and institution to profile
|
2016-01-27 18:07:35 +08:00 |
|
lian
|
93f13e7358
|
add test for web-api use new seafile api
|
2016-01-27 18:05:29 +08:00 |
|
llj
|
243e28abbf
|
[fileupload] show error msg instead of 'errorThrown'
|
2016-01-27 16:41:05 +08:00 |
|
lian
|
3d09dd9953
|
update seahub according to new seafile api
|
2016-01-27 15:52:33 +08:00 |
|
zhengxie
|
508322e629
|
[shibboleth] Record nickname, contact email and institution to profile
|
2016-01-27 14:10:51 +08:00 |
|
Daniel Pan
|
c042f4ba2c
|
Merge pull request #1006 from haiwen/repo-folder-perm
[api] add repo user/group folder perm api
|
2016-01-27 11:24:14 +08:00 |
|
lian
|
08f929eb35
|
[api] add repo user/group folder perm api
|
2016-01-27 09:58:20 +08:00 |
|
xiez
|
29680a4c61
|
Merge pull request #1003 from haiwen/5.0-pubrepo
5.0 pubrepo
|
2016-01-26 15:38:48 +08:00 |
|
zhengxie
|
df1e082e8c
|
Update function name and error msg
|
2016-01-26 10:38:19 +08:00 |
|
Daniel Pan
|
d8a4b16a5b
|
Merge pull request #1000 from haiwen/repo-share-link-api
[api] add repo share link api
|
2016-01-23 13:20:20 +08:00 |
|
xiez
|
9455f3a03f
|
Merge pull request #997 from haiwen/remove-pubfile
Remove group pub file
|
2016-01-22 10:54:47 +08:00 |
|
zhengxie
|
a8bf96d2e2
|
Disable cache when testing
|
2016-01-21 15:45:35 +08:00 |
|
zhengxie
|
c4d743b134
|
Add setting to enable/disable organization repo creation
|
2016-01-21 13:55:52 +08:00 |
|
zhengxie
|
c18a475c2c
|
[i18n] Update source files
|
2016-01-21 11:39:51 +08:00 |
|
lian
|
a84c603168
|
[api] add repo share link api
|
2016-01-20 16:29:46 +08:00 |
|
Daniel Pan
|
06a8426f67
|
Merge pull request #1002 from haiwen/update-repo-history-limit
[api2] update repo history limit
|
2016-01-20 12:09:41 +08:00 |
|
lian
|
fd01c06802
|
[api2] update repo history limit
still can get limit days if history limit setting not enabled
|
2016-01-20 11:46:17 +08:00 |
|
Daniel Pan
|
5ee27c138b
|
Merge pull request #1001 from haiwen/useradmin
show broken repo at user admin page
|
2016-01-19 20:26:10 +08:00 |
|
lian
|
a21a0840e1
|
show broken repo at user admin page
|
2016-01-19 16:35:12 +08:00 |
|
Daniel Pan
|
cac889406a
|
Merge pull request #996 from haiwen/repo-history-limit-api
[api] add repo history limit api
|
2016-01-16 14:57:57 +08:00 |
|
Daniel Pan
|
624cc00133
|
Merge pull request #998 from haiwen/update-err-msg
update err msg of share dir item endpoint
|
2016-01-16 14:44:26 +08:00 |
|
Daniel Pan
|
4e98fd2365
|
Update icon for group settings
|
2016-01-16 14:40:22 +08:00 |
|
zhengxie
|
94b6818475
|
Add trans context in "Organization" string
|
2016-01-15 13:50:33 +08:00 |
|