summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4151 from owncloud/doctrine-objectJörn Friedrich Dreyer2013-08-0810-337/+488
|\
| * More style fixesBart Visscher2013-08-072-15/+15
| * Fix stupid bugBart Visscher2013-08-071-1/+2
| * Move query processing after the check for prepared statement cacheBart Visscher2013-08-071-4/+4
| * Style fixesBart Visscher2013-08-074-6/+8
| * merge master into doctrine-objectRobin Appelman2013-08-06396-1797/+2130
| |\
| * | DB: remove invalid assertsRobin Appelman2013-08-021-2/+0
| * | merge master into doctrine-objectRobin Appelman2013-08-022031-26473/+110281
| |\ \
| * | | Make DB connection available to use for dependency injectionBart Visscher2013-07-261-0/+5
| * | | Fix lastInsertId for OCI8 adapterBart Visscher2013-07-231-2/+1
| * | | Add documentation to OC\DB\adapter classBart Visscher2013-07-231-0/+18
| * | | Fix errors from unit testsBart Visscher2013-07-212-4/+3
| * | | Correct namespace of OC_ classesBart Visscher2013-07-212-6/+6
| * | | Move building error string to connectionBart Visscher2013-07-212-9/+18
| * | | Group database connection and schema functionBart Visscher2013-07-211-27/+27
| * | | Cleanup: remove code for multiple database backendsBart Visscher2013-07-211-55/+14
| * | | Use $connection for schema changesBart Visscher2013-07-211-12/+13
| * | | Simplify OC_DB transaction functionsBart Visscher2013-07-211-10/+0
| * | | Move insertIfNotExist to Connection wrapperBart Visscher2013-07-214-53/+81
| * | | Move query statement fixup handling to Connection wrapperBart Visscher2013-07-217-50/+39
| * | | Move limit/offset handling to Connection wrapperBart Visscher2013-07-212-67/+8
| * | | Move prepared query cache handling to Connection wrapperBart Visscher2013-07-212-21/+34
| * | | Move lastInsertId to adapter classesBart Visscher2013-07-216-30/+51
| * | | Move db prefix handling to Connection wrapperBart Visscher2013-07-212-17/+15
| * | | Create DB Connection wrapper and DB\Adapter* classesBart Visscher2013-07-217-0/+163
| * | | Only close db connection when disconnecting, keep the connection objectBart Visscher2013-07-211-2/+2
* | | | Merge pull request #4349 from owncloud/oc_cache_fixBjörn Schießle2013-08-081-4/+12
|\ \ \ \
| * | | | oc_cache needs to disable file proxys for read/write operation. Otherwise the...Bjoern Schiessle2013-08-081-4/+12
* | | | | Remove noisy Log/Debug messageMorris Jobke2013-08-081-1/+0
* | | | | Merge pull request #3912 from owncloud/css_cleanup_kondouJan-Christoph Borchardt2013-08-084-9/+18
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into css_cleanup_kondoukondou2013-07-241786-18838/+101723
| |\ \ \ \ \
| * | | | | | General CSS cleanupkondou2013-07-094-22/+44
* | | | | | | Merge pull request #4353 from owncloud/fix_search_usericewind19912013-08-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fix function call for searUsers()Bjoern Schiessle2013-08-081-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #4243 from owncloud/no_empty_versionsBjörn Schießle2013-08-081-2/+5
|\ \ \ \ \ \ \
| * | | | | | | don't create empty versionsBjoern Schiessle2013-07-301-2/+5
* | | | | | | | Merge pull request #4328 from owncloud/cleanupdb_kondouMorris Jobke2013-08-081-3/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Proper WHERE – the table is called userid not userkondou2013-08-061-1/+1
| * | | | | | | | Use setUpBeforeClass() and tearDownAfterClass()kondou2013-08-061-6/+2
| * | | | | | | | Clean up DB, after we're done with testingkondou2013-08-061-0/+9
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #4340 from owncloud/true-false-as-filenameThomas Müller2013-08-081-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Check expected type after JSON decode instead of checking what is not expected.Andreas Fischer2013-08-071-1/+1
* | | | | | | | more error messages which might be useful for the user to debug his server co...Bjoern Schiessle2013-08-082-2/+6
* | | | | | | | improved error message to refect openSSL PHP extension and stock openSSL conf...Bjoern Schiessle2013-08-081-1/+1
* | | | | | | | also write error message to the logBjoern Schiessle2013-08-081-0/+1
* | | | | | | | catch broken server config and disable encryption app.Bjoern Schiessle2013-08-082-1/+13
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-07248-541/+6032
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #4321 from owncloud/add_unittests_kondouMorris Jobke2013-08-062-0/+151
|\ \ \ \ \ \ \
| * | | | | | | Remove pointless unittest (search/result)kondou2013-08-051-17/+0
| * | | | | | | Add unittestskondou2013-08-053-0/+168