4078 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
lian	fec5a9bbe6	update group related page ... redirect to permission denied error page if user visit an unaccessable group	2015-07-22 16:49:51 +08:00
lian	02cf85a333	get "p" arg from GET request	2015-07-22 16:29:21 +08:00
lian	872a9ca696	update password_session app	2015-07-22 15:07:41 +08:00
lian	f1b352e9ac	add password_session app	2015-07-22 15:03:33 +08:00
llj	ebf1d7f8d0	[myhome side nav] bugfix for 'cur tab'	2015-07-22 11:59:50 +08:00
Shuai Lin	196787670e	handle office preview from shared dirs	2015-07-21 11:34:34 +08:00
llj	f9e28022fd	[shared file view] remove logo	2015-07-21 11:24:41 +08:00
lian	2d34cb611a	check file lock before update a file	2015-07-20 17:36:12 +08:00
llj	65c540a29d	[lib/dir/file share] rewrote 'random password'	2015-07-20 16:36:07 +08:00
lian	3ec770e7d8	update file lock error check	2015-07-20 13:53:07 +08:00
llj	2aa15a7d19	[file lock] show name instead of email	2015-07-20 13:50:42 +08:00
llj	97ebba6f2b	[file lock] 'dir view' & 'file view': improvement & bugfix	2015-07-20 13:50:42 +08:00
lian	113e5e9f5c	update	2015-07-20 13:50:42 +08:00
lian	2c2bf4f98f	file lock	2015-07-20 13:50:42 +08:00
patrickgao	7f5a1f012d	generate a random password	2015-07-20 11:15:07 +08:00
llj	d3097a6acf	[fileupload] UI fix for 'file replace confirm popup'	2015-07-17 15:48:00 +08:00
Shuai Lin	5dee3d44dc	handle office convert perm check in cluster mode	2015-07-17 12:20:02 +08:00
zhengxie	c27de9265a	[i18n] Update locales and version	2015-07-17 11:17:05 +08:00
xiez	066314a205	Merge pull request #723 from haiwen/thumbnail ... update thumbnail	2015-07-17 11:07:32 +08:00