Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix smb4php to work with home shares | Robin McCorkell | 2014-03-17 | 1 | -11/+5 |
| | | | Stat'ing a share with url_stat now checks if the user can run 'ls' in that share rather than checking if the share is listed by the server. This means that OwnCloud can now mount user home shares, which are never listed by the server. | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-16 | 2 | -0/+3 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-15 | 2 | -0/+4 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 3 | -0/+31 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 2 | -0/+3 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-12 | 10 | -0/+20 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-11 | 52 | -57/+21 |
| | |||||
* | Merge pull request #7529 from owncloud/getlocalfile-cache | icewind1991 | 2014-03-07 | 1 | -99/+94 |
|\ | | | | | Add caching for getLocalFile on remote storages | ||||
| * | Add caching for getLocalFile on remote storages | Robin Appelman | 2014-03-04 | 1 | -99/+94 |
| | | |||||
* | | Merge pull request #7354 from pschmitt/master | Lukas Reschke | 2014-03-05 | 1 | -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 Schmitt | 2014-02-21 | 1 | -1/+1 |
| | | | | | | | | | | | | of 'which') | ||||
* | | | fix some spaces to tabs issues reported by Scrutinizer | Jan-Christoph Borchardt | 2014-03-05 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #7261 from owncloud/issue/6793 | Jan-Christoph Borchardt | 2014-03-05 | 5 | -13/+74 |
|\ \ \ | | | | | | | | | Allow admins to disable certain external storages for users | ||||
| * | | | Allow admins to disable certain external storages for users | Joas Schilling | 2014-02-26 | 5 | -13/+74 |
| | |/ | |/| | | | | | | | Fix issue #6793 | ||||
* | | | Merge pull request #7525 from owncloud/fix_S3string | Thomas Müller | 2014-03-04 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | fix https://github.com/owncloud/core/issues/6825 | ||||
| * | | fix https://github.com/owncloud/core/issues/6825 | Frank Karlitschek | 2014-03-04 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #7335 from owncloud/fix-7333 | Vincent Petry | 2014-02-25 | 1 | -2/+4 |
|\ \ \ | |/ / |/| | | Fix code to search for mount.json in custom data folders | ||||
| * | | Fixed mount config path | Vincent Petry | 2014-02-24 | 1 | -3/+4 |
| | | | |||||
| * | | Fix code to search for mount.json in custom data folders | Lukas Reschke | 2014-02-20 | 1 | -1/+2 |
| |/ | |||||
* | | Merge branch 'master' into extstorage-configclass | Robin Appelman | 2014-02-21 | 5 | -22/+58 |
|\| | |||||
| * | Merge pull request #7290 from owncloud/issue/5463 | icewind1991 | 2014-02-20 | 1 | -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 upload | Joas Schilling | 2014-02-19 | 1 | -1/+1 |
| | | | | | | | | | | | | Fix #5463 | ||||
| * | | Merge pull request #6999 from kofemann/mount-config | Lukas Reschke | 2014-02-20 | 1 | -4/+2 |
| |\ \ | | | | | | | | | mount: make location of mount.json configurable | ||||
| | * | | mount: make location of mount.json configurable | Tigran Mkrtchyan | 2014-01-29 | 1 | -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 Petry | 2014-02-20 | 2 | -31/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9e9a5b9ea1f9b4699cf2d0c621f3f911f3639df9. Unit tests weren't ready, need further tweaking. | ||||
| * | | | Merge pull request #7294 from owncloud/extstorage-configclass | Lukas Reschke | 2014-02-20 | 2 | -1/+31 |
| |\ \ \ | | | | | | | | | | | Added extra checks for ext storage class | ||||
| | * | | | Added extra checks for ext storage class | Vincent Petry | 2014-02-19 | 2 | -1/+31 |
| | | | | | |||||
| * | | | | Fixed ext storage webdav path encoding | Vincent Petry | 2014-02-19 | 3 | -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 class | Vincent Petry | 2014-02-20 | 2 | -1/+32 |
|/ / / | |||||
* | / | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2014-02-19 | 3 | -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_patches | Thomas Müller | 2014-02-18 | 1 | -2/+3 |
|\ \ | | | | | | | | | | | | | Conflicts: lib/private/migration/content.php | ||||
| * | | Remove usage of legacy OC_Appconfig | Robin Appelman | 2014-02-13 | 1 | -2/+3 |
| | | | |||||
* | | | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-14 | 1 | -3/+3 |
|\| | | | | | | | | | | | | | | Conflicts: lib/private/appconfig.php | ||||
| * | | External FTP Storage should request hostname instead of URL | Joas Schilling | 2014-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | Fix issue #6277 | ||||
| * | | Make google drive client secret and dropbox api secret a password field | Joas Schilling | 2014-02-07 | 1 | -2/+2 |
| |/ | | | | | | | Fix issue #5794 | ||||
* | | Fix more documentation failes | Joas Schilling | 2014-02-08 | 1 | -11/+6 |
| | | | | | | | | Issue #7111 | ||||
* | | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 9 | -3/+48 |
|/ | |||||
* | Merge pull request #5153 from owncloud/core-em-to-px | Jan-Christoph Borchardt | 2014-01-27 | 1 | -2/+2 |
|\ | | | | | Cleans up Core apps for relative(em) to absolute(px) styles. | ||||
| * | Merge branch 'master' into core-em-to-px | raghunayyar | 2014-01-16 | 170 | -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. | raghunayyar | 2013-10-06 | 1 | -2/+2 |
| | | | |||||
* | | | Removed unused writeBack method | Vincent Petry | 2014-01-23 | 1 | -8/+0 |
| | | | |||||
* | | | Now using SFTP stream wrapper from phpseclib | Vincent Petry | 2014-01-23 | 25 | -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 quota | Tigran Mkrtchyan | 2014-01-17 | 1 | -1/+1 |
| |/ |/| | | | | | Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> | ||||
* | | Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfix | Vincent Petry | 2014-01-15 | 3 | -19/+33 |
|\ \ | | | | | | | Fixed Dropbox/Google storage async save call | ||||
| * | | Fixed Dropbox/Google storage async save call | Vincent Petry | 2013-12-06 | 3 | -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-smbtimezonefix | Vincent Petry | 2014-01-14 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixed timezone issue with SMB storage | ||||
| * | | | Fixed timezone issue with SMB storage | Vincent Petry | 2014-01-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Now forcing smbclient to also run on UTC | ||||
* | | | | remove ru_RU - it has bee removed from transifex | Thomas Müller | 2014-01-13 | 1 | -6/+0 |
| | | | | |||||
* | | | | Merge pull request #6422 from ↵ | Vincent Petry | 2014-01-13 | 2 | -16/+32 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | ccerrillo/fixing-6301-external-mount-webdav-blank-files Fixing Issue #6301 on master branch | ||||
| * | | | Fix ```createCertificateBundle``` and ```getCertificates``` methods | Carlos Cerrillo | 2013-12-17 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | from ```OC_Mount_config``` to use ```OC_User::getHome``` to get the path |