Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2014-02-19 | 51 | -74/+102 |
| | | | | | | | | | | | This patch was automatically generated as part of the following inspection: https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720 Enabled analysis tools: - PHP Analyzer - JSHint - PHP Copy/Paste Detector - PHP PDepend | ||||
* | Merge pull request #7114 from owncloud/scrutinizer_documentation_patches | Thomas Müller | 2014-02-19 | 91 | -187/+421 |
|\ | | | | | polish documentation based on scrutinizer patches | ||||
| * | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-18 | 15 | -158/+135 |
| |\ | | | | | | | | | | | | | Conflicts: lib/private/migration/content.php | ||||
| * \ | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-14 | 27 | -151/+616 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: lib/private/appconfig.php | ||||
| * | | | Fix more documentation failes | Joas Schilling | 2014-02-08 | 10 | -94/+73 |
| | | | | | | | | | | | | | | | | Issue #7111 | ||||
| * | | | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 91 | -106/+364 |
| | | | | |||||
* | | | | Merge pull request #7253 from owncloud/preferences-caching | icewind1991 | 2014-02-18 | 1 | -37/+86 |
|\ \ \ \ | |_|_|/ |/| | | | Add caching to OC\Preferences | ||||
| * | | | remove some unneeded isset's | Robin Appelman | 2014-02-18 | 1 | -5/+3 |
| | | | | |||||
| * | | | Fix some phpdoc | Robin Appelman | 2014-02-18 | 1 | -1/+9 |
| | | | | |||||
| * | | | Add caching to OC\Preferences | Robin Appelman | 2014-02-18 | 1 | -37/+80 |
| | | | | |||||
* | | | | Merge pull request #6796 from owncloud/statementwrapper-bindparam | Thomas Müller | 2014-02-18 | 1 | -0/+14 |
|\ \ \ \ | | | | | | | | | | | Add bindParam to the database statement wrapper | ||||
| * | | | | Add bindParam to statement wrapper | Robin Appelman | 2014-01-16 | 1 | -0/+14 |
| | | | | | |||||
* | | | | | Merge pull request #7190 from owncloud/appconfig-legacy-apps | Thomas Müller | 2014-02-18 | 3 | -8/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove usage of legacy OC_Appconfig | ||||
| * | | | | | Remove usage of legacy OC_Appconfig | Robin Appelman | 2014-02-13 | 3 | -8/+11 |
| | | | | | | |||||
* | | | | | | Merge pull request #6650 from owncloud/migration_unit_tests | Tom Needham | 2014-02-18 | 3 | -112/+31 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | User migration fix, and basic unit test | ||||
| * | | | | | | Remove unused variables | tomneedham | 2014-02-18 | 1 | -4/+0 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into migration_unit_tests | tomneedham | 2014-02-17 | 19 | -159/+617 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into migration_unit_tests | Bart Visscher | 2014-02-10 | 48 | -228/+537 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'fix-5388-master' into migration_unit_tests | tomneedham | 2014-01-07 | 3 | -108/+31 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into fix-5388-master | tomneedham | 2014-01-04 | 25 | -136/+276 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix migration import of user files | Bart Visscher | 2013-12-20 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Wrap the import/export db in a wrapper to make it compatible with the old style | Bart Visscher | 2013-12-20 | 2 | -0/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into fix-5388-master | Bart Visscher | 2013-12-16 | 4 | -67/+111 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fix-5388-master | tomneedham | 2013-12-11 | 29 | -83/+327 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fix-5388-master | Thomas Mueller | 2013-11-24 | 5 | -19/+32 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fix-5388-master | Thomas Müller | 2013-11-22 | 6 | -23/+78 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Change OC_Migrate from MDB2 to Doctrine | Bart Visscher | 2013-11-22 | 3 | -107/+26 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #7176 from owncloud/style | Lukas Reschke | 2014-02-18 | 3 | -5/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some style fixes | ||||
| * | | | | | | | | | | | | | | | $default of OC_Config::[gs]etValue can have more then string as type | Bart Visscher | 2014-02-12 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Style fixes | Bart Visscher | 2014-02-12 | 1 | -1/+2 |
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #7239 from owncloud/cbr-filetype-icon | Thomas Müller | 2014-02-18 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | add cbr/cbz file type icon, fix #6953 | ||||
| * | | | | | | | | | | | | | | add cbr/cbz file type icon, fix #6953 | Jan-Christoph Borchardt | 2014-02-17 | 1 | -0/+7 |
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |||||
* / | | | | | | | | | | | | | use file icon as fallback instead of application icon, fix #7237 | Jan-Christoph Borchardt | 2014-02-17 | 1 | -0/+1 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #7156 from owncloud/backgroundjob-public | Thomas Müller | 2014-02-14 | 3 | -31/+63 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | Add the background job list to the public server container | ||||
| * | | | | | | | | | | | | Add unit tests for JobList | Robin Appelman | 2014-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Additional phpdoc | Robin Appelman | 2014-02-12 | 1 | -2/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into backgroundjob-public | Robin Appelman | 2014-02-12 | 4 | -1/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Add the background job list to the public server container | Robin Appelman | 2014-02-11 | 3 | -29/+59 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge pull request #7207 from owncloud/fileinfo-serializable | Morris Jobke | 2014-02-14 | 1 | -5/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the JsonSerializable interface from \OC\Files\FileInfo | ||||
| * | | | | | | | | | | | | | | remove the JsonSerializable interface from \OC\Files\FileInfo | Robin Appelman | 2014-02-14 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #7204 from owncloud/groupexists-duplicate | Thomas Müller | 2014-02-14 | 1 | -8/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Remove duplicate call to groupExists | ||||
| * | | | | | | | | | | | | | | Fix test cases for group manager | Robin Appelman | 2014-02-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | remove duplicate call to groupExists | Robin Appelman | 2014-02-14 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge pull request #6748 from owncloud/fileinfo | icewind1991 | 2014-02-14 | 2 | -18/+213 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Add a FileInfo class which holds all info of a file ... | ||||
| * | | | | | | | | | | | | | | merge master into fileinfo | Robin Appelman | 2014-01-29 | 16 | -75/+160 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Add isReadable, isUpdateable, isDeletable, isShareable | Robin Appelman | 2014-01-24 | 1 | -1/+37 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge branch 'master' into fileinfo | Robin Appelman | 2014-01-17 | 2 | -21/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/lib/files/cache/cache.php | ||||
| * | | | | | | | | | | | | | | | Merge branch 'master' into fileinfo | Robin Appelman | 2014-01-14 | 2 | -6/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | add Support for passing a FileInfo instance to View->putFileInfo | Robin Appelman | 2014-01-13 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | remove ArrayAccess, JsonSerializable from the public part of FileInfo | Robin Appelman | 2014-01-13 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | |