aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* add test case if a file gets moved out from the shared folderBjoern Schiessle2014-02-242-0/+125
|
* don't overwrite keys if rename was done by a stream copyBjoern Schiessle2014-02-241-4/+13
|
* Merge pull request #7305 from owncloud/extstorage-configclassLukas Reschke2014-02-222-1/+32
|\ | | | | Added extra checks for ext storage class
| * Merge branch 'master' into extstorage-configclassRobin Appelman2014-02-2112-31/+259
| |\
| * | Added extra checks for ext storage classVincent Petry2014-02-202-1/+32
| | |
* | | Merge pull request #7355 from owncloud/new-menu-svgicewind19912014-02-212-13/+28
|\ \ \ | | | | | | | | Use SVG icons in New file menu
| * | | fix too much distance between text and iconJan-Christoph Borchardt2014-02-211-1/+1
| | | |
| * | | use SVG icons from icons.css for New file menuJan-Christoph Borchardt2014-02-212-13/+28
| | |/ | |/|
* | | fix test so that it doesn't depend on the array orderBjoern Schiessle2014-02-211-14/+25
| | |
* | | fix usersPath and add unit testsBjoern Schiessle2014-02-212-10/+110
|/ /
* | Merge pull request #7312 from owncloud/ldap_fix_add_testThomas Müller2014-02-212-3/+169
|\ \ | | | | | | LDAP: fix and extend tests
| * | LDAP: fix and extend testsArthur Schiwon2014-02-202-3/+169
| | |
* | | Merge pull request #7290 from owncloud/issue/5463icewind19912014-02-201-1/+1
|\ \ \ | | | | | | | | Correctly redirect to settings page when not selecting cert file for upload
| * | | Correctly redirect to settings page when not selecting cert file for uploadJoas Schilling2014-02-191-1/+1
| | | | | | | | | | | | | | | | Fix #5463
* | | | Merge pull request #7205 from owncloud/fix_7153blizzz2014-02-201-0/+6
|\ \ \ \ | | | | | | | | | | LDAP: prevent other configuration from being deleted when deleting the f...
| * | | | LDAP: prevent other configuration from being deleted when deleting the first ↵Arthur Schiwon2014-02-141-0/+6
| | | | | | | | | | | | | | | | | | | | one which has an empty prefix for historical reasons
* | | | | Merge pull request #6999 from kofemann/mount-configLukas Reschke2014-02-201-4/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | mount: make location of mount.json configurable
| * | | | mount: make location of mount.json configurableTigran Mkrtchyan2014-01-291-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not share users data with config files Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
* | | | | Merge pull request #6714 from owncloud/files-newfileinvalidcharsfixLukas Reschke2014-02-202-6/+12
|\ \ \ \ \ | | | | | | | | | | | | Added extra checks for invalid file chars in newfile.php and newfolder.php
| * | | | | Added extra checks for invalid file chars in newfile.php and newfolder.phpVincent Petry2014-02-182-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added PHP utility function to check for file name validity - fixes issue where a user can create a file called ".." from the files UI - added extra checks to make sure newfile.php and newfolder.php also check for invalid characters
* | | | | | Revert "Added extra checks for ext storage class"Vincent Petry2014-02-202-31/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9e9a5b9ea1f9b4699cf2d0c621f3f911f3639df9. Unit tests weren't ready, need further tweaking.
* | | | | | Merge pull request #7284 from owncloud/ldap_filter_compilationLukas Reschke2014-02-202-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | LDAP: improve compilation of filters
| * | | | | | LDAP: improve compilation of filtersArthur Schiwon2014-02-192-0/+14
| | | | | | |
* | | | | | | Merge pull request #7294 from owncloud/extstorage-configclassLukas Reschke2014-02-202-1/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added extra checks for ext storage class
| * | | | | | | Added extra checks for ext storage classVincent Petry2014-02-192-1/+31
| | |_|_|_|_|/ | |/| | | | |
* / | | | | | Fixed ext storage webdav path encodingVincent Petry2014-02-193-17/+55
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Some WebDAV servers like lighttpd need paths in URLs to be properly encoded - Added error log output when curl connection failed - Added check for 'resourcetype' in case the WebDAV server doesn't support/return it - Fixed touch() to return false if the server doesn't implement PROPPATCH - Added optional delay in WebDAV unit tests to use when testing against lighttpd's WebDAV
* | | | | | Merge pull request #7195 from owncloud/files-selectallVincent Petry2014-02-199-118/+227
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Do not send file list for select all on Download/delete
| * | | | | Trashbin select all now doesn't send file listVincent Petry2014-02-173-79/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed "delete" and "restore" actions to not send the file list when all files are selected - When some files are selected, sends the current dir - Removed "dirListing" attribute as the backend is able to compute the value based on the current dir
| * | | | | Do not send file list for select all on Download/deleteVincent Petry2014-02-136-39/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 #4799 from ↵Jan-Christoph Borchardt2014-02-191-11/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/tune_legacy_cache_webdav_properties_prefixing_master Concatenate string in SQL instead of PHP
| * | | | | | cleanup and actually execute the queryJörn Friedrich Dreyer2013-11-011-4/+8
| | | | | | |
| * | | | | | use doctrine to construct concat expressionJörn Friedrich Dreyer2013-11-011-8/+1
| | | | | | |
| * | | | | | Concatenate string in SQL instead of PHPJörn Friedrich Dreyer2013-11-011-10/+10
| | | | | | |
* | | | | | | Merge pull request #7274 from owncloud/scrutinizer-patch-1Morris Jobke2014-02-1912-13/+36
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Scrutinizer Auto-Fixes
| * | | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-1912-13/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch was automatically generated as part of the following inspection: https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720 Enabled analysis tools: - PHP Analyzer - JSHint - PHP Copy/Paste Detector - PHP PDepend
* | | | | | | Merge pull request #7257 from owncloud/filelist-fileinfoVincent Petry2014-02-193-26/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | use a FileInfo object of the directory when generting the filelist
| * | | | | | use a FileInfo object of the directory when generting the filelistRobin Appelman2014-02-183-26/+6
| | | | | | |
* | | | | | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1825-89/+228
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/migration/content.php
| * \ \ \ \ \ \ Merge pull request #7190 from owncloud/appconfig-legacy-appsThomas Müller2014-02-1813-31/+43
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | Remove usage of legacy OC_Appconfig
| | * | | | | | Remove usage of legacy OC_AppconfigRobin Appelman2014-02-1313-31/+43
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #7176 from owncloud/styleLukas Reschke2014-02-181-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Some style fixes
| | * | | | | Style fixesBart Visscher2014-02-121-1/+1
| | | | | | |
| * | | | | | Merge pull request #7235 from DavidVentura/masterJan-Christoph Borchardt2014-02-171-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | small change for compatibility
| | * | | | | | small change for compatibilityDavid2014-02-171-1/+1
| | | | | | | |
| * | | | | | | Merge pull request #7211 from mattcaron/masterVincent Petry2014-02-171-1/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fit shared videos to viewer, just like images. Issue #1648
| | * | | | | | | Consolidate two sections, per code review. Issue #1648Matthew Caron2014-02-171-6/+2
| | | | | | | | |
| | * | | | | | | Fit shared videos to viewer, just like images. Issue #1648Matthew Caron2014-02-141-0/+7
| | |/ / / / / /
| * | | | | | | LDAP: improve wizard strings, fixes #5567Arthur Schiwon2014-02-173-3/+3
| | | | | | | |
| * | | | | | | don't block login forever if we are stuck in the middle of the initial ↵Bjoern Schiessle2014-02-175-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encryption
| * | | | | | | catch errors during decryptionBjoern Schiessle2014-02-172-16/+105
| | | | | | | |