5247 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
lian	0c488a2b1b	fix bug when rm shared link at repo setting page	2015-08-03 10:09:34 +08:00
llj	7c63986514	Merge pull request #735 from haiwen/activity ... rewrote 'activity' with backbonejs	2015-07-30 14:24:35 +08:00
zhengxie	096e8fbaa6	Use spaces instead of tabs in urls.py	2015-07-30 11:14:55 +08:00
xiez	2006fe63ac	Update settings.py	2015-07-30 11:08:08 +08:00
llj	ba4f3e7eff	[activity] bugfix & improvement	2015-07-29 20:18:28 +08:00
Daniel Pan	149cb291e8	Merge pull request #752 from haiwen/thumbnail-size ... update thumbnail	2015-07-29 13:14:00 +08:00
lian	81bacf937b	use file server access token just for one time	2015-07-29 13:07:23 +08:00
xiez	1ce73eb77a	Merge pull request #750 from haiwen/file-lock ... update file lock api	2015-07-29 10:17:53 +08:00
lian	fbd2980a7c	check type of "size" before generate thumbnail	2015-07-28 19:59:42 +08:00
lian	d889f3bafe	update activity page	2015-07-28 19:55:05 +08:00
lian	dfc7f1856f	new activity page	2015-07-28 19:55:05 +08:00
lian	f85ac8c9cd	update file lock api	2015-07-28 17:02:59 +08:00
llj	fa177dd150	[file lock] modified for firefox	2015-07-28 15:49:13 +08:00
llj	66c9bdd45c	Merge pull request #747 from haiwen/new-download-link ... new btn link	2015-07-28 13:56:27 +08:00
patrickgao	1c6fc34a84	new download link	2015-07-28 12:22:52 +08:00
Daniel Pan	7d612184e6	Merge pull request #749 from haiwen/header ... modified 'header' for some pages	2015-07-27 20:24:17 +08:00
llj	ebaf29409c	modified 'header' for some pages ... - do not show 'nav' for these pages - show 'lang' for non-logged-in users	2015-07-27 19:45:48 +08:00
zhengxie	7da7b0174b	Remove unused code	2015-07-27 17:46:23 +08:00
xiez	6f0763ac31	Merge pull request #745 from haiwen/sys-group-amdin ... update repo icon of admin group info page	2015-07-27 14:39:41 +08:00
llj	c2f9173834	Merge pull request #744 from haiwen/useradmin ... update sysadmin user info page	2015-07-27 12:11:56 +08:00
llj	9281fd3dd7	Merge pull request #743 from haiwen/update-thumbnail ... update thumbnail default size	2015-07-27 10:09:14 +08:00
lian	8411ad81f7	update repo icon of admin group info page	2015-07-25 19:08:43 +08:00
lian	b329fa7bc4	update sysadmin user info page ... remove desc & add size and last update & update repo icon	2015-07-25 18:26:05 +08:00
lian	6867b1823d	update thumbnail default size	2015-07-25 16:30:38 +08:00
llj	d3f89e3e78	Merge pull request #740 from haiwen/open-via-client ... update path encode when open via client	2015-07-25 11:45:02 +08:00
lian	8a62c182b0	update path encode when open via client	2015-07-25 11:06:58 +08:00
xiez	62aae06887	Merge pull request #739 from haiwen/account-del ... Update account delete	2015-07-25 11:00:11 +08:00
xiez	5a8fefe46e	Merge pull request #736 from haiwen/starred-file-api ... [web-api] fix bug when get starred files	2015-07-24 13:45:02 +08:00
llj	5bca88d6e6	Merge pull request #737 from haiwen/update-file ... update file lock check when update file	2015-07-24 13:35:51 +08:00
lian	68b40743c7	update file lock check when update file	2015-07-24 12:16:57 +08:00
lian	6bfe3d91dd	[web-api] fix bug when get starred files	2015-07-24 12:15:34 +08:00
llj	525246be74	[dir view] modified css for dirent 'hidden op' popup	2015-07-23 16:44:35 +08:00
lian	aa32fcfc48	Revert "remove open via client" ... This reverts commit 143eebddf6.	2015-07-23 16:44:35 +08:00
llj	cb66206af0	Merge pull request #731 from haiwen/group-join ... update group related page	2015-07-23 15:13:02 +08:00
llj	d47686ac56	clean up CSS	2015-07-23 14:34:24 +08:00
zhengxie	cadc6cb370	Update account delete	2015-07-23 13:48:58 +08:00
zhengxie	b75913c9a8	Merge branch 'improve-office-preview-security' ... Conflicts: seahub/views/file.py	2015-07-23 13:33:41 +08:00
zhengxie	3bda97e5b0	[i18n] Update po files	2015-07-23 13:26:33 +08:00
zhengxie	94ac058cf0	[i18n] Update source file	2015-07-23 12:12:50 +08:00
xiez	8aac236bff	Merge pull request #733 from haiwen/word-spell ... correct word spell	2015-07-23 12:09:52 +08:00
lian	b53b624e31	correct word spell	2015-07-23 12:08:49 +08:00
zhengxie	c0b6e57471	[tests] Ignore 3 random test errors	2015-07-23 11:59:28 +08:00
xiez	94a0da30e0	Merge pull request #727 from haiwen/share-link ... [share-links] show expiration when list shared links	2015-07-23 11:22:10 +08:00
xiez	efdc910cea	Merge pull request #725 from haiwen/perm-audit ... update send perm audit msg function	2015-07-23 11:19:28 +08:00
lian	9cf2a13669	[share-links] show expiration when list shared links	2015-07-23 10:58:36 +08:00
xiez	87b279b1f2	Merge pull request #732 from haiwen/op-copy ... Op copy	2015-07-23 10:41:41 +08:00
xiez	024a1deceb	Merge pull request #706 from haiwen/file-lock ... file lock	2015-07-23 10:40:40 +08:00
xiez	1a2245ab4f	Merge pull request #730 from haiwen/password-session ... Password session	2015-07-23 10:39:29 +08:00
llj	83c0374cd8	[starred files] bugfix	2015-07-22 21:01:10 +08:00
lian	e00dbcef45	add test of copy file in sub dir to dst dir	2015-07-22 17:13:55 +08:00