haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 16:36:15 +00:00
Code Issues Releases Wiki Activity
3,518 Commits 148 Branches 461 Tags
cfc7ad8934b73123c9c0e2099dab299be260eecc
Commit Graph

3518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Pan
77cc8288b6 Merge pull request #388 from haiwen/4.0-fileupload 
bugfix for fileupload
 2015-03-02 16:51:27 +08:00
llj
317362468a bugfix for fileupload 2015-03-02 16:46:44 +08:00
Daniel Pan
6deb507f26 Merge pull request #386 from haiwen/4.0-thumbnail-bug 
[image-preivew] abort ajax request if mouse leave preview wrap
 2015-03-02 16:19:24 +08:00
lian
52d23ed46e [image-preivew] abort ajax request if mouse leave preview wrap 2015-03-02 15:12:10 +08:00
Daniel Pan
bc9980f86b Merge pull request #385 from haiwen/4.0-thumbnail-api 
[web-api] Use p and size as args
 2015-03-02 15:07:23 +08:00
lian
cbb0d34ca1 [web-api] Use p and size as args 2015-03-02 14:10:44 +08:00
zhengxie
b6f8935c0f Merge branch '4.0' 2015-02-28 15:05:11 +08:00
zhengxie
921c6cebcf [i18n] Update .po files v4.0.5-pro 2015-02-13 10:40:21 +08:00
zhengxie
413761f66d [i18n] Update source file 2015-02-12 18:45:23 +08:00
lian
404449a844 remove test code of view_shared_dir.html 2015-02-12 17:45:58 +08:00
lian
442b9f3b11 [shared-download-link] Show image thumbnail 2015-02-12 11:08:11 +08:00
lian
cbffdc7fb6 [thumbnail] Improve thumbnail 
Correct thumbnail src url & change thumbnail root dir to 'seahub-data'
 2015-02-12 11:04:41 +08:00
zhengxie
29ac3681fa Merge branch '4.0' 
Conflicts:
	seahub/utils/repo.py
	seahub/views/file.py
 2015-02-10 12:10:50 +08:00
zhengxie
739b32b02c [i18n] Update source file v4.0.4-pro v4.0.6-server 2015-02-04 11:41:18 +08:00
zhengxie
2d0d5c1393 [i18n] Update 2015-02-04 11:34:57 +08:00
lian
a4877f3886 [web-api] add thumbnail api 2015-02-03 17:59:39 +08:00
lian
970ca426a7 Merge pull request #349 from haiwen/translate 
update translate
 2015-02-03 17:52:23 +08:00
zhengxie
2090c13e94 Fix file last update time in sub repo 2015-02-03 17:18:28 +08:00
zhengxie
9f409f7b17 [sysadmin] Fix rpc not found error when transfer repo 2015-02-03 16:39:38 +08:00
xiez
f8e566c7ab Merge pull request #358 from haiwen/fix-office-preview-in-shared-link 
fixed preview office files in share links and priv shares
 2015-02-02 16:32:38 +08:00
lins05
2ffaf786a0 fixed preview office files in share links and priv shares 2015-01-29 11:09:49 +08:00
zhengxie
109ed579fa Enable user provide name in register 2015-01-23 15:44:10 +08:00