Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-23 | 2 | -1/+19 |
* | Merge pull request #4126 from owncloud/parallel-autotest.sh-master | Thomas Müller | 2013-07-22 | 1 | -17/+15 |
|\ | |||||
| * | Merge branch 'master' into parallel-autotest.sh-master | Thomas Müller | 2013-07-22 | 677 | -242/+62637 |
| |\ | |||||
| * | | don't rely on admin user but create a test user for Test_Encryption_Keymanager | Thomas Müller | 2013-07-19 | 1 | -17/+15 |
* | | | Merge pull request #3142 from owncloud/ext-fs-irods-master | Thomas Müller | 2013-07-22 | 84 | -1/+8130 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into ext-fs-irods-master | Thomas Müller | 2013-07-22 | 676 | -240/+62652 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | fixing / adding comments | Thomas Müller | 2013-07-16 | 1 | -1/+3 |
| * | | | Merge branch 'master' into ext-fs-irods-master | Thomas Müller | 2013-07-16 | 10 | -2/+49 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into ext-fs-irods-master | Thomas Müller | 2013-07-12 | 2 | -75/+109 |
| |\ \ \ \ | |||||
| * | | | | | update copy right | Thomas Müller | 2013-07-12 | 1 | -1/+1 |
| * | | | | | incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/ir... | Thomas Müller | 2013-07-12 | 79 | -0/+7930 |
| * | | | | | Merge branch 'master' into ext-fs-irods-master | Thomas Müller | 2013-07-12 | 195 | -889/+2056 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into ext-fs-irods-master | Thomas Mueller | 2013-06-28 | 51 | -183/+368 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into ext-fs-irods-master | Thomas Mueller | 2013-06-19 | 357 | -3819/+9903 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | update to latest master | Thomas Mueller | 2013-06-06 | 1 | -6/+0 |
| * | | | | | | | | - implement touch() to at least create a file which doesn't exist | Thomas Mueller | 2013-06-06 | 1 | -12/+87 |
| * | | | | | | | | Merge branch 'master' into ext-fs-irods-master | Thomas Mueller | 2013-05-15 | 197 | -743/+1497 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | adding auth mode to ui and the url | Thomas Mueller | 2013-04-26 | 2 | -0/+7 |
| * | | | | | | | | | adding $backupGlobals = FALSE because iRODS is heavily using $GLOBALS | Thomas Mueller | 2013-04-26 | 1 | -0/+2 |
| * | | | | | | | | | Merge branch 'master' into ext-fs-irods-master | Thomas Mueller | 2013-04-26 | 91 | -32/+261 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | test case for iRODS storage added | Thomas Mueller | 2013-04-23 | 1 | -0/+30 |
| * | | | | | | | | | | checkbox in settings ui | Thomas Mueller | 2013-04-18 | 1 | -1/+2 |
| * | | | | | | | | | | in order to use the ownCloud login credentials we use a login hook to grab ui... | Thomas Mueller | 2013-04-18 | 2 | -45/+17 |
| * | | | | | | | | | | Merge branch 'master' into ext-fs-irods-master | Thomas Mueller | 2013-04-18 | 30 | -51/+340 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | initial integration with iRODS www.irods.org | Thomas Mueller | 2013-04-12 | 4 | -0/+116 |
* | | | | | | | | | | | | Merge branch 'master' into disable-anon-upload-master | Thomas Müller | 2013-07-22 | 634 | -129/+62472 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 |
| | * | | | | | | | | | | | make tests workable with Amazon S3 | Christian Berendt | 2013-07-08 | 1 | -9/+16 |
| | * | | | | | | | | | | | added exception messages | Christian Berendt | 2013-07-08 | 1 | -2/+2 |
| | * | | | | | | | | | | | wait until bucket exists after the creation | Christian Berendt | 2013-07-08 | 1 | -0/+3 |
| | * | | | | | | | | | | | check if used bucket name is valid | Christian Berendt | 2013-07-08 | 1 | -0/+4 |
| | * | | | | | | | | | | | fixed syntax error | Christian Berendt | 2013-07-08 | 1 | -1/+1 |
| | * | | | | | | | | | | | remove needless check | Christian Berendt | 2013-07-08 | 1 | -4/+0 |
| | * | | | | | | | | | | | replaced substr with trim | Christian Berendt | 2013-07-08 | 1 | -7/+1 |
| | * | | | | | | | | | | | removed aws.phar and added extracted zip instead | Christian Berendt | 2013-07-08 | 1228 | -1/+176428 |
| | * | | | | | | | | | | | use us-west-1 as default region for Amazon S3 | Christian Berendt | 2013-07-03 | 1 | -1/+4 |
| | * | | | | | | | | | | | fixing rmdir in \OC\Files\Storage\AmazonS3 | Christian Berendt | 2013-07-03 | 1 | -4/+4 |
| | * | | | | | | | | | | | added commented new parameters | Christian Berendt | 2013-07-03 | 1 | -1/+6 |
| | * | | | | | | | | | | | reworking testclass for \OC\Files\Storage\AmazonS3 | Christian Berendt | 2013-07-03 | 1 | -7/+18 |
| | * | | | | | | | | | | | reworking and extending \OC\Files\Storage\AmazonS3 | Christian Berendt | 2013-07-03 | 1 | -117/+363 |
| | * | | | | | | | | | | | adding several new parameters | Christian Berendt | 2013-07-03 | 1 | -3/+8 |
| | * | | | | | | | | | | | adding AWS SDK for PHP 2.4.0 | Christian Berendt | 2013-07-03 | 1 | -0/+0 |
* | | | | | | | | | | | | | Merge branch 'master' into disable-anon-upload-master | Thomas Müller | 2013-07-22 | 45 | -108/+224 |
|\| | | | | | | | | | | | |