summaryrefslogtreecommitdiffstats
path: root/apps/files_external
Commit message (Collapse)AuthorAgeFilesLines
* Added unit tests for when adding ext storage mount pointsVincent Petry2014-03-182-16/+135
| | | | | | | | | - test config was written correctly (global and local) - test that personal mount points can be added for allowed backends - test that personal mount points cannot be added for disallowed backends - added $skipTest flag to make it possible add mount points without doing an actual check/connection (note: this is necessary because the static class OC_Mount_Config cannot be mocked)
* Fix validation of allowed personal backendVincent Petry2014-03-181-1/+1
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-162-0/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-152-0/+4
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-133-0/+31
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-132-0/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-1210-0/+20
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-1152-57/+21
|
* Merge pull request #7529 from owncloud/getlocalfile-cacheicewind19912014-03-071-99/+94
|\ | | | | Add caching for getLocalFile on remote storages
| * Add caching for getLocalFile on remote storagesRobin Appelman2014-03-041-99/+94
| |
* | Merge pull request #7354 from pschmitt/masterLukas Reschke2014-03-051-1/+1
|\ \ | | | | | | Use 'command -v' to detect whether and where software is installed (instead of 'which')
| * | Use 'command -v' to detect whether and where software is installed (instead ↵Philipp Schmitt2014-02-211-1/+1
| | | | | | | | | | | | of 'which')
* | | fix some spaces to tabs issues reported by ScrutinizerJan-Christoph Borchardt2014-03-051-1/+1
| | |
* | | Merge pull request #7261 from owncloud/issue/6793Jan-Christoph Borchardt2014-03-055-13/+74
|\ \ \ | | | | | | | | Allow admins to disable certain external storages for users
| * | | Allow admins to disable certain external storages for usersJoas Schilling2014-02-265-13/+74
| | |/ | |/| | | | | | | Fix issue #6793
* | | Merge pull request #7525 from owncloud/fix_S3stringThomas Müller2014-03-041-1/+1
|\ \ \ | |/ / |/| | fix https://github.com/owncloud/core/issues/6825
| * | fix https://github.com/owncloud/core/issues/6825Frank Karlitschek2014-03-041-1/+1
| | |
* | | Merge pull request #7335 from owncloud/fix-7333Vincent Petry2014-02-251-2/+4
|\ \ \ | |/ / |/| | Fix code to search for mount.json in custom data folders
| * | Fixed mount config pathVincent Petry2014-02-241-3/+4
| | |
| * | Fix code to search for mount.json in custom data foldersLukas Reschke2014-02-201-1/+2
| |/
* | Merge branch 'master' into extstorage-configclassRobin Appelman2014-02-215-22/+58
|\|
| * 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 #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>
| * | | 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 #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
* / / / Added extra checks for ext storage classVincent Petry2014-02-202-1/+32
|/ / /
* | / Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-193-1/+5
| |/ |/| | | | | | | | | | | | | | | | | | | 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 branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-181-2/+3
|\ \ | | | | | | | | | | | | Conflicts: lib/private/migration/content.php
| * | Remove usage of legacy OC_AppconfigRobin Appelman2014-02-131-2/+3
| | |
* | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-141-3/+3
|\| | | | | | | | | | | | | | Conflicts: lib/private/appconfig.php
| * | External FTP Storage should request hostname instead of URLJoas Schilling2014-02-121-1/+1
| | | | | | | | | | | | Fix issue #6277
| * | Make google drive client secret and dropbox api secret a password fieldJoas Schilling2014-02-071-2/+2
| |/ | | | | | | Fix issue #5794
* | Fix more documentation failesJoas Schilling2014-02-081-11/+6
| | | | | | | | Issue #7111
* | polish documentation based on scrutinizer patchesJörn Friedrich Dreyer2014-02-069-3/+48
|/
* Merge pull request #5153 from owncloud/core-em-to-pxJan-Christoph Borchardt2014-01-271-2/+2
|\ | | | | Cleans up Core apps for relative(em) to absolute(px) styles.
| * Merge branch 'master' into core-em-to-pxraghunayyar2014-01-16170-718/+9043
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/css/public.css apps/user_ldap/css/settings.css core/css/multiselect.css core/css/share.css
| * | Cleans up Core apps for relative(em) to absolute(px) styles.raghunayyar2013-10-061-2/+2
| | |
* | | Removed unused writeBack methodVincent Petry2014-01-231-8/+0
| | |
* | | Now using SFTP stream wrapper from phpseclibVincent Petry2014-01-2325-4745/+9724
| | | | | | | | | | | | | | | | | | - Upgraded phpseclib to master version (post 0.3.5) - Now using fopen() on sftp URL for both read and write - Fixes #4063
* | | webdav: return SPACE_UNKNOWN if server do not support quotaTigran Mkrtchyan2014-01-171-1/+1
| |/ |/| | | | | Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
* | Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfixVincent Petry2014-01-153-19/+33
|\ \ | | | | | | Fixed Dropbox/Google storage async save call
| * | Fixed Dropbox/Google storage async save callVincent Petry2013-12-063-19/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking "Grant access", the settings for Dropbox/Google were saved through a call that gets cancelled when redirecting to the grant page (for example in Firefox) This fix makes sure the "save settings" call finished before redirecting to the grant page. Fixes #6176
* | | Merge pull request #6759 from owncloud/extstorage-smbtimezonefixVincent Petry2014-01-141-1/+1
|\ \ \ | | | | | | | | Fixed timezone issue with SMB storage
| * | | Fixed timezone issue with SMB storageVincent Petry2014-01-141-1/+1
| | | | | | | | | | | | | | | | Now forcing smbclient to also run on UTC
* | | | remove ru_RU - it has bee removed from transifexThomas Müller2014-01-131-6/+0
| | | |
* | | | Merge pull request #6422 from ↵Vincent Petry2014-01-132-16/+32
|\ \ \ \ | |/ / / |/| | | | | | | | | | | ccerrillo/fixing-6301-external-mount-webdav-blank-files Fixing Issue #6301 on master branch