Commit Graph

114 Commits

Author SHA1 Message Date
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