haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 21:30:39 +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
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
lian
c7c05ee1be update err msg of share dir item endpoint 2016-01-15 13:32:59 +08:00
zhengxie
f18e4c133f [api2] Remove some fields from token v2 2016-01-15 13:28:37 +08:00
zhengxie
6d1e5e9884 Fix tokenv2 error when platform_version is empty 2016-01-15 12:27:38 +08:00
Daniel Pan
f9ffaab4be Merge pull request #945 from haiwen/search-user 
Search user
 2016-01-14 13:36:40 +08:00
lian
0e43a099ff [api] update search user api 2016-01-14 13:10:24 +08:00
llj
5f3c030a52 ['search user'] select2: enable 'directly enter email' 
* the separator is 'Enter', i.e., clicking the Enter key
 2016-01-14 11:42:28 +08:00
lian
267798b3f1 [api] add repo history limit api 2016-01-14 11:35:15 +08:00
Daniel Pan
d88d93cc99 Remove group pub file 2016-01-14 10:41:24 +08:00
Daniel Pan
2fe8ed0cfb Merge pull request #988 from haiwen/transfer-repo-api 
[api2] add transfer repo api
 2016-01-13 18:11:54 +08:00
lian
3c21b354be [api] add transfer repo api 2016-01-13 17:58:59 +08:00
Daniel Pan
feb6f783a9 Merge pull request #992 from haiwen/group_info 
[group info] remove unused code & files, and other modification
 2016-01-13 16:25:08 +08:00
Daniel Pan
35bec4b59f Merge pull request #995 from haiwen/group_fix 
show group name in path for 'group dir view'; fix updateGroups in sid…
 2016-01-13 16:24:22 +08:00
llj
53fddee277 [group dir view] modification 2016-01-13 16:04:04 +08:00
llj
13ea3fcb6a show group name in path for 'group dir view'; fix updateGroups in side-nav.js 2016-01-13 14:54:46 +08:00
zhengxie
5cc1c14e5e [api2] Use custom UserRateThrottle 2016-01-13 10:37:11 +08:00