Commit Graph

175 Commits

Author SHA1 Message Date
Robin Appelman b6ce73cf14
Allow selecting a folder after using the breadcrumb
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-19 14:18:21 +02:00
Robin Appelman f002a2d2f6
Allow selecting the root folder
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-19 14:18:19 +02:00
Robin Appelman 6d43942125
filepicker styling
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-14 17:36:08 +02:00
Robin Appelman 8d093e976a
use mimetype icons in filepicker if there is no preview
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-14 17:32:23 +02:00
Sujith Haridasan c15ba6ccf8
Choose button remains disbaled for httpd/unix-directory
This is not correct. Hence in this patch we validate
if the mimetype is 'httpd/unix-directory'. If so we
don't disable it.

This patch addresses solution for issue: 26034

Signed-off-by: Sujith Haridasan <Sujith_Haridasan@mentor.com>
2016-09-12 16:46:15 +02:00
Sujith Haridasan 14c81f8a3a
Choose button remains disabled unless files are chosen
from filepicker

This is will help user to understand that you can only
click choose button once the files are selected from the
file picker. This addresses the solution for issue 16106

Signed-off-by: Sujith Haridasan <Sujith_Haridasan@mentor.com>
2016-08-29 14:25:26 +02:00
Roeland Jago Douma 9be43e10af Since the server no longer calculates the icon
The server no longer calculates the icon. So we have the js side do it
for us.
2015-12-24 08:59:32 +01:00
Vincent Petry fa2be0750c Make files app use Webdav for most operations 2015-11-22 16:05:50 +01:00
Christoph Wurst 9778094a25 fix filepicker loading spinner 2015-10-19 23:43:12 +02:00
Morris Jobke 3c005bc020 Check .conflicts for checkboxes 2015-10-08 17:13:28 +02:00
Vincent Petry cba1aae073 Disable "Continue" button in conflict dialog when no selection 2015-10-08 12:27:33 +02:00
Vincent Petry 5dff9d88cb Make sure the conflict dialog is loaded before adding conflicts 2015-10-02 09:55:43 +02:00
Olivier Paroz a1c419dc71 Use Hermite resampling for comparator canvas previews 2015-09-29 16:35:24 +02:00
Thomas Müller 846b826867 Merge pull request #18517 from owncloud/17753_to_master
Fix preview of old file on public upload conflicts
2015-09-24 15:20:00 +02:00
Hendrik Leppelsack 964cfc8e08 fix missing checkboxes in file comparator 2015-09-21 12:57:34 +02:00
Olivier Paroz 04b14df35c Fix preview of old file on public upload conflicts 2015-09-20 12:38:21 +02:00
Roeland Jago Douma 5c381ea532 Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl 2015-07-09 13:40:13 +02:00
Olivier Paroz f05ac47eb6 Escape single quotes 2015-05-29 18:34:38 +02:00
Olivier Paroz 6aeaa6954b Fix for parenthesis 2015-05-29 17:49:26 +02:00
Olivier Paroz 4e364311f1 Get a 96x96 preview for file conflict resolution 2015-05-29 13:49:51 +02:00
Morris Jobke de04501c97 add max-width of 600px to filepicker 2015-05-06 11:15:48 +02:00
Morris Jobke 59efcb63a3 fix filepicker
* add ability to filter for mimetype
* fixes #15526
* fixes #11563
2015-04-13 10:38:08 +02:00
Lukas Reschke 397264f361 Add more spacing to the file picker dialog
Without this the first `>` looked somewhat off, to test this change go to the personal settings and choose a profile picture in a subfolder.
2015-03-28 14:19:27 +01:00
Jörn Friedrich Dreyer c615b3527f show readonly message in file conflict dialog, make it always selected 2014-12-11 16:32:27 +01:00
Vincent Petry 0f3e6cb50a Improved Javascript docs for JSDoc
Added namespaces so that JSDoc can find them.
Fixed a few warnings.
Improved some comments.
2014-10-31 13:43:30 +01:00
Clark Tomlinson 92685acf60 Implementing moment.js
Updating Usages

Removing unused method

