summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | 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
* | | | | | | | | Merge pull request #4291 from owncloud/schemaBart Visscher2013-08-052-59/+81
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use function to create schema managerBart Visscher2013-08-021-20/+35
| * | | | | | | | | remove invalid type hinting and cleanup namespaces a bitRobin Appelman2013-08-021-5/+8
| * | | | | | | | | Rename \OC\DB\Schema to \OC\DB\MDB2SchemaManagerBart Visscher2013-08-022-7/+7
| * | | | | | | | | Change OC_DB_Schema to use DI for db connection objectBart Visscher2013-08-022-51/+55
* | | | | | | | | | Merge pull request #4319 from owncloud/fixing-undefined-index-mtime-cache-sca...Thomas Müller2013-08-051-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use isset to prevent undefined indexThomas Müller2013-08-051-1/+1
* | | | | | | | | | | Merge pull request #4320 from owncloud/adding-executable-occ-masterMorris Jobke2013-08-052-2/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | adding executable script occ (ownCloud console)Thomas Müller2013-08-052-2/+13
| |/ / / / / / / / / /
* / / / / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-08-0566-121/+124
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #4285 from owncloud/scan-files-script-masterThomas Müller2013-08-052-0/+67
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove cli checkThomas Müller2013-08-021-4/+0
| * | | | | | | | | | more verbose printouts - fixing executionThomas Müller2013-08-021-7/+18
| * | | | | | | | | | adjust usage textThomas Müller2013-08-021-2/+2
| * | | | | | | | | | Use console.php entry point for file scanning from consoleBart Visscher2013-08-022-2/+25
| * | | | | | | | | | adding new cli script to rescan filesThomas Müller2013-08-011-0/+37
* | | | | | | | | | | Merge pull request #4293 from owncloud/config-dateThomas Müller2013-08-042-5/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fixing PHPDocThomas Müller2013-08-041-3/+3
| * | | | | | | | | | | add 'logdateformat' to config.sample.phpThomas Müller2013-08-041-1/+4
| * | | | | | | | | | | make log date configurable, default to iso 8601Bernhard Posselt2013-08-021-1/+3
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #4308 from owncloud/fix-4194Thomas Müller2013-08-041-3/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fixing PHPDocThomas Müller2013-08-041-1/+1
| * | | | | | | | | | | Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.Andreas Fischer2013-08-041-2/+5
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #4228 from owncloud/fix-3836Thomas Müller2013-08-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | app migrate: Use = instead of LIKE as described in the comment above.Andreas Fischer2013-07-291-1/+1
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-04360-1589/+1610
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | add reveal mimetypeRobin Appelman2013-08-031-1/+2
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0335-140/+200
* | | | | | | | | | | Merge pull request #4299 from owncloud/simplify-db-transactionThomas Müller2013-08-021-10/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |