144 Commits

Author	SHA1	Message	Date
zhengxie	cc5af51dec	Merge branch '5.0' ... Conflicts: seahub/templates/base_for_backbone.html seahub/templates/libraries.html seahub/templates/myhome_base.html	2016-02-02 12:19:46 +08:00
llj	243e28abbf	[fileupload] show error msg instead of 'errorThrown'	2016-01-27 16:41:05 +08:00
Daniel Pan	35bec4b59f	Merge pull request #995 from haiwen/group_fix ... show group name in path for 'group dir view'; fix updateGroups in sid…	2016-01-13 16:24:22 +08:00
llj	13ea3fcb6a	show group name in path for 'group dir view'; fix updateGroups in side-nav.js	2016-01-13 14:54:46 +08:00
llj	f7e8dcef72	[dir view] enable multi dirents in read-only, non-encrypted libs to be copied into other libs	2015-12-18 11:30:24 +08:00
llj	5d2600c8c0	[backbone] added 'Search files in this library'	2015-11-03 11:06:24 +08:00
zhengxie	8fd9bebf45	Merge branch '4.4' ... Conflicts: seahub/auth/views.py seahub/templates/libraries.html seahub/templates/sysadmin/sys_admin_group_info.html seahub/templates/sysadmin/sys_publink_admin.html seahub/templates/sysadmin/userinfo.html seahub/urls.py	2015-10-20 10:27:27 +08:00
llj	8dff8a8b2d	modified js for IE	2015-10-08 18:43:39 +08:00
llj	805b73ea3b	[rename] bugfix for 'cancelRename', improved 'click doc to hide form'	2015-09-18 10:18:37 +08:00
llj	3ba435b1d6	Improved 'hide .hidden-op'	2015-09-18 10:18:36 +08:00
llj	d76b0d7065	[rename] click outside the form to hide the form	2015-09-18 10:18:36 +08:00
llj	75b0b4f39f	Merge pull request #808 from haiwen/thumbnail-fix ... bugfix for 'get image thumbnail'	2015-09-14 14:41:11 +08:00
llj	5aac9f5889	bugfix for 'get image thumbnail'	2015-09-14 14:34:33 +08:00
llj	eda7a6ef1c	[i18n] add translation for some text	2015-08-22 15:26:13 +08:00
lian	14c264f22a	update & return encoded thumbnail src to web	2015-07-16 13:09:52 +08:00
llj	7e325c815a	Merge pull request #720 from haiwen/sort ... Sort	2015-07-14 14:49:07 +08:00
llj	285f1a6e04	[dir view] bugfix for 'sort by time'	2015-07-14 14:22:12 +08:00
llj	1a406f9b26	[lib/dir/file sort] bugfix for new interaction	2015-07-11 14:51:26 +08:00
patrickgao	f9282585b8	file sorting alternation	2015-07-09 17:16:10 +08:00
llj	63a975bf3d	[dir.js] modified for IE8	2015-07-02 17:38:36 +08:00
lian	d7cac0d24c	[guest-user] add permission for guest user ... disable generate shared link when user's role is GUEST	2015-06-24 15:08:37 +08:00
llj	8d2054dafd	[js] bugfix for object	2015-06-10 13:43:41 +08:00
llj	46334b8118	[sub lib] bugfix for 'create' & 'dir op bar'	2015-05-27 17:09:29 +08:00
llj	f354630506	[dir view] bugfix for 'new file/dir', fileupload, dirent js & template	2015-05-27 14:16:07 +08:00
lian	0528bfe85c	[del-dirents] update perm check	2015-05-15 17:19:08 +08:00
xiez	9ea129e9d2	Merge pull request #578 from haiwen/showDir_fix ... bugfix for 'showDir'	2015-05-11 15:44:55 +08:00
xiez	58023821b8	Merge pull request #577 from haiwen/select_fix ... [dir view] bugfix for 'select'	2015-05-11 15:34:11 +08:00
llj	705e17384f	[dir view] bugfix for 'sort'	2015-05-11 15:03:10 +08:00
llj	65c2abf8cb	bugfix for 'showDir'	2015-05-11 14:25:06 +08:00
llj	727644bd39	[dir view] bugfix for 'select'	2015-05-11 14:10:10 +08:00
llj	557ba9490b	[lib decrypt] improved popup 'onClose'	2015-05-08 14:45:04 +08:00
llj	2ff000a42b	[dir view] fix 'op bar' when scroll	2015-05-06 11:59:44 +08:00
lian	ca8a449d5a	enable sort repo/dirent by Chinese word	2015-04-30 11:59:09 +08:00
lian	79efd306a9	new repo/dir/group url	2015-04-25 15:39:06 +08:00
llj	9f60afcf22	modified 'top-group-nav' & 'get contacts', cleaned up code & removed unused files	2015-04-22 15:31:53 +08:00
llj	7d861af84b	fix dir.js & improve group-side-nav.js	2015-04-22 15:31:50 +08:00
Daniel Pan	fd3a150717	Finish URL design	2015-04-22 15:31:49 +08:00
llj	608f30e354	[dir view] remove small preview for images files	2015-04-22 15:31:49 +08:00
llj	fb197d6532	[dir view] modified 'get image thumbnail'	2015-04-22 15:31:48 +08:00
llj	8d45b64511	[dir view] use magnificPopup for img view	2015-04-22 15:31:47 +08:00
Daniel Pan	9d6dfdabeb	encode path for using in URI	2015-04-22 15:31:47 +08:00
llj	d612ec360c	modified lib op icons & dir op bar	2015-04-22 15:31:46 +08:00
lian	2a90af3675	update js/template	2015-04-22 15:31:46 +08:00
zhengxie	f022b4902e	Move scripts from media to static folder	2015-04-22 15:31:46 +08:00