Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4489 from owncloud/clean-3rdparty-mess-master | Bart Visscher | 2013-08-28 | 15 | -2/+1506 |
|\ | |||||
| * | fixing require path | Thomas Müller | 2013-08-18 | 2 | -2/+2 |
| * | moving Dropbox and smb4php 3rdparty code over to the apps | Thomas Müller | 2013-08-17 | 15 | -2/+1506 |
* | | kill zh_CN.GB2312 | Thomas Müller | 2013-08-27 | 1 | -28/+0 |
* | | Merge pull request #4512 from owncloud/readdir-strict-equals | Thomas Müller | 2013-08-20 | 4 | -5/+5 |
|\ \ | |||||
| * \ | Merge branch 'master' into readdir-strict-equals | Georg Ehrke | 2013-08-19 | 2 | -4/+4 |
| |\ \ | |||||
| * | | | use strict equals in readdir loops to prevent issues with '0' files | Robin Appelman | 2013-08-19 | 4 | -5/+5 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-19 | 1 | -0/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #4510 from owncloud/f_e_webdav_urlencoding | Thomas Müller | 2013-08-19 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | replace ' ' with '%20' in urls for curl | Jörn Friedrich Dreyer | 2013-08-19 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #4467 from owncloud/storage-wrapper-quota | icewind1991 | 2013-08-19 | 2 | -2/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | merge master in storage-wrapper-quota | Robin Appelman | 2013-08-18 | 72 | -84/+253 |
| |\| | |||||
| * | | use renamed constants | Robin Appelman | 2013-07-25 | 2 | -3/+3 |
* | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondou | Kondou | 2013-08-18 | 5 | -5/+5 |
|\ \ \ | |||||
| * | | | Add _many_ newlines at the end of files | kondou | 2013-08-18 | 5 | -5/+5 |
| | |/ | |/| | |||||
* / | | Compare result are already true/false | Bart Visscher | 2013-08-17 | 3 | -8/+8 |
|/ / | |||||
* | | remove ru_RU - fixes #3135 | Thomas Müller | 2013-08-17 | 1 | -6/+0 |
* | | no files external for SMB on windows | Thomas Müller | 2013-08-15 | 1 | -10/+16 |
* | | Merge pull request #4302 from synchrone/master | Morris Jobke | 2013-08-14 | 1 | -0/+1 |
|\ \ | |||||
| * | | Fixing owncloud/core#4301 | Alexander Bogdanov | 2013-08-02 | 1 | -0/+1 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-09 | 69 | -69/+207 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-07 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc | Jörn Friedrich Dreyer | 2013-08-01 | 1 | -0/+15 |
|\ \ | |||||
| * | | added @var tags | Christian Berendt | 2013-08-01 | 1 | -0/+15 |
| |/ | |||||
* | | Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_logging | Jörn Friedrich Dreyer | 2013-08-01 | 1 | -0/+14 |
|\ \ | |||||
| * | | write all catched exception messages to the log | Christian Berendt | 2013-08-01 | 1 | -0/+14 |
| |/ | |||||
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-01 | 1 | -0/+1 |
|/ | |||||
* | use output buffering when including the irods libraries | Robin Appelman | 2013-07-24 | 1 | -0/+2 |
* | Merge pull request #3392 from owncloud/googledrive | Bart Visscher | 2013-07-23 | 38 | -597/+8524 |
|\ | |||||
| * | Remove root option from Google Drive storage, because it is only used for tes... | Michael Gapczynski | 2013-07-23 | 2 | -10/+8 |
| * | Fix 'most' Google Drive tests | Michael Gapczynski | 2013-07-13 | 2 | -82/+148 |
| * | Merge branch 'master' into googledrive | Thomas Müller | 2013-07-12 | 14 | -18/+61 |
| |\ | |||||
| * | | substr storage id to prevent problems with storing the change id in appconfig | Michael Gapczynski | 2013-06-04 | 1 | -1/+1 |
| * | | Implement hasUpdated() to watch for changes on Google Drive side | Michael Gapczynski | 2013-05-30 | 1 | -0/+59 |
| * | | Merge branch 'master' into googledrive | Michael Gapczynski | 2013-05-27 | 3 | -20/+7 |
| |\ \ | |||||
| * | | | Fix require_once for 3rdparty in google ajax frontend | Michael Gapczynski | 2013-05-18 | 1 | -2/+3 |
| * | | | Include 3rdparty Google Drive SDK 0.6.2 | Michael Gapczynski | 2013-05-17 | 33 | -2/+7936 |
| * | | | Fix constant in last commit | Michael Gapczynski | 2013-05-17 | 1 | -1/+1 |
| * | | | Prepare for #2013 fix | Michael Gapczynski | 2013-05-17 | 1 | -1/+7 |
| * | | | Setting Redirect URI is not required here | Michael Gapczynski | 2013-05-16 | 1 | -1/+0 |
| * | | | Switch to using Google Drive SDK, closes #2047 | Michael Gapczynski | 2013-05-16 | 4 | -567/+431 |
* | | | | Merge branch 'master' into ext-fs-irods-master | Thomas Müller | 2013-07-22 | 640 | -136/+62505 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3 | Thomas Müller | 2013-07-22 | 634 | -129/+62472 |
| |\ \ \ \ | |||||
| | * | | | | stripping services from AWS SDK | Christian Berendt | 2013-07-10 | 596 | -114377/+0 |
| | * | | | | fixing style issues | Christian Berendt | 2013-07-10 | 1 | -13/+13 |
| | * | | | | use === instead of == | Christian Berendt | 2013-07-10 | 1 | -7/+7 |
| | * | | | | remove uneeded calls to touch | Christian Berendt | 2013-07-10 | 1 | -2/+0 |
| | * | | | | rewrote initialisation, added testing workaround | Christian Berendt | 2013-07-10 | 3 | -28/+49 |
| | * | | | | minimize waiting time | Christian Berendt | 2013-07-08 | 2 | -2/+6 |
| | * | | | | wait methods are probably not working, just wait | Christian Berendt | 2013-07-08 | 2 | -6/+2 |