Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | drop file cache migration OC5 -> OC6 | Thomas Müller | 2014-03-18 | 1 | -28/+0 |
| | |||||
* | only initialise upload dropZone if public upload is allowed | IchEben | 2014-03-07 | 1 | -1/+1 |
| | |||||
* | Merge pull request #7592 from owncloud/fixstoragefreespace | Vincent Petry | 2014-03-06 | 1 | -499/+506 |
|\ | | | | | Fixed upload issue when free space is not known (ex: FTP) | ||||
| * | Fixed upload issue when free space is not known | Vincent Petry | 2014-03-06 | 1 | -1/+3 |
| | | |||||
| * | Added unit tests for "add()" method for file upload | Vincent Petry | 2014-03-06 | 1 | -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-7307 | Thomas Müller | 2014-03-06 | 3 | -27/+27 |
|\| | | | | | | | | | | | Conflicts: core/js/router.js settings/js/admin.js | ||||
| * | Merge pull request #7575 from owncloud/issue/7571 | Vincent Petry | 2014-03-05 | 1 | -2/+2 |
| |\ | | | | | | | Do not set #dir when on public.php | ||||
| | * | Do not set #dir when on public.php | Joas Schilling | 2014-03-05 | 1 | -2/+2 |
| | | | | | | | | | | | | Fix #7571 | ||||
| * | | don't allow to create a file or folder named 'Shared' in the root folder, ↵ | Bjoern Schiessle | 2014-03-05 | 3 | -25/+25 |
| |/ | | | | | | | also exclude all combinations of lower and upper case letters | ||||
* | | fixing download url in files app | Thomas Müller | 2014-03-02 | 1 | -1/+1 |
| | | |||||
* | | Replace OC.Router.generate() with OC.generateUrl() | Thomas Müller | 2014-03-02 | 2 | -3/+5 |
|/ | |||||
* | coding style fixes, cut long lines, comments not on same lines, curly braces | Jan-Christoph Borchardt | 2014-02-26 | 1 | -8/+11 |
| | |||||
* | Merge pull request #7285 from owncloud/mimeicons-svg | Morris Jobke | 2014-02-24 | 2 | -7/+13 |
|\ | | | | | Show svg mime icons when no preview is available | ||||
| * | rename url parameter | Robin Appelman | 2014-02-24 | 1 | -1/+1 |
| | | |||||
| * | Add url parameter to control whether previews should return 404 when the ↵ | Robin Appelman | 2014-02-21 | 1 | -0/+1 |
| | | | | | | | | mimetype is unsupported | ||||
| * | Merge branch 'master' into mimeicons-svg | Robin Appelman | 2014-02-20 | 2 | -29/+68 |
| |\ | |||||
| * | | Show svg mime icons when no preview is available | Robin Appelman | 2014-02-19 | 2 | -7/+12 |
| | | | |||||
* | | | code style: else on same line | Jan-Christoph Borchardt | 2014-02-21 | 1 | -2/+1 |
| | | | |||||
* | | | fix intendation | Morris Jobke | 2014-02-20 | 1 | -3/+3 |
| | | | |||||
* | | | Fixed trashbin title | Vincent Petry | 2014-02-20 | 1 | -21/+15 |
| | | | |||||
* | | | Fixed title format | Vincent Petry | 2014-02-20 | 1 | -1/+8 |
| | | | |||||
* | | | Merge branch 'patch-1' of github.com:GuillaumeAmat/core into ↵ | Vincent Petry | 2014-02-20 | 1 | -3/+31 |
|\ \ \ | |_|/ |/| | | | | | GuillaumeAmat-patch-1 | ||||
| * | | Uses OC.basename instead of custom code | Guillaume AMAT | 2014-02-19 | 1 | -2/+2 |
| | | | |||||
| * | | Gets the page title from oc_defaults in Files app | Guillaume AMAT | 2014-02-13 | 1 | -1/+1 |
| | | | |||||
| * | | Update page title when navigating through directories | Guillaume AMAT | 2014-02-12 | 1 | -3/+31 |
| |/ | |||||
* / | Do not send file list for select all on Download/delete | Vincent Petry | 2014-02-13 | 2 | -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/6683 | Vincent Petry | 2014-02-10 | 1 | -2/+2 |
|\ | | | | | Only add files to file list when uploading to current directory | ||||
| * | Only add files to file list when uploading to current directory | Joas Schilling | 2014-02-07 | 1 | -2/+2 |
| | | | | | | | | Fix Issue #6683 | ||||
* | | Fix implied evals and doubled definition of variable | Morris Jobke | 2014-02-07 | 2 | -7/+5 |
|/ | | | | | | | fixes #7119 fixes #7120 fixes #7121 fixes #7122 | ||||
* | Merge pull request #7064 from owncloud/files-scrolltopafterupdate | Jan-Christoph Borchardt | 2014-02-05 | 1 | -4/+5 |
|\ | | | | | Scroll to the top after switching dir | ||||
| * | Scroll to the top after switching dir | Vincent Petry | 2014-02-04 | 1 | -5/+6 |
| | | | | | | | | Fixes #7061 | ||||
* | | Merge pull request #7011 from owncloud/jshint | Thomas Müller | 2014-02-04 | 7 | -20/+113 |
|\ \ | | | | | | | Added .jshintrc | ||||
| * | | Fixed file name validation unit test + added newline | Vincent Petry | 2014-01-30 | 1 | -7/+15 |
| | | | | | | | | | | | | | | | - fixed file name validation unit test - added "\n" as forbidden character in isFileNameValid() | ||||
| * | | Added .jshintrc | Vincent Petry | 2014-01-30 | 7 | -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_msg | Jan-Christoph Borchardt | 2014-02-04 | 2 | -3/+16 |
|\ \ \ | |_|/ |/| | | Change misleading message when file size exceeds upload limit | ||||
| * | | Merge branch 'master' into pr-exceed_upload_limit_msg | Pellaeon Lin | 2014-01-30 | 4 | -39/+127 |
| |\| | | | | | | | | | | | | | | | | Conflicts: apps/files/templates/index.php apps/files_sharing/templates/public.php | ||||
| * | | Fix variable name | Pellaeon Lin | 2014-01-24 | 1 | -2/+2 |
| | | | |||||
| * | | Use t() 's native method | Pellaeon Lin | 2014-01-16 | 1 | -2/+8 |
| | | | |||||
| * | | Contextual upload error message | Pellaeon Lin | 2013-12-11 | 1 | -2/+2 |
| | | | |||||
| * | | Update #free_space on getstoragestats AJAX call | Pellaeon Lin | 2013-12-11 | 1 | -0/+1 |
| | | | |||||
| * | | Display different messages for uploadLimit and freeSpace | Pellaeon Lin | 2013-12-08 | 1 | -2/+8 |
| | | | |||||
| * | | Change misleading message when file size exceeds upload limit | Pellaeon Lin | 2013-12-08 | 1 | -2/+2 |
| | | | |||||
* | | | Rename action now appears as pencil icon | raghunayyar | 2014-01-30 | 2 | -5/+17 |
| |/ |/| | |||||
* | | Merge pull request #6777 from owncloud/mobile-style | Jan-Christoph Borchardt | 2014-01-29 | 2 | -3/+3 |
|\ \ | | | | | | | Mobile style for public links: files, folders, picture sets | ||||
| * | | permanently show download action on mobile, only icon | Jan-Christoph Borchardt | 2014-01-29 | 1 | -2/+2 |
| | | | |||||
| * | | merge master into mobile-style | Jan-Christoph Borchardt | 2014-01-29 | 3 | -6/+55 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into mobile-style | Thomas Müller | 2014-01-23 | 4 | -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 generation | Thomas Müller | 2014-01-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Added error message for when target folder was removed | Vincent Petry | 2014-01-29 | 1 | -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-fixfiledownloadlink | Morris Jobke | 2014-01-29 | 2 | -1/+18 |
|\ \ \ \ | | | | | | | | | | | Sharing fixfiledownloadlink |