haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 23:02:26 +00:00
Code Issues Releases Wiki Activity
3,339 Commits 145 Branches 464 Tags
c3f3e90af10c53cc9aff1022b2fc58c0ccab0f7c
Commit Graph

3339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Kreitschmann
c3f3e90af1 Redirect using "next" parameter when using shibboleth button 2015-03-25 23:59:36 +01:00
zhengxie
d35991c5ed [i18n] Update locales 2015-03-25 15:39:02 +08:00
zhengxie
4bc72ce852 [i18n] Update source file 2015-03-25 13:59:59 +08:00
zhengxie
8b8296faa0 Merge branch '4.1' v4.1.1-server 2015-03-25 13:48:58 +08:00
xiez
50f07aea77 Merge pull request #436 from haiwen/file-audit 
[sysadmin-log] Show file-audit/update & permission log
 2015-03-25 13:44:57 +08:00
lian
7b51afe600 [sysadmin-log] Show file-audit/update & permission log 2015-03-25 13:36:24 +08:00
zhengxie
39adab3332 [sys] Fix add org bug 2015-03-25 13:10:56 +08:00
xiez
1e2756b128 Merge pull request #435 from haiwen/repo-trash 
[sysadmin] add repo trash
 2015-03-25 10:34:02 +08:00
xiez
845495259d Merge pull request #434 from haiwen/activities 
[activities] update commit desc translate tag
 2015-03-25 10:33:39 +08:00
zhengxie
2ee4d9a16c [event] Fix same event bug 2015-03-24 14:33:07 +08:00
lian
840e8d544b [sysadmin] add repo trash 2015-03-23 17:59:33 +08:00
lian
ad72b65d7e [activities] update commit desc translate tag 2015-03-21 16:19:33 +08:00
xiez
c7cff08e6e Merge pull request #424 from haiwen/update-url 
update repo settings url
 2015-03-21 11:37:36 +08:00
lian
fa67e66f83 update repo settings url 2015-03-21 11:25:29 +08:00
zhengxie
6cdb0acb7f [api2] Fix a few bugs to make tests pass 2015-03-20 14:19:09 +08:00
zhengxie
b8764f4f21 [tests] Add unittest for seahub 2015-03-18 18:14:59 +08:00
zhengxie
7bbd336d29 Merge branch '4.0' 
Conflicts:
	seahub/views/ajax.py
v4.1.0-server 		2015-03-18 10:22:55 +08:00
lian
cb4ffdfcce [thumbnail] add THUMBNAIL_IMAGE_SIZE_LIMIT 2015-03-18 10:17:59 +08:00
lian
f8ba28f723 [shared-link] add token to cache when set/check shared link access 2015-03-18 10:16:53 +08:00
llj
cd66730377 added necessary 'escape' for dir/file operations 2015-03-17 15:54:53 +08:00
lian
2d43bb88dc [detail & activities] escape file/dir name 2015-03-16 17:55:48 +08:00
zhengxie
d22f307f1c Escape repo name and group name in messages 2015-03-13 16:11:33 +08:00
zhengxie
e804b84202 Merge branch '4.1' 2015-03-13 14:49:30 +08:00
zhengxie
28ae0e5380 Merge branch '4.0' 2015-03-13 14:46:52 +08:00
lian
c4d4331905 [notice-popup] escape repo_name/filename/dirname when show notice popup 2015-03-13 11:24:10 +08:00
xiez
4fd36c44ac Merge pull request #408 from haiwen/logout 
[api] support logging out an accout from seafile clients
 2015-03-13 11:04:16 +08:00
Shuai Lin
f4ed79bd3e ignore repos that are no longer accessible when regenerating tokens 2015-03-13 11:01:13 +08:00
zhengxie
43c405a28b More escapes in share/delete 2015-03-12 13:26:22 +08:00
zhengxie
af43c8f76e [js] Escape data-target when show confirm popup 2015-03-12 13:26:10 +08:00
zhengxie
558127ece6 Escape error/success messages 2015-03-12 13:25:59 +08:00
zhengxie
4113ec27a6 [js] Escape data-target when show confirm popup 2015-03-11 13:57:50 +08:00
zhengxie
468fe71db0 Escape error/success messages 2015-03-11 11:01:39 +08:00
Shuai Lin
18bc135a53 [api] support logging out an accout from seafile clients 2015-03-10 08:28:02 +08:00
xiez
e67e459ccb Merge pull request #399 from haiwen/clear-token 
[sysadmin] clear token
 2015-03-09 17:45:34 +08:00
lian
a22f1acc22 [sysadmin] clear token 
clear api/repo-sync token when delete/inactive an user
 2015-03-09 17:34:28 +08:00
Daniel Pan
05fca6ff49 Update help_security.html 
Remove password can't be changed.
 2015-03-09 13:42:57 +08:00
lian
a859daffbd [web-api] update upload file api 2015-03-07 18:17:00 +08:00
zhengxie
adbcc842dc Merge branch '4.0' 
Conflicts:
	seahub/templates/registration/login.html
 2015-03-06 16:00:57 +08:00
zhengxie
7bd7986384 Fix bug in shib login v4.0.6-pro v4.0.7-pro 2015-03-05 17:15:10 +08:00
zhengxie
6757126da9 [shib] Fix bug when authenticate shib user, issure #394 2015-03-05 16:38:42 +08:00
lian
d20b0ed44e [web-api] update copy file api 
set parent-dir default '/' if no parameter 'p'
 2015-03-05 16:06:51 +08:00
lian
4b094b698b [web-api] check if dst-repo/dst-dir existes before copy file 2015-03-05 15:49:49 +08:00
xiez
7494ebaabe Merge pull request #396 from haiwen/fix-api 
[web-api] Check if dir existes before copy file
 2015-03-05 15:43:56 +08:00
David Kreitschmann
75cf92aca6 Environment variable for shibboleth user name can be changed. The default is REMOTE_USER which is provided by e.g. apache modules. 2015-03-05 15:39:00 +08:00
zhengxie
146926920e Add shibboleth login option 2015-03-05 15:38:19 +08:00
lian
f63d6aab6e [web-api] Check if dir existes before copy file 2015-03-05 15:24:47 +08:00
xiez
2da5f59933 Merge pull request #395 from AStA-TU-Darmstadt/master 
Shibboleth variable should be configurable.
 2015-03-05 15:01:24 +08:00
zhengxie
f9c9f8be01 Add shibboleth login option 2015-03-05 14:57:28 +08:00
David Kreitschmann
0fddddf8d1 Environment variable for shibboleth user name can be changed. The default is REMOTE_USER which is provided by e.g. apache modules. 2015-03-05 00:09:06 +01:00
Shuai Lin
a9a2f8a6aa improve client last access time in devices page 
Take repos' last sync time into consideration.
 2015-03-03 20:56:19 +08:00