summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add dataresponseBernhard Posselt2014-10-298-29/+292
* Use composer autoloader to load PatchworkThomas Müller2014-10-282-2/+0
* Merge pull request #11805 from owncloud/AdamWill-issue9643Lukas Reschke2014-10-283-59/+18
|\
| * use Composer autoloader not OC for non-Composer 3rdparty (#9643)Adam Williamson2014-10-283-59/+18
* | Merge pull request #11600 from owncloud/refactor-appsettings-to-app-frameworkLukas Reschke2014-10-285-100/+143
|\ \ | |/ |/|
| * Migrate new app settings to AppFrameworkLukas Reschke2014-10-155-100/+143
* | Merge pull request #11791 from owncloud/webdav-getquotainfo-503-handlingMorris Jobke2014-10-281-7/+11
|\ \
| * | Properly catch 503 storage not available in getQuotaInfoVincent Petry2014-10-271-7/+11
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2821-87/+123
* | | Merge pull request #11799 from owncloud/no-stable-etags-on-windowsLukas Reschke2014-10-271-0/+8
|\ \ \
| * | | On Windows platform we have no stable etag generation - yetThomas Müller2014-10-271-0/+8
* | | | Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurableLukas Reschke2014-10-276-58/+271
|\ \ \ \ | |/ / / |/| | |
| * | | code cleanup during review :+1:Thomas Müller2014-10-272-25/+25
| * | | Make supported DBs configurable within config.phpLukas Reschke2014-10-276-35/+248
* | | | Merge pull request #11783 from owncloud/allow_passing_driver_optionsMorris Jobke2014-10-272-0/+14
|\ \ \ \
| * | | | add driver options to config samplesJörn Friedrich Dreyer2014-10-271-0/+7
| * | | | allow passing driver options, fixes #11718Jörn Friedrich Dreyer2014-10-271-0/+7
* | | | | Merge pull request #11763 from owncloud/stable-etagsRobin Appelman2014-10-272-21/+59
|\ \ \ \ \
| * | | | | Generate stable etags for local filesRobin Appelman2014-10-242-21/+59
* | | | | | Merge pull request #11787 from owncloud/fix-php-docsMorris Jobke2014-10-271-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix PHPDocLukas Reschke2014-10-271-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #11708 from owncloud/fix-momentjsVincent Petry2014-10-275-19/+28
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Setting moment locale based on user selectionClark Tomlinson2014-10-235-19/+28
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2718-16/+98
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2624-37/+117
* | | | | Merge pull request #11760 from owncloud/add-type-hints-where-sensibleLukas Reschke2014-10-2510-73/+66
|\ \ \ \ \
| * | | | | drop unneeded hintMorris Jobke2014-10-251-1/+0
| * | | | | Fix PHPDoc and remove explicit type hintLukas Reschke2014-10-241-2/+2
| * | | | | Add type hinting to functionsLukas Reschke2014-10-2410-72/+66
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2524-38/+195
* | | | | | Merge pull request #11767 from danbartram/add_db_rollbackMorris Jobke2014-10-242-0/+14
|\ \ \ \ \ \
| * | | | | | Add missing DB rollback functionalityDan Bartram2014-10-242-0/+14
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #11709 from owncloud/temp-handlingThomas Müller2014-10-248-120/+354
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use the TempManager to handle temporary filesRobin Appelman2014-10-243-120/+7
| * | | | | Add \OC\TempManager to handle creating and cleaning temporary filesRobin Appelman2014-10-245-0/+347
* | | | | | Merge pull request #11735 from owncloud/mssql-migrations-masterClark Tomlinson2014-10-243-8/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | disable database migration unit tests for MSSQLThomas Müller2014-10-233-8/+27
* | | | | | Merge pull request #11752 from owncloud/use-function-outside-of-loopLukas Reschke2014-10-248-13/+21
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Use function outside of loopLukas Reschke2014-10-248-13/+21
|/ / / / /
* | | | | Merge pull request #11758 from owncloud/fix-permissionsLukas Reschke2014-10-2422-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make files non executableLukas Reschke2014-10-2422-0/+0
* | | | | Merge pull request #11754 from owncloud/fix-division-nullLukas Reschke2014-10-241-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Prevent division by zeroLukas Reschke2014-10-241-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2481-124/+130
* | | | | Merge pull request #7749 from owncloud/load_avatar_header_via_phpMorris Jobke2014-10-245-14/+26
|\ \ \ \ \
| * | | | | add avatardiv-shown class to bring back mobile styleMorris Jobke2014-10-231-1/+1
| * | | | | Load avatar in header via PHPkondou2014-10-235-14/+26
| |/ / / /
* | | | | Merge pull request #11751 from owncloud/fix-unreachable-statementLukas Reschke2014-10-241-1/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove unreachable statementLukas Reschke2014-10-231-1/+0
|/ / / /
* | | | Merge pull request #11549 from owncloud/add-more-localizations-masterThomas Müller2014-10-238-92/+105
|\ \ \ \ | |/ / / |/| | |