31 Commits

Author	SHA1	Message	Date
llj	1182a80989	Merge branch '6.2'	2018-03-15 11:26:02 +08:00
llj	6d4000fc20	[fileupload] show error message when failed to get upload url	2018-03-02 16:11:27 +08:00
llj	88478dee1d	[upgrade jquery] modifications, & cleaned up code & files	2018-02-05 16:47:56 +08:00
zhengxie	d37144ef75	Merge branch '6.2' ... Conflicts: seahub/templates/base.html static/scripts/app/views/dir.js static/scripts/common.js	2017-12-28 15:47:18 +08:00
llj	a3600ff488	[fileupload] improvement: always full show the popup when upload files; close the popup when navigate away from a 'dir view' page	2017-12-14 17:23:01 +08:00
llj	07dea7eca4	new design	2017-12-05 17:53:45 +08:00
llj	c66a0bf6a7	[fileupload] fixed error msg	2017-09-25 15:29:27 +08:00
lian	46a5473326	add amdin system library upload api	2017-07-03 14:42:12 +08:00
lian	48c370c8bc	update argument when get file upload/upload link via web api	2017-05-06 17:04:40 +08:00
zhengxie	1b11350f80	Merge branch '6.0' ... Conflicts: seahub/templates/sysadmin/sysadmin_backbone.html seahub/urls.py seahub/views/sysadmin.py static/scripts/app/views/dir.js	2017-03-27 13:53:35 +08:00
llj	e65a95c707	[fileupload] update-confirm-popup: fix	2017-02-22 16:44:14 +08:00
lian	7a8eb038e2	update get file uploaded bytes	2017-01-19 14:40:49 +08:00
lian	06bc49d17b	rm ajax get file op url	2017-01-19 14:40:49 +08:00
zhengxie	d4e00402af	Merge branch '6.0' ... Conflicts: media/css/seahub.css	2016-12-26 14:22:35 +08:00
llj	3534b5836e	[fileupload] fix for Firefox 50	2016-11-25 16:59:21 +08:00
Daniel Pan	625573a669	Merge pull request #1361 from haiwen/fileupload ... Fileupload	2016-11-18 11:29:52 +08:00
llj	7ecf62d970	[fileupload] upgrade fileupload plugin to the latest version	2016-09-19 20:41:54 +08:00
llj	fb6430b027	[fileupload] modified 'maxNumberOfFiles'	2016-09-14 17:35:42 +08:00
llj	d5bc279ffc	UI fix	2016-05-09 14:34:09 +08:00
llj	6e98536793	[fileupload] fix	2016-04-21 15:43:13 +08:00
llj	0a725c7e8f	[fileupload] move 'setFileInput' into dir.js	2016-04-18 15:02:22 +08:00
llj	32375abcb6	[fileupload] use dropdown	2016-04-18 11:57:55 +08:00
Daniel Pan	463b48c788	Make open-via-client in community edition and clean code for file/dir icons	2016-02-29 15:29:29 +08:00
llj	2f2e1b7524	[fileupload] enable resumable fileupload for 'dir view' & 'upload link' ... 'resumable' is only enabled for 'upload files', not for 'add folder' & 'file update'	2015-08-07 15:03:59 +08:00
lian	68b40743c7	update file lock check when update file	2015-07-24 12:16:57 +08:00
lian	2d34cb611a	check file lock before update a file	2015-07-20 17:36:12 +08:00
llj	d3097a6acf	[fileupload] UI fix for 'file replace confirm popup'	2015-07-17 15:48:00 +08:00
llj	f354630506	[dir view] bugfix for 'new file/dir', fileupload, dirent js & template	2015-05-27 14:16:07 +08:00
llj	ea355f0327	[dir view] bugfix for '#upload-menu' ui	2015-05-05 17:29:31 +08:00
llj	8d45b64511	[dir view] use magnificPopup for img view	2015-04-22 15:31:47 +08:00
zhengxie	f022b4902e	Move scripts from media to static folder	2015-04-22 15:31:46 +08:00