summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
| | | |
| * | | 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 ↵Robin Appelman2014-10-226-62/+13
| | | | | | | | | | | | | | | | server container in \OC_DB
| * | | Extend \OCP\IDBConnection to cover more use casesRobin Appelman2014-10-221-3/+61
| | | |
| * | | Remove \OC\DB\ConnectionWrapper, have \OC\DB\Connection implement ↵Robin Appelman2014-10-223-110/+3
| | | | | | | | | | | | | | | | \OCP\IDBConnection directly instead
* | | | Merge pull request #11721 from owncloud/fix-s3-regressionMorris Jobke2014-10-231-5/+11
|\ \ \ \ | | | | | | | | | | [master] Fix S3 connection regression
| * | | | Fix S3 connectionVincent Petry2014-10-221-5/+11
| | | | |
* | | | | Merge pull request #11726 from owncloud/s3-fixunittestsMorris Jobke2014-10-231-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix S3 folder creation for new AWS API
| * | | | | Fix S3 folder creation for new AWS APIVincent Petry2014-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This also fixes the unit tests
* | | | | | Merge pull request #11720 from sebomoto/groupadmin-headerJan-Christoph Borchardt2014-10-232-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | "Group admin" default label (issue #7706)
| * | | | | | "Group admin" default label (issue #7706)Sebastian Bolt2014-10-222-4/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the column header to "Group Admin for" and the default value of the multiselect box to "no group" if user is not a groupadmin for any group.
* | | | | | Merge pull request #10689 from owncloud/load_classfile_onceMorris Jobke2014-10-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | make sure class file is loaded once
| * | | | | | make sure class file is loaded onceArthur Schiwon2014-08-281-1/+1
| | | | | | |
* | | | | | | Merge pull request #11710 from owncloud/closeSessionForAvatarsThomas Müller2014-10-231-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Close session for avatar get
| * | | | | | | Close session for avatar getLukas Reschke2014-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This somehow blocked the "Users" UI for me when having a lot of users. - Shouldn't hurt here.