Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | integrate assetic for asset pipeline-ing | Thomas Müller | 2014-02-20 | 1 | -25/+88 |
* | enable static delivery of css files | Thomas Müller | 2014-02-20 | 1 | -1/+1 |
* | kill references to core.js and core.css | Thomas Müller | 2014-02-20 | 1 | -2/+0 |
* | kill old minimizer code | Thomas Müller | 2014-02-20 | 4 | -145/+4 |
* | Merge pull request #7257 from owncloud/filelist-fileinfo | Vincent Petry | 2014-02-19 | 1 | -8/+1 |
|\ | |||||
| * | use a FileInfo object of the directory when generting the filelist | Robin Appelman | 2014-02-18 | 1 | -8/+1 |
* | | Merge pull request #7114 from owncloud/scrutinizer_documentation_patches | Thomas Müller | 2014-02-19 | 116 | -265/+528 |
|\ \ | |||||
| * \ | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-18 | 21 | -169/+272 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-14 | 33 | -156/+869 |
| |\ \ \ | |||||
| * | | | | Fix more documentation failes | Joas Schilling | 2014-02-08 | 16 | -141/+111 |
| * | | | | remove duplicate param lines for OCP\User::getUsers() | Jörn Friedrich Dreyer | 2014-02-07 | 1 | -2/+0 |
| * | | | | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 116 | -150/+448 |
* | | | | | Merge pull request #7253 from owncloud/preferences-caching | icewind1991 | 2014-02-18 | 1 | -37/+86 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | 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 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 | 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove unused variables | tomneedham | 2014-02-18 | 1 | -4/+0 |
| * | | | | | | | Merge branch 'master' into migration_unit_tests | tomneedham | 2014-02-17 | 27 | -170/+1002 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into migration_unit_tests | Bart Visscher | 2014-02-10 | 57 | -257/+705 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | 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 | 65 | -256/+502 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | 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 | 8 | -118/+168 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fix-5388-master | tomneedham | 2013-12-11 | 77 | -150/+720 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fix-5388-master | Thomas Mueller | 2013-11-24 | 11 | -20/+38 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fix-5388-master | Thomas Müller | 2013-11-22 | 9 | -23/+145 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | 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 | 5 | -9/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | $default of OC_Config::[gs]etValue can have more then string as type | Bart Visscher | 2014-02-12 | 4 | -8/+8 |
| * | | | | | | | | | | | | | | | 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 | 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 | 7 | -38/+196 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add unit tests for JobList | Robin Appelman | 2014-02-12 | 1 | -1/+1 |
| * | | | | | | | | | | | | Additional phpdoc | Robin Appelman | 2014-02-12 | 3 | -6/+31 |
| * | | | | | | | | | | | | Remove internal methods from the public interface | Robin Appelman | 2014-02-12 | 1 | -7/+1 |
| * | | | | | | | | | | | | Merge branch 'master' into backgroundjob-public | Robin Appelman | 2014-02-12 | 5 | -1/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Add the background job list to the public server container | Robin Appelman | 2014-02-11 | 7 | -36/+175 |
* | | | | | | | | | | | | | | Merge pull request #7207 from owncloud/fileinfo-serializable | Morris Jobke | 2014-02-14 | 1 | -5/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | 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 |