Adding JS Doc
2014-08-28 09:28:45 -04:00
Tom Needham 93ba64a69f Use human readable relative date for oc-dialog-filepickers 2014-08-07 13:40:52 +01:00
Jan-Christoph Borchardt 79305a0476 also fix filepicker for smaller screen sizes 2014-07-31 17:35:32 +02:00
Vincent Petry 71fe5d672e Fixed dialogs styling, reversed buttons
Default dialog button is now on the right, other one on the left.
2014-07-07 15:56:42 +02:00
Vincent Petry 763d9ded1d Prevent showing the file picker twice
In case the filepicker function is called twice, only show it once.
2014-06-20 13:39:46 +02:00
kondou 9bc3f3cf30 Scrutinizer cleanup 2014-06-02 21:09:41 +02:00
Remco Brenninkmeijer 4f0370f1da Fix for #8654 2014-05-22 10:35:01 +02:00
Lukas Reschke 62364269c5 Fix Typo, define $ as global 2014-05-11 10:55:00 +02:00
Robin Appelman 163a7a47f9 Add prompt dialog to OC.dialogs 2014-05-09 17:09:06 +02:00
Thomas Müller 1fdd17b9b1 javascript code cleanup + fixing syntax errors 2014-04-14 19:29:00 +02:00
Morris Jobke d8f56e3c00 Merge pull request #8049 from owncloud/filepickersvg
Fix file picker SVG issues
2014-04-09 15:05:40 +02:00
Jörn Friedrich Dreyer 779dff31c4 translations for oc-dialogs reside in code 2014-04-07 11:58:32 +02:00
Jörn Friedrich Dreyer c90b0ac00b Fix copy conflict dialog translation 2014-04-07 11:46:47 +02:00
Vincent Petry d4f9cc567a Fix SVG close button of file picker 2014-04-04 11:52:15 +02:00
Vincent Petry 05a7bfed71 Fix file picker to correctly show SVG file icons 2014-04-04 11:44:11 +02:00
Vincent Petry 2b8bb01211 Fixed mime type attribute access in file overwrite dialog 2014-04-03 16:55:01 +02:00
Vincent Petry 0be9de5df5 Files, trashbin, public apps use ajax/JSON for the file list
Files app:

- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
  arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
  full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
  Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only

Breadcrumbs are now JS only:

- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class

Public page now uses ajax to load the file list:

- Added Helper class in sharing app to make it easier to authenticate
  and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list

Core:

- Fixed file picker dialog to use the same list format as files app
2014-04-02 15:33:47 +02:00
Jörn Friedrich Dreyer d9e333c0da use directory from original instead of current dir 2014-02-21 14:01:38 +01:00
Vincent Petry e62ca4ea4f Append file etag to preview URLs
Fixes #5534
2013-10-28 14:14:55 +01:00
Vincent Petry e2a4417079 Fixed conflict dialog in IE8
- Fixed JS error that prevent the conflict dialog to open #5060
- Fixed JS error that prevented the overwrite case to run
2013-10-10 15:54:00 +02:00
Jörn Friedrich Dreyer 5a174eba83 use correct property for mimetype of existing files 2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer 078bf0df25 use {count} instead of 'One' for more versatile translation 2013-09-19 12:05:30 +02:00
Jörn Friedrich Dreyer a6933efce3 use n to translate title 2013-09-19 11:25:41 +02:00
Jörn Friedrich Dreyer 0d81a53e12 use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there 2013-09-19 10:00:42 +02:00
Jörn Friedrich Dreyer f7800cd63e fix 'event is not defined' error 2013-09-19 09:47:51 +02:00
Jörn Friedrich Dreyer 72d53008cc indentation 2013-09-18 17:58:15 +02:00
Jörn Friedrich Dreyer 7bd5e89f8c simplify conflict template handling, fix reopen after ESC 2013-09-18 17:22:29 +02:00
Jörn Friedrich Dreyer b59ce403d8 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/css/files.css
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files_sharing/js/public.js
	core/js/jquery.ocdialog.js
	core/js/oc-dialogs.js
