Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-26 | 24 | -37/+117 |
| | |||||
* | Merge pull request #11760 from owncloud/add-type-hints-where-sensible | Lukas Reschke | 2014-10-25 | 10 | -73/+66 |
|\ | | | | | Add type hinting to functions | ||||
| * | drop unneeded hint | Morris Jobke | 2014-10-25 | 1 | -1/+0 |
| | | |||||
| * | Fix PHPDoc and remove explicit type hint | Lukas Reschke | 2014-10-24 | 1 | -2/+2 |
| | | |||||
| * | Add type hinting to functions | Lukas Reschke | 2014-10-24 | 10 | -72/+66 |
| | | | | | | | | It's only reasonable to have proper type hinting here which might even help us to catch bugs. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-25 | 24 | -38/+195 |
| | | |||||
* | | Merge pull request #11767 from danbartram/add_db_rollback | Morris Jobke | 2014-10-24 | 2 | -0/+14 |
|\ \ | | | | | | | Add missing DB rollback functionality | ||||
| * | | Add missing DB rollback functionality | Dan Bartram | 2014-10-24 | 2 | -0/+14 |
| | | | |||||
* | | | Merge pull request #11709 from owncloud/temp-handling | Thomas Müller | 2014-10-24 | 8 | -120/+354 |
|\ \ \ | |/ / |/| | | Cleanup handling of temporary files | ||||
| * | | Use the TempManager to handle temporary files | Robin Appelman | 2014-10-24 | 3 | -120/+7 |
| | | | |||||
| * | | Add \OC\TempManager to handle creating and cleaning temporary files | Robin Appelman | 2014-10-24 | 5 | -0/+347 |
| | | | |||||
* | | | Merge pull request #11735 from owncloud/mssql-migrations-master | Clark Tomlinson | 2014-10-24 | 3 | -8/+27 |
|\ \ \ | |_|/ |/| | | disable database migration unit tests for MSSQL | ||||
| * | | disable database migration unit tests for MSSQL | Thomas Müller | 2014-10-23 | 3 | -8/+27 |
| | | | |||||
* | | | Merge pull request #11752 from owncloud/use-function-outside-of-loop | Lukas Reschke | 2014-10-24 | 8 | -13/+21 |
|\ \ \ | | | | | | | | | Use function outside of loop | ||||
| * | | | Use function outside of loop | Lukas Reschke | 2014-10-24 | 8 | -13/+21 |
|/ / / | | | | | | | | | | Otherwise the function is executed n times which is a lot of overhead | ||||
* | | | Merge pull request #11758 from owncloud/fix-permissions | Lukas Reschke | 2014-10-24 | 22 | -0/+0 |
|\ \ \ | |_|/ |/| | | Make files non executable | ||||
| * | | Make files non executable | Lukas Reschke | 2014-10-24 | 22 | -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-null | Lukas Reschke | 2014-10-24 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Prevent division by zero | ||||
| * | | Prevent division by zero | Lukas Reschke | 2014-10-24 | 1 | -1/+1 |
| | | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/11742 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-24 | 81 | -124/+130 |
| | | | |||||
* | | | Merge pull request #7749 from owncloud/load_avatar_header_via_php | Morris Jobke | 2014-10-24 | 5 | -14/+26 |
|\ \ \ | | | | | | | | | Load avatar in header via PHP | ||||
| * | | | add avatardiv-shown class to bring back mobile style | Morris Jobke | 2014-10-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Load avatar in header via PHP | kondou | 2014-10-23 | 5 | -14/+26 |
| |/ / | | | | | | | | | | | | | * fix #7484 * use UID, css, and div instead of span | ||||
* | | | Merge pull request #11751 from owncloud/fix-unreachable-statement | Lukas Reschke | 2014-10-24 | 1 | -1/+0 |
|\ \ \ | |/ / |/| | | Remove unreachable statement | ||||
| * | | Remove unreachable statement | Lukas Reschke | 2014-10-23 | 1 | -1/+0 |
|/ / | |||||
* | | Merge pull request #11549 from owncloud/add-more-localizations-master | Thomas Müller | 2014-10-23 | 8 | -92/+105 |
|\ \ | |/ |/| | implement localizations based on punic | ||||
| * | Update 3rdparty submodule | Thomas Müller | 2014-10-23 | 1 | -0/+0 |
| | | |||||
| * | fixing expected values for formatDate() unit tests | Thomas Müller | 2014-10-21 | 1 | -3/+3 |
| | | |||||
| * | adding unit tests for en_GB and en-GB - just to verify | Thomas Müller | 2014-10-20 | 1 | -0/+8 |
| | | |||||
| * | implement localizations based on punic | Thomas Müller | 2014-10-20 | 7 | -89/+94 |
| | | |||||
* | | Merge pull request #11259 from owncloud/fix-windows-max-depth-test | Thomas Müller | 2014-10-23 | 1 | -6/+19 |
|\ \ | | | | | | | fixing windows max depth test | ||||
| * | | fixing windows max depth test | Clark Tomlinson | 2014-09-30 | 1 | -6/+19 |
| | | | |||||
* | | | Merge pull request #10985 from owncloud/db-cleanup | Thomas Müller | 2014-10-23 | 12 | -284/+187 |
|\ \ \ | | | | | | | | | Cleanup database handling | ||||
| * | | | Fix tags unit test | Robin Appelman | 2014-10-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use statements wrapper in \OCP\IDB | Robin Appelman | 2014-10-22 | 1 | -1/+3 |
| | | | | |||||
| * | | | Bit more cleanup | Robin Appelman | 2014-10-22 | 3 | -27/+21 |
| | | | | |||||
| * | | | Move creating the database connection to the server container | Robin Appelman | 2014-10-22 | 4 | -85/+90 |
| | | | | |||||
| * | | | Remove implicit prepared statement cache and get the connection from the ↵ | Robin Appelman | 2014-10-22 | 6 | -62/+13 |
| | | | | | | | | | | | | | | | | server container in \OC_DB | ||||
| * | | | Extend \OCP\IDBConnection to cover more use cases | Robin Appelman | 2014-10-22 | 1 | -3/+61 |
| | | | | |||||
| * | | | Remove \OC\DB\ConnectionWrapper, have \OC\DB\Connection implement ↵ | Robin Appelman | 2014-10-22 | 3 | -110/+3 |
| | | | | | | | | | | | | | | | | \OCP\IDBConnection directly instead | ||||
* | | | | Merge pull request #11721 from owncloud/fix-s3-regression | Morris Jobke | 2014-10-23 | 1 | -5/+11 |
|\ \ \ \ | | | | | | | | | | | [master] Fix S3 connection regression | ||||
| * | | | | Fix S3 connection | Vincent Petry | 2014-10-22 | 1 | -5/+11 |
| | | | | | |||||
* | | | | | Merge pull request #11726 from owncloud/s3-fixunittests | Morris Jobke | 2014-10-23 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix S3 folder creation for new AWS API | ||||
| * | | | | | Fix S3 folder creation for new AWS API | Vincent Petry | 2014-10-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This also fixes the unit tests | ||||
* | | | | | | Merge pull request #11720 from sebomoto/groupadmin-header | Jan-Christoph Borchardt | 2014-10-23 | 2 | -4/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | "Group admin" default label (issue #7706) | ||||
| * | | | | | | "Group admin" default label (issue #7706) | Sebastian Bolt | 2014-10-22 | 2 | -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_once | Morris Jobke | 2014-10-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | make sure class file is loaded once | ||||
| * | | | | | | make sure class file is loaded once | Arthur Schiwon | 2014-08-28 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #11710 from owncloud/closeSessionForAvatars | Thomas Müller | 2014-10-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Close session for avatar get | ||||
| * | | | | | | | Close session for avatar get | Lukas Reschke | 2014-10-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This somehow blocked the "Users" UI for me when having a lot of users. - Shouldn't hurt here. |