6588 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
llj	a8985984c5	[icon] new folder icons	2017-11-01 14:35:19 +08:00
zhengxie	bdde049a4e	Fix shibboleth login redirect issue, see https://forum.seafile.com/t/shared-links-via-shibboleth/4067/11	2017-10-31 13:32:54 +08:00
Daniel Pan	f44da1afdd	Merge pull request #1882 from haiwen/update-file ... use use_onetime=False when get update link	2017-10-31 13:28:01 +08:00
lian	61c4903624	use use_onetime=False when get update link	2017-10-31 13:24:23 +08:00
zhengxie	60667e54a9	Merge branch 'moschlar-patch-2'	2017-10-30 15:32:15 +08:00
zhengxie	607560d93d	[invitation] Remove unused import	2017-10-30 15:32:03 +08:00
zhengxie	53f7ba8004	Merge branch 'patch-2' of https://github.com/moschlar/seahub into moschlar-patch-2	2017-10-30 15:30:41 +08:00
zhengxie	4275447d09	[locale] Add two factor source strings	2017-10-30 15:04:11 +08:00
Daniel Pan	ad8aa9ebea	Merge pull request #1881 from haiwen/oos-language ... update get user current language code for wopi	2017-10-30 11:56:33 +08:00
lian	c056ebdd0d	update get user current language code for wopi	2017-10-30 11:52:07 +08:00
Daniel Pan	aa580c7008	Merge pull request #1880 from haiwen/timestamp ... update timeutil: global variable	2017-10-28 16:18:20 +08:00
lian	5f33ebafeb	update timeutil: global variable	2017-10-28 16:15:48 +08:00
zming	c1d7b588e3	update notification	2017-10-26 10:04:16 +08:00
Daniel Pan	350bb28168	Merge pull request #1868 from haiwen/shib_logout ... [shib] Add local logout for shibboleth	2017-10-25 17:11:32 +08:00
lian	6590262cb2	Merge pull request #1869 from haiwen/admin-library ... add admin api for get info of a single repo	2017-10-24 17:58:37 +08:00
xiez	a3d848284b	Merge pull request #1872 from haiwen/notification-fix ... update notification	2017-10-24 17:57:35 +08:00
zming	2ea7a4ae49	update notification	2017-10-24 17:50:29 +08:00
lian	36cdff75aa	add admin api for get info of a single repo	2017-10-21 04:33:48 -07:00
zhengxie	484e1a8a75	[shib] Add local logout for shibboleth	2017-10-20 11:34:51 +08:00
zMingGit	58ca1084ac	comment paging (#1867) ... * comment paging * test	2017-10-19 15:24:59 +08:00
xiez	b52d7131a0	Merge pull request #1864 from haiwen/org-repo-owner ... update get repo owner in org mode	2017-10-16 13:10:44 +08:00
lian	37e73b7fa8	update get repo owner in org mode	2017-10-14 19:08:02 +08:00
zhengxie	742e0d5c88	Update test requirements	2017-10-14 18:08:26 +08:00
zhengxie	51ed98a869	Update debug context processor	2017-10-14 17:23:49 +08:00
zhengxie	12e0617b58	Update requirements.txt	2017-10-14 17:02:12 +08:00
zhengxie	49f8917046	[base] Extend django.debug context processor	2017-10-14 16:47:13 +08:00
Daniel Pan	c0d533e250	Merge pull request #1862 from haiwen/search-repo-owner ... add `repo_owner` field to search result	2017-10-13 22:47:59 -05:00
lian	bbc510f983	add repo_owner field to search result	2017-10-14 11:34:40 +08:00
zhengxie	846b2389af	Remove unused function	2017-10-13 18:56:46 +08:00
zhengxie	8f3c442b67	Fix i18n.sh	2017-10-13 18:09:16 +08:00
llj	6897144599	Merge pull request #1861 from haiwen/file-comment-fix ... [dir view] file comment: fix	2017-10-13 18:03:41 +08:00
llj	946002b5c6	[dir view] file comment: fix	2017-10-13 18:00:37 +08:00
llj	8446155d7d	Merge pull request #1859 from haiwen/repo-folder-perm-fix ... [my libs] repo 'folder perm': fix	2017-10-13 16:21:24 +08:00
llj	b772a62b1a	[my libs] repo 'folder perm': fix	2017-10-13 16:08:43 +08:00
llj	c7672990a1	Merge pull request #1858 from haiwen/repo-share-links-fix ... [my libs] repo 'share links': fixed 'icon url'	2017-10-13 14:56:32 +08:00
llj	101872d5c4	[my libs] repo 'share links': fixed 'icon url'	2017-10-13 14:53:26 +08:00
zming	c09c3d0c6b	fixed test	2017-10-13 13:10:05 +08:00
zhengxie	bb9d963de5	Merge branch '6.1' into 6.2	2017-10-13 10:20:48 +08:00
xiez	7ce63d9ea8	Merge pull request #1857 from haiwen/sudo_mode ... [adfs] Fix sudo mode	2017-10-13 10:17:59 +08:00
xiez	378bd39b5c	Merge pull request #1856 from haiwen/activate_user ... Activate inactive user on first login	2017-10-12 15:44:08 +08:00
zhengxie	a0cded89ee	Activate inactive user on first login	2017-10-12 14:04:48 +08:00
zhengxie	a9a6069979	[adfs] Fix sudo mode	2017-10-12 10:38:35 +08:00
zhengxie	46c4b490b6	[share] Add setting for share link audit code timeout	2017-10-11 10:09:03 +08:00
llj	674a150fc8	Merge pull request #1853 from haiwen/device-fix ... [devices] fix	2017-10-10 16:20:49 +08:00
llj	6ac3f5ae6e	[devices] fix	2017-10-10 16:16:37 +08:00
xiez	1c535be24b	Merge pull request #1852 from haiwen/file-tag-fixed ... is_dir always is true	2017-10-10 10:23:35 +08:00
zming	6693986c1b	is_dir always is true	2017-10-10 10:17:33 +08:00
Moritz Schlarb	50b6ea05b8	seahub.invitations: Give more context to template ... So that e.g. the accepter can be addressed more directly or different template texts can be used depending on the accepter's domain.	2017-10-06 10:27:37 +02:00
zhengxie	a4ca943487	[avatar] Update migration doc, handle error	2017-09-30 15:56:18 +08:00
zhengxie	49dfb05ffc	[avatar] Add migrate cmd	2017-09-30 15:45:00 +08:00