summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 - yet
| * 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
|\ \ | |/ |/| Make supported DBs configurable within config.php
| * code cleanup during review :+1:Thomas Müller2014-10-272-25/+25
| |
| * Make supported DBs configurable within config.phpLukas Reschke2014-10-276-35/+248
| | | | | | | | | | | | This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake. To test this play around with the new configuration parameter "supportedDatabases".
* | Merge pull request #11783 from owncloud/allow_passing_driver_optionsMorris Jobke2014-10-272-0/+14
|\ \ | | | | | | allow passing db driver options
| * | 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 files
| * | | 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 PHPDoc
| * | | Fix PHPDocLukas Reschke2014-10-271-1/+1
| | |/ | |/| | | | | | | Stop my IDE and Scrutinizer from complaining.
* | | Merge pull request #11708 from owncloud/fix-momentjsVincent Petry2014-10-275-19/+28
|\ \ \ | | | | | | | | Setting moment locale based on user selection
| * | | 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
|\ \ \ \ | | | | | | | | | | Add type hinting to functions
| * | | | 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
| | | | | | | | | | | | | | | | | | | | It's only reasonable to have proper type hinting here which might even help us to catch bugs.
* | | | | [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 functionality
| * | | | | Add missing DB rollback functionalityDan Bartram2014-10-242-0/+14
| | |_|/ / | |/| | |
* | | | | Merge pull request #11709 from owncloud/temp-handlingThomas Müller2014-10-248-120/+354
|\ \ \ \ \ | |/ / / / |/| | | | Cleanup handling of temporary files
| * | | | 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 MSSQL
| * | | | 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 loop
| * | | | Use function outside of loopLukas Reschke2014-10-248-13/+21
|/ / / / | | | | | | | | | | | | Otherwise the function is executed n times which is a lot of overhead
* | | | Merge pull request #11758 from owncloud/fix-permissionsLukas Reschke2014-10-2422-0/+0
|\ \ \ \ | |_|/ / |/| | | Make files non executable
| * | | Make files non executableLukas Reschke2014-10-2422-0/+0
| | | | | | | | | | | | | | | | There is not much sense in having these files marked executable, we should avoid that.
* | | | Merge pull request #11754 from owncloud/fix-division-nullLukas Reschke2014-10-241-1/+1
|\ \ \ \ | |/ / / |/| | | Prevent division by zero
| * | | Prevent division by zeroLukas Reschke2014-10-241-1/+1
| | | | | | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/11742
* | | | [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
|\ \ \ \ | | | | | | | | | | Load avatar in header via PHP
| * | | | add avatardiv-shown class to bring back mobile styleMorris Jobke2014-10-231-1/+1
| | | | |
| * | | | Load avatar in header via PHPkondou2014-10-235-14/+26
| |/ / / | | | | | | | | | | | | | | | | * fix #7484 * use UID, css, and div instead of span
* | | | Merge pull request #11751 from owncloud/fix-unreachable-statementLukas Reschke2014-10-241-1/+0
|\ \ \ \ | |/ / / |/| | | Remove unreachable statement
| * | | Remove unreachable statementLukas Reschke2014-10-231-1/+0
|/ / /
* | | Merge pull request #11549 from owncloud/add-more-localizations-masterThomas Müller2014-10-238-92/+105
|\ \ \ | |/ / |/| | implement localizations based on punic
| * | Update 3rdparty submoduleThomas Müller2014-10-231-0/+0
| | |
| * | fixing expected values for formatDate() unit testsThomas Müller2014-10-211-3/+3
| | |
| * | adding unit tests for en_GB and en-GB - just to verifyThomas Müller2014-10-201-0/+8
| | |
| * | implement localizations based on punicThomas Müller2014-10-207-89/+94
| | |
* | | Merge pull request #11259 from owncloud/fix-windows-max-depth-testThomas Müller2014-10-231-6/+19
|\ \ \ | | | | | | | | fixing windows max depth test
| * | | fixing windows max depth testClark Tomlinson2014-09-301-6/+19
| | | |
* | | | Merge pull request #10985 from owncloud/db-cleanupThomas Müller2014-10-2312-284/+187
|\ \ \ \ | | | | | | | | | | Cleanup database handling
| * | | | Fix tags unit testRobin Appelman2014-10-221-1/+1
| | | | |