2013-09-17 19:10:46 +02:00
Thomas Müller db7e1dd877 Merge pull request #4853 from owncloud/external-shared_mimetype-icons
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-15 02:42:14 -07:00
Thomas Tanghus dcc899d0a0 Merge pull request #4806 from owncloud/oc-dialogs-pageleave
Don't popup meaningless alerts when dialog called on page leave
2013-09-14 10:35:39 -07:00
kondou c117e719da Use external and shared icons in OC.Dialogs.filepicker() 2013-09-14 14:35:23 +02:00
Thomas Tanghus 08225a60c8 Save two lines 2013-09-11 21:15:32 +02:00
Thomas Tanghus 1f8f0e61d8 Remove test error :P 2013-09-11 21:11:35 +02:00
Thomas Tanghus 799c5c2c9b Don't popup meaningless alerts when dialog called on page leave 2013-09-11 16:02:12 +02:00
Jörn Friedrich Dreyer bd1d5b69fb fix ESC for conflicts dialog 2013-09-08 17:31:12 +02:00
Jörn Friedrich Dreyer 0a0410815e close and destroy dialog on ESC 2013-09-08 10:11:35 +02:00
Robin Appelman 00cc83e3f7 show preview for uploading image files on conflict 2013-09-07 14:58:51 +02:00
Jörn Friedrich Dreyer ce03501646 fine ie8 compatability 2013-09-06 23:44:40 +02:00
Jörn Friedrich Dreyer 673e0c01a7 fix page leaving checks 2013-09-06 22:40:10 +02:00
Jörn Friedrich Dreyer 02d14aee17 completely remove dialog on cancel/continue 2013-09-06 16:50:45 +02:00
kondou c6ca9c1e9d Use shorter array-conversion 2013-09-06 13:33:17 +02:00
kondou f84fe479a5 Only use mimetype_list and clean up a bit 2013-09-05 18:40:55 +02:00
Jörn Friedrich Dreyer 8a7e26b268 cleanup dead code 2013-09-05 17:46:19 +02:00
kondou 992b59f70b Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype 2013-09-05 16:54:12 +02:00
Jörn Friedrich Dreyer bbf8acb383 separate uploading code from progress code, add progress capability detection 2013-09-05 10:19:54 +02:00
Jörn Friedrich Dreyer 49fd7e9f1e refactor dialog creation 2013-09-04 16:42:18 +02:00
Jörn Friedrich Dreyer 4af5a8c483 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/templates/part.list.php
2013-09-04 14:11:40 +02:00
kondou d62c5063f4 Add previews to OC.dialogs.filepicker(); Fix #4697 2013-09-03 15:15:20 +02:00
Thomas Tanghus 53a7f80ac3 Use provided mimetype on open. Fix #4696 2013-09-02 23:53:45 +02:00
Jörn Friedrich Dreyer 7c9d999243 reduced complexity, added listing conflicts to dialog 2013-08-22 14:29:00 +02:00
kondou edd92e4c09 Merge branch 'master' into fix_jslint_kondou
Conflicts:
	apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
kondou 2ee8425295 Remove cancel button from filepicker
Having the cancel button in the bottom right corner was a bit confusing.
It's useless anyways, since there's a X in the top right.
2013-08-17 12:07:58 +02:00
Jörn Friedrich Dreyer f94e603698 progress fixes 2013-08-16 11:40:55 +02:00
Jörn Friedrich Dreyer 9da49264ea change filelist ui updates 2013-08-14 17:49:45 +02:00
Jörn Friedrich Dreyer e1927d5bee fix whitespace, check selected files before starting upload 2013-08-14 10:55:12 +02:00
kondou 1348330c7d Fix a syntax error & have if-conds in an own line 2013-08-01 18:44:01 +02:00
kondou aaf0fec9f5 Fix some JSLint warnings 2013-07-31 21:21:02 +02:00
Thomas Tanghus 46d4886709 Set default button in oc-dialogs 2013-06-03 03:31:33 +02:00
Thomas Tanghus 5f1cbc6a1a Catch double destroy on escape. 2013-06-03 03:19:35 +02:00
Thomas Tanghus 901b1150ff Replacement for jquery.dialog to fit better with ownCloud design. 2013-06-02 21:52:59 +02:00
Thomas Tanghus 38b2d0a822 Remove more obsolete code. 2013-05-20 09:54:43 +02:00
Thomas Tanghus 27a5132b46 Don't set image path in template. 2013-05-20 09:44:31 +02:00
Thomas Tanghus c3779555aa Dialogs: Home folder icon instead of '/'. 2013-05-17 16:18:40 +02:00
Thomas Tanghus ba9849a1aa Dialogs: Fix method names. 2013-05-17 08:42:15 +02:00
Thomas Tanghus 2f91606e35 Dialogs: Cleanup. 2013-05-17 07:14:43 +02:00
Thomas Tanghus a0b79f5649 Dialogs: Loose up-button. 2013-05-17 06:48:24 +02:00
Thomas Tanghus e60d86bdd1 Dialogs: Make slug show last dir emphasized. 2013-05-17 06:16:51 +02:00
Thomas Tanghus 152e275c8a Various cleanups in OC.dialogs 2013-05-17 04:54:08 +02:00
Thomas Tanghus 913941d894 Line length etc. 2013-05-16 18:19:28 +02:00
Thomas Tanghus c8bbf90feb Port OC.dialogs to use octemplate except for prompt() and form().
Also load octemplate per default.
2013-05-16 13:41:04 +02:00
kondou e44cc8ea57 Fix OC.dialogs.form()
Don't do _too_ much escapeHTML()
2013-04-09 13:07:28 +02:00
kondou 9c53f35d9a Remove manual mimetype checking. 2013-04-08 23:00:02 +02:00
kondou 275badaf76 Make files _and_ directorys selectable/browsable.
Also make long variables more readable by splitting them
up into shorter ones.
2013-04-06 19:21:15 +02:00
kondou d556e7fbc0 Make files selectable again. 2013-04-06 17:22:55 +02:00
kondou 3e185911f1 Fix repeating directory names.
Also fix some CSS for Firefox.
2013-04-06 16:46:40 +02:00