Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | return result from getL10N | Robin Appelman | 2013-07-22 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #4071 from owncloud/fix_return_value_search_principals | VicDeo | 2013-07-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'master' into fix_return_value_search_principals | Georg Ehrke | 2013-07-22 | 668 | -9752/+6546 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | return empty array instead of 0 | Georg Ehrke | 2013-07-15 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge pull request #3142 from owncloud/ext-fs-irods-master | Thomas Müller | 2013-07-22 | 85 | -1/+8137 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into ext-fs-irods-master | Thomas Müller | 2013-07-22 | 1304 | -9833/+68886 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | 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 | 568 | -2225/+2364 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 | |
| * | | | | | | | | | | | | | | | update .gitignore | Thomas Müller | 2013-07-12 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/ir... | Thomas Müller | 2013-07-12 | 80 | -1/+7938 | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-master | Thomas Müller | 2013-07-12 | 1141 | -22754/+32210 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-master | Thomas Mueller | 2013-06-28 | 800 | -6278/+7862 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into ext-fs-irods-master | Thomas Mueller | 2013-06-19 | 1629 | -55609/+56894 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | 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 | 1136 | -33590/+40146 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | 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 | 900 | -33287/+31972 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | 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 | 969 | -8283/+11224 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | initial integration with iRODS www.irods.org | Thomas Mueller | 2013-04-12 | 4 | -0/+116 | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #4045 from owncloud/disable-anon-upload-master | Thomas Müller | 2013-07-22 | 6 | -3/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into disable-anon-upload-master | Thomas Müller | 2013-07-22 | 653 | -200/+62543 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #2980 from owncloud/===_and_!==_in_settings | Morris Jobke | 2013-07-22 | 18 | -62/+62 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Use !== and === in settings. | kondou | 2013-07-21 | 18 | -62/+62 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3 | Thomas Müller | 2013-07-22 | 635 | -138/+62481 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | | | | | | | | increasing allowed time difference | Christian Berendt | 2013-07-08 | 1 | -9/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | | | | | | | | revoking additional tests | Christian Berendt | 2013-07-04 | 1 | -99/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | use us-west-1 as default region for Amazon S3 | Christian Berendt | 2013-07-03 | 1 | -1/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | remove tests from the wrong test method | Christian Berendt | 2013-07-03 | 1 | -10/+0 |