summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |/ / |/| |
| * | 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 testClark Tomlinson2014-09-301-6/+19
* | | | Merge pull request #10985 from owncloud/db-cleanupThomas Müller2014-10-2312-284/+187
|\ \ \ \
| * | | | Fix tags unit testRobin Appelman2014-10-221-1/+1
| * | | | Use statements wrapper in \OCP\IDBRobin Appelman2014-10-221-1/+3
| * | | | Bit more cleanupRobin Appelman2014-10-223-27/+21
| * | | | Move creating the database connection to the server containerRobin Appelman2014-10-224-85/+90
| * | | | Remove implicit prepared statement cache and get the connection from the serv...Robin Appelman2014-10-226-62/+13
| * | | | Extend \OCP\IDBConnection to cover more use casesRobin Appelman2014-10-221-3/+61
| * | | | Remove \OC\DB\ConnectionWrapper, have \OC\DB\Connection implement \OCP\IDBCon...Robin Appelman2014-10-223-110/+3
* | | | | Merge pull request #11721 from owncloud/fix-s3-regressionMorris Jobke2014-10-231-5/+11
|\ \ \ \ \
| * | | | | Fix S3 connectionVincent Petry2014-10-221-5/+11
* | | | | | Merge pull request #11726 from owncloud/s3-fixunittestsMorris Jobke2014-10-231-0/+1
|\ \ \ \ \ \