3637 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
llj	0f3d73e346	[file view] modified 'file view area' height	2015-04-15 14:37:53 +08:00
xiez	ff198e34ad	Merge pull request #494 from haiwen/contact ... [add-contact] add "try MultipleObjectsReturned" Exception	2015-04-15 11:45:39 +08:00
lian	39c44a3c28	[add-contact] add "try MultipleObjectsReturned" Exception	2015-04-15 11:31:34 +08:00
zhengxie	61bdac48a1	Fix dir deleted error when download dir and view shared dir link	2015-04-15 11:10:46 +08:00
zhengxie	cd8be43149	[api2] Improve account api	2015-04-15 10:44:51 +08:00
zhengxie	629687c865	[tests] Fix auth test	2015-04-14 11:22:32 +08:00
zhengxie	9e7fd3e4c0	[thumbnail] Fix create bug when image file is not supported	2015-04-14 11:12:43 +08:00
zhengxie	dcc091ab20	[api2] Fix auth bug	2015-04-14 11:04:39 +08:00
zhengxie	94dcfe338a	[api2] Return 401 if api token is invalid	2015-04-13 11:59:57 +08:00
zhengxie	16b77837b8	Merge branch 'poet'	2015-04-13 10:42:45 +08:00
poetwang	e4db7210cc	[api2] fix events file name	2015-04-11 17:04:00 +08:00
zhengxie	3cfce66f77	[email] Add timestamp to message	2015-04-11 11:34:37 +08:00
zhengxie	e9572112c7	Update notification email sending	2015-04-11 10:51:35 +08:00
zhengxie	14142cfec1	Merge branch '4.1'	2015-04-11 10:44:23 +08:00
xiez	f588a650d1	Merge pull request #476 from haiwen/thumbnail-http-cache ... [thumbnail] add http cache control	2015-04-11 10:28:46 +08:00
lian	9bdb92497c	[thumbnail] add http cache control	2015-04-11 10:16:28 +08:00
xiez	27762921dd	Merge pull request #449 from haiwen/dir-perm ... [repo] get perm when list repo dir/file list	2015-04-10 17:49:01 +08:00
zhengxie	49dba08413	[sysadmin] Handle rpc error gracefully on user_info page	2015-04-08 17:55:01 +08:00
Shuai Lin	d0ca22283a	small fix of shibboleth middware	2015-04-07 10:25:31 +08:00
lian	b6e9f2004f	[repo] get perm when list repo dir/file list	2015-04-03 14:05:31 +08:00
Shuai Lin	8f57cd1b24	Merge pull request #458 from haiwen/shibboleth ... use token v2 for shibboleth login	2015-04-02 20:55:22 +08:00
Shuai Lin	2b1e11d129	use token v2 for shibboleth login	2015-04-02 20:48:16 +08:00
Shuai Lin	22a1d52aca	fixed shibboleth middleware set cookie problem	2015-04-02 20:45:32 +08:00
zhengxie	e495ff60de	Update version	2015-04-02 16:27:51 +08:00
zhengxie	f580ffb5e2	Update requirements and readme	2015-04-02 16:07:43 +08:00
xiez	15b69883cb	Merge pull request #437 from neffs/master ... Redirect using "next" parameter when using shibboleth button	2015-04-02 15:40:02 +08:00
lian	1554c1cd6a	[file-audit] update file audit	2015-04-01 15:27:57 +08:00
zhengxie	d1251150aa	i18n for time tag	2015-03-31 17:34:28 +08:00
zhengxie	3fb1288f92	Merge branch '4.1' v4.1.0-pro v4.1.2-server	2015-03-31 15:51:49 +08:00
xiez	094a45870a	Merge pull request #446 from haiwen/thumbnail ... [thumbnail] add permission check by share token	2015-03-31 15:45:41 +08:00
llj	2a3feb0a48	Merge pull request #448 from haiwen/cur-path ... [repo] use escapejs instead of safe	2015-03-31 15:43:05 +08:00
lian	47a0b4cb6d	[thumbnail] add permission check by share token	2015-03-31 15:26:47 +08:00
lian	865194c311	[repo] use escapejs instead of safe	2015-03-31 14:56:58 +08:00
xiez	619bf710b5	Merge pull request #441 from onovy/master ... Show better error message when no revisions found.	2015-03-30 15:38:13 +08:00
zhengxie	e174faaa63	Merge branch 'proventa-master'	2015-03-30 15:30:42 +08:00
zhengxie	5746ef9465	Refactor code	2015-03-30 15:29:29 +08:00
zhengxie	5770625b16	Merge branch 'master' of https://github.com/proventa/seahub into proventa-master	2015-03-30 15:10:07 +08:00
zhengxie	81c2704e8e	Merge branch 'allo--master'	2015-03-30 10:47:48 +08:00
zhengxie	29baf8c504	Merge branch 'master' of https://github.com/allo-/seahub into allo--master ... Conflicts: seahub/settings.py	2015-03-30 10:47:33 +08:00
xiez	8f74939bd0	Merge pull request #438 from haiwen/thumbnail-fix ... [thumbnail] convert image mode before generate thumbnail	2015-03-30 10:42:30 +08:00
xiez	ad1158ec93	Merge pull request #442 from miurahr/japanese ... Add Japanese translation	2015-03-30 10:38:24 +08:00
Hiroshi Miura	eac3cb7eb6	Add Japanese translation ... *Add translations *Merge with transifex partial progress Signed-off-by: Hiroshi Miura <miurahr@linux.com>	2015-03-29 21:39:18 +09:00
onovy	e870c2f52a	Show better error message when no revisions found.	2015-03-29 11:58:32 +02:00
Daniel Pan	4e8808c2ff	Merge pull request #440 from onovy/master ... Happy new year.	2015-03-28 09:01:13 +08:00
Novy Ondrej	e507e70aba	Happy new year.	2015-03-27 22:15:56 +01:00
root	f34ea10b66	implement the <time> html5 tag for all times.	2015-03-26 12:31:28 +01:00
lian	5908fc6362	[thumbnail] ... 1.convert image mode before generate thumbnail 2.check if file existes before generate thumbnail	2015-03-26 16:23:37 +08:00
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