aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
Commit message (Collapse)AuthorAgeFilesLines
* coding style fixes, cut long lines, comments not on same lines, curly bracesJan-Christoph Borchardt2014-02-261-8/+11
|
* Merge pull request #7285 from owncloud/mimeicons-svgMorris Jobke2014-02-242-7/+13
|\ | | | | Show svg mime icons when no preview is available
| * rename url parameterRobin Appelman2014-02-241-1/+1
| |
| * Add url parameter to control whether previews should return 404 when the ↵Robin Appelman2014-02-211-0/+1
| | | | | | | | mimetype is unsupported
| * Merge branch 'master' into mimeicons-svgRobin Appelman2014-02-202-29/+68
| |\
| * | Show svg mime icons when no preview is availableRobin Appelman2014-02-192-7/+12
| | |
* | | code style: else on same lineJan-Christoph Borchardt2014-02-211-2/+1
| | |
* | | fix intendationMorris Jobke2014-02-201-3/+3
| | |
* | | Fixed trashbin titleVincent Petry2014-02-201-21/+15
| | |
* | | Fixed title formatVincent Petry2014-02-201-1/+8
| | |
* | | Merge branch 'patch-1' of github.com:GuillaumeAmat/core into ↵Vincent Petry2014-02-201-3/+31
|\ \ \ | |_|/ |/| | | | | GuillaumeAmat-patch-1
| * | Uses OC.basename instead of custom codeGuillaume AMAT2014-02-191-2/+2
| | |
| * | Gets the page title from oc_defaults in Files appGuillaume AMAT2014-02-131-1/+1
| | |
| * | Update page title when navigating through directoriesGuillaume AMAT2014-02-121-3/+31
| |/
* / Do not send file list for select all on Download/deleteVincent Petry2014-02-132-29/+68
|/ | | | | | | | - When all files are selected, do not send the whole file list - Download will trigger download for the parent folder, also works with root - Delete will send "allfiles" to the server that will find the file list or the passed directory by itself
* Merge pull request #7126 from nickvergessen/issue/6683Vincent Petry2014-02-101-2/+2
|\ | | | | Only add files to file list when uploading to current directory
| * Only add files to file list when uploading to current directoryJoas Schilling2014-02-071-2/+2
| | | | | | | | Fix Issue #6683
* | Fix implied evals and doubled definition of variableMorris Jobke2014-02-072-7/+5
|/ | | | | | | fixes #7119 fixes #7120 fixes #7121 fixes #7122
* Merge pull request #7064 from owncloud/files-scrolltopafterupdateJan-Christoph Borchardt2014-02-051-4/+5
|\ | | | | Scroll to the top after switching dir
| * Scroll to the top after switching dirVincent Petry2014-02-041-5/+6
| | | | | | | | Fixes #7061
* | Merge pull request #7011 from owncloud/jshintThomas Müller2014-02-047-20/+113
|\ \ | | | | | | Added .jshintrc
| * | Fixed file name validation unit test + added newlineVincent Petry2014-01-301-7/+15
| | | | | | | | | | | | | | | - fixed file name validation unit test - added "\n" as forbidden character in isFileNameValid()
| * | Added .jshintrcVincent Petry2014-01-307-13/+98
| | | | | | | | | | | | | | | | | | - Also fixes a few JSHint warnings in files app - Added "global" comment on top of files app to suppress warning and also inform devs about what globals are use
* | | Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msgJan-Christoph Borchardt2014-02-042-3/+16
|\ \ \ | |_|/ |/| | Change misleading message when file size exceeds upload limit
| * | Merge branch 'master' into pr-exceed_upload_limit_msgPellaeon Lin2014-01-304-39/+127
| |\| | | | | | | | | | | | | | | | Conflicts: apps/files/templates/index.php apps/files_sharing/templates/public.php
| * | Fix variable namePellaeon Lin2014-01-241-2/+2
| | |
| * | Use t() 's native methodPellaeon Lin2014-01-161-2/+8
| | |
| * | Contextual upload error messagePellaeon Lin2013-12-111-2/+2
| | |
| * | Update #free_space on getstoragestats AJAX callPellaeon Lin2013-12-111-0/+1
| | |
| * | Display different messages for uploadLimit and freeSpacePellaeon Lin2013-12-081-2/+8
| | |
| * | Change misleading message when file size exceeds upload limitPellaeon Lin2013-12-081-2/+2
| | |
* | | Rename action now appears as pencil iconraghunayyar2014-01-302-5/+17
| |/ |/|
* | Merge pull request #6777 from owncloud/mobile-styleJan-Christoph Borchardt2014-01-292-3/+3
|\ \ | | | | | | Mobile style for public links: files, folders, picture sets
| * | permanently show download action on mobile, only iconJan-Christoph Borchardt2014-01-291-2/+2
| | |
| * | merge master into mobile-styleJan-Christoph Borchardt2014-01-293-6/+55
| |\ \
| * \ \ Merge branch 'master' into mobile-styleThomas Müller2014-01-234-29/+56
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js apps/files_sharing/css/public.css apps/files_sharing/js/public.js apps/files_sharing/templates/public.php
| * | | | fixing preview generationThomas Müller2014-01-151-1/+1
| | | | |
* | | | | Added error message for when target folder was removedVincent Petry2014-01-291-0/+7
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whent trying to upload/rename/create files in a folder that was removed or rename, the correct error message is now shown. In the case of upload of multiple files, the upload is cancelled. This situation can happen if the target folder was renamed or removed from another browser window or client.
* | | | Merge pull request #6929 from owncloud/sharing-fixfiledownloadlinkMorris Jobke2014-01-292-1/+18
|\ \ \ \ | | | | | | | | | | Sharing fixfiledownloadlink
| * | | | Fixed download URL in public pageVincent Petry2014-01-242-1/+18
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | - Refactored download URL building to make it overridable - Added download URL override in public page - Added JS unit tests for download URL - Added OC.redirect() method to facilitate unit testing
* | | | Merge pull request #6184 from owncloud/6051-ux-files-Move-File-SpinnerMorris Jobke2014-01-241-5/+37
|\ \ \ \ | |/ / / |/| | | #6051 [ux][files] Move File Spinner
| * | | Fixed indention.zombiehugs2013-12-041-1/+1
| | | | | | | | | | | | | | | | As per @kabum request, indention on line 694 has been fixed.
| * | | #6051 [ux][files] Move File Spinnerzombiehugs2013-12-041-5/+37
| | |/ | |/| | | | | | | | | | | | | Added spinner to file icon when moving to new folder or out of folder. Commit is related to #6051
* | | Merge pull request #6719 from tripflex/fix_pubup_progbarMorris Jobke2014-01-221-1/+1
|\ \ \ | | | | | | | | Fix public upload progress bar
| * | | change publicUploadButtonMock to public_uploadMyles McNamara2014-01-201-1/+1
| | |/ | |/| | | | Changed jQuery selector for public preview to public_upload to correctly show preview
* | | Merge pull request #6827 from rnveach/fix_6730Morris Jobke2014-01-202-1/+4
|\ \ \ | | | | | | | | Fix 6730
| * | | added trigger to redo selection text on a directory changernveach2014-01-171-0/+2
| | | |
| * | | fixed selector string and removed all checkbox if it was selectedrnveach2014-01-171-1/+2
| |/ /
* | | Fix to not destroy draggable when no draggable was setVincent Petry2014-01-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | When a dir has no delete permission, the draggable isn't initialized on files. This fix makes sure we don't try to destroy a draggable when it wasn't inited in the first place. Fixes #6254
* | | Fixed various file name escaping issues in core appsVincent Petry2014-01-104-28/+49
|/ / | | | | | | | | | | | | - Refactored file tr lookup into FileList.findFileEl that uses filterAttr to avoid escaping issues in jQuery selectors - Fixed versions and sharing app to properly escape file names in attributes