summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4126 from owncloud/parallel-autotest.sh-masterThomas Müller2013-07-222-37/+50
|\
| * Merge branch 'master' into parallel-autotest.sh-masterThomas Müller2013-07-221267-5121/+67470
| |\
| * | don't rely on admin user but create a test user for Test_Encryption_KeymanagerThomas Müller2013-07-191-17/+15
| * | pgsql support addedThomas Müller2013-07-191-1/+4
| * | parallel execution support for mysql addedThomas Müller2013-07-191-12/+19
| * | Merge branch 'master' into parallel-autotest.sh-masterThomas Müller2013-07-18601-5902/+2664
| |\ \
| * | | Use EXECUTOR_NUMBER in database name and user name.Thomas Müller2013-07-161-18/+23
* | | | Merge pull request #4156 from owncloud/fix_oc_image_referenceAndreas Fischer2013-07-221-1/+1
|\ \ \ \
| * | | | need to use \OC_Image to escape OCP namespaceJörn Friedrich Dreyer2013-07-221-1/+1
|/ / / /
* | | | Merge pull request #4154 from owncloud/return-ocl10nKondou2013-07-221-1/+1
|\ \ \ \
| * | | | return result from getL10NRobin Appelman2013-07-221-1/+1
* | | | | Merge pull request #4071 from owncloud/fix_return_value_search_principalsVicDeo2013-07-221-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' into fix_return_value_search_principalsGeorg Ehrke2013-07-22668-9752/+6546
| |\ \ \ \
| * | | | | return empty array instead of 0Georg Ehrke2013-07-151-1/+1
* | | | | | Merge pull request #3142 from owncloud/ext-fs-irods-masterThomas Müller2013-07-2285-1/+8137
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into ext-fs-irods-masterThomas Müller2013-07-221304-9833/+68886
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | fixing / adding commentsThomas Müller2013-07-161-1/+3
| * | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Müller2013-07-16568-2225/+2364
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into ext-fs-irods-masterThomas Müller2013-07-122-75/+109
| |\ \ \ \ \ \ \
| * | | | | | | | update copy rightThomas Müller2013-07-121-1/+1
| * | | | | | | | update .gitignoreThomas Müller2013-07-121-2/+2
| * | | | | | | | incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/ir...Thomas Müller2013-07-1280-1/+7938
| * | | | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Müller2013-07-121141-22754/+32210
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into ext-fs-irods-masterThomas Mueller2013-06-28800-6278/+7862
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into ext-fs-irods-masterThomas Mueller2013-06-191629-55609/+56894
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | update to latest masterThomas Mueller2013-06-061-6/+0
| * | | | | | | | | | | - implement touch() to at least create a file which doesn't existThomas Mueller2013-06-061-12/+87
| * | | | | | | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Mueller2013-05-151136-33590/+40146
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | adding auth mode to ui and the urlThomas Mueller2013-04-262-0/+7
| * | | | | | | | | | | | adding $backupGlobals = FALSE because iRODS is heavily using $GLOBALSThomas Mueller2013-04-261-0/+2
| * | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Mueller2013-04-26900-33287/+31972
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | test case for iRODS storage addedThomas Mueller2013-04-231-0/+30
| * | | | | | | | | | | | | checkbox in settings uiThomas Mueller2013-04-181-1/+2
| * | | | | | | | | | | | | in order to use the ownCloud login credentials we use a login hook to grab ui...Thomas Mueller2013-04-182-45/+17
| * | | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Mueller2013-04-18969-8283/+11224
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | initial integration with iRODS www.irods.orgThomas Mueller2013-04-124-0/+116
* | | | | | | | | | | | | | | Merge pull request #4045 from owncloud/disable-anon-upload-masterThomas Müller2013-07-226-3/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into disable-anon-upload-masterThomas Müller2013-07-22653-200/+62543
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #2980 from owncloud/===_and_!==_in_settingsMorris Jobke2013-07-2218-62/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Use !== and === in settings.kondou2013-07-2118-62/+62
* | | | | | | | | | | | | | | | Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3Thomas Müller2013-07-22635-138/+62481
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | stripping services from AWS SDKChristian Berendt2013-07-10596-114377/+0
| * | | | | | | | | | | | | | | fixing style issuesChristian Berendt2013-07-101-13/+13
| * | | | | | | | | | | | | | | use === instead of ==Christian Berendt2013-07-101-7/+7
| * | | | | | | | | | | | | | | remove uneeded calls to touchChristian Berendt2013-07-101-2/+0
| * | | | | | | | | | | | | | | rewrote initialisation, added testing workaroundChristian Berendt2013-07-103-28/+49
| * | | | | | | | | | | | | | | minimize waiting timeChristian Berendt2013-07-082-2/+6
| * | | | | | | | | | | | | | | wait methods are probably not working, just waitChristian Berendt2013-07-082-6/+2
| * | | | | | | | | | | | | | | make tests workable with Amazon S3Christian Berendt2013-07-081-9/+16
| * | | | | | | | | | | | | | | added exception messagesChristian Berendt2013-07-081-2/+2
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 23:04:53 +0000