summaryrefslogtreecommitdiffstats
path: root/apps/files/js
Commit message (Collapse)AuthorAgeFilesLines
* drop file cache migration OC5 -> OC6Thomas Müller2014-03-181-28/+0
|
* only initialise upload dropZone if public upload is allowedIchEben2014-03-071-1/+1
|
* Merge pull request #7592 from owncloud/fixstoragefreespaceVincent Petry2014-03-061-499/+506
|\ | | | | Fixed upload issue when free space is not known (ex: FTP)
| * Fixed upload issue when free space is not knownVincent Petry2014-03-061-1/+3
| |
| * Added unit tests for "add()" method for file uploadVincent Petry2014-03-061-499/+504
| | | | | | | | | | | | - Added OC.Upload.init() to make the code testable - Added unit tests for the add() method of the uploader with some error cases
* | Merge branch 'master' into fix-7307Thomas Müller2014-03-063-27/+27
|\| | | | | | | | | | | Conflicts: core/js/router.js settings/js/admin.js
| * Merge pull request #7575 from owncloud/issue/7571Vincent Petry2014-03-051-2/+2
| |\ | | | | | | Do not set #dir when on public.php
| | * Do not set #dir when on public.phpJoas Schilling2014-03-051-2/+2
| | | | | | | | | | | | Fix #7571
| * | don't allow to create a file or folder named 'Shared' in the root folder, ↵Bjoern Schiessle2014-03-053-25/+25
| |/ | | | | | | also exclude all combinations of lower and upper case letters
* | fixing download url in files appThomas Müller2014-03-021-1/+1
| |
* | Replace OC.Router.generate() with OC.generateUrl()Thomas Müller2014-03-022-3/+5
|/
* 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