summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into load-apps-proper-masterThomas Müller2014-03-2196-1294/+1687
|\ | | | | | | | | | | | | Conflicts: apps/files/ajax/rawlist.php cron.php ocs/v1.php
| * remove executable flag for file-upload.jsMorris Jobke2014-03-201-0/+0
| |
| * Merge pull request #7814 from oskholl/masterMorris Jobke2014-03-201-0/+2
| |\ | | | | | | Fix: 'Upload button tooltip doesn't disappear'
| | * Comment moved to prevent 'Line is too long' warning.Oskar Hollmann2014-03-191-1/+2
| | |
| | * Fix: 'Upload button tooltip doesn't disappear'Oskar Hollmann2014-03-191-0/+1
| | | | | | | | | | | | Fixes issue #7461. Tipsy tooltip must be hidden when the upload starts. Otherwise it covers the progress bar and stays in DOM.
| * | Merge pull request #7651 from owncloud/close-session-faster-masterThomas Müller2014-03-2012-8/+14
| |\ \ | | | | | | | | Close session faster
| | * \ Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-196-149/+72
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upgrade.php
| | * \ \ Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-1765-344/+548
| | |\ \ \
| | * | | | close the session on all file operationsThomas Müller2014-03-1013-9/+15
| | | | | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-2050-102/+58
| | |_|_|/ | |/| | |
| * | | | Improve sorting performance of large lists of filesRobin Appelman2014-03-192-9/+11
| | |_|/ | |/| |
| * | | Merge pull request #7790 from owncloud/fix/7788Thomas Müller2014-03-194-149/+62
| |\ \ \ | | | | | | | | | | drop file cache migration OC5 -> OC6
| | * | | drop file cache migration OC5 -> OC6Thomas Müller2014-03-184-149/+62
| | | |/ | | |/|
| * / | [tx-robot] updated from transifexJenkins for ownCloud2014-03-192-0/+10
| |/ /
| * | Merge pull request #7734 from owncloud/icon-class-removeMorris Jobke2014-03-161-4/+4
| |\ \ | | | | | | | | remove unneeded icon class
| | * | remove unneeded icon classJan-Christoph Borchardt2014-03-141-4/+4
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-161-0/+5
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-153-0/+11
| |/ /
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-03-134-0/+110
| | |
| * | Merge pull request #7671 from fpiraneo/patch-1Vincent Petry2014-03-131-1/+1
| |\ \ | | | | | | | | Update index.php
| | * | Update index.phpFrancesco Piraneo G.2014-03-111-1/+1
| | | | | | | | | | | | On line #69 added id="selectedActionsList" to allow an easy adding of new actions customs apps wants to perform on selected files;
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-131-0/+5
| | | |
| * | | Merge pull request #7681 from owncloud/remove-Sabre_DAV_Browser_Plugin-masterLukas Reschke2014-03-121-1/+0
| |\ \ \ | | | | | | | | | | remove Sabre_DAV_Browser_Plugin
| | * | | remove Sabre_DAV_Browser_PluginThomas Müller2014-03-121-1/+0
| | |/ /
| * / / [tx-robot] updated from transifexJenkins for ownCloud2014-03-1210-32/+78
| |/ /
| * / [tx-robot] updated from transifexJenkins for ownCloud2014-03-1162-307/+335
| |/
| * Merge pull request #7629 from owncloud/files-allfileswarningtypoVincent Petry2014-03-101-1/+1
| |\ | | | | | | Fixed log warning when deleting a single file
| | * Fixed log warning when deleting a single fileVincent Petry2014-03-071-1/+1
| | |
| * | only initialise upload dropZone if public upload is allowedIchEben2014-03-071-1/+1
| |/
| * Merge pull request #7592 from owncloud/fixstoragefreespaceVincent Petry2014-03-062-499/+633
| |\ | | | | | | 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-062-499/+631
| | | | | | | | | | | | | | | | | | - 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-066-34/+73
| |\| | | | | | | | | | | | | | | | 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
| | * | Merge pull request #7531 from owncloud/dont_create_shared_folderBjörn Schießle2014-03-055-26/+61
| | |\ \ | | | |/ | | |/| don't allow to create a file or folder named 'Shared' in the root folder
| | | * don't allow to create a file or folder named 'Shared' in the root folder, ↵Bjoern Schiessle2014-03-055-26/+61
| | | | | | | | | | | | | | | | also exclude all combinations of lower and upper case letters
| | * | Merge branch 'master' into display-share-owner-masterThomas Müller2014-02-288-71/+126
| | |\| | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/lib/cache.php
| | * | store the share owner in a data-attribute instead of a separate spanThomas Müller2014-02-201-5/+9
| | | |
| | * | adding share owner information to the file listThomas Müller2014-02-201-5/+5
| | | |
| * | | 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
| | |/ | |/|
| * | Update rawlist to work with new fileinfo objectRobin Appelman2014-02-271-31/+28
| | |
| * | 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-244-17/+29
| |\ \ | | | | | | | | 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
| | * | Make unit tests expect the svg iconsRobin Appelman2014-02-201-2/+6
| | | |
| | * | Merge branch 'master' into mimeicons-svgRobin Appelman2014-02-207-40/+105
| | |\|
| | * | Fix svg icons for public shares and external/shared filesRobin Appelman2014-02-191-3/+3
| | | |