Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into no-css-js-delivery-via-php | Thomas Müller | 2014-02-20 | 67 | -82/+390 |
|\ | |||||
| * | Merge pull request #7301 from owncloud/fix-fuckup | icewind1991 | 2014-02-20 | 1 | -0/+1 |
| |\ | |||||
| | * | fix master - #7274 brokes it | Morris Jobke | 2014-02-20 | 1 | -0/+1 |
| * | | Merge pull request #7247 from owncloud/sharing_cleanup_step1 | Björn Schießle | 2014-02-20 | 1 | -0/+160 |
| |\ \ | |||||
| | * | | clean up the sharing ajax calls, add mail notification class | Bjoern Schiessle | 2014-02-19 | 1 | -0/+160 |
| * | | | Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix | Lukas Reschke | 2014-02-20 | 6 | -4/+53 |
| |\ \ \ | |||||
| | * | | | Added file name check in webdav connector | Vincent Petry | 2014-02-18 | 3 | -4/+20 |
| | * | | | Added extra checks for invalid file chars in newfile.php and newfolder.php | Vincent Petry | 2014-02-18 | 3 | -0/+33 |
| * | | | | Hardening: Remove dangerous characters + Subdirectory Check | Lukas Reschke | 2014-02-19 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #7195 from owncloud/files-selectall | Vincent Petry | 2014-02-19 | 1 | -1/+8 |
| |\ \ \ | |||||
| | * | | | Do not send file list for select all on Download/delete | Vincent Petry | 2014-02-13 | 1 | -1/+8 |
| * | | | | Merge pull request #7274 from owncloud/scrutinizer-patch-1 | Morris Jobke | 2014-02-19 | 61 | -63/+134 |
| |\ \ \ \ | |||||
| | * | | | | fix wrong removes | Morris Jobke | 2014-02-19 | 1 | -1/+24 |
| | * | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2014-02-19 | 61 | -85/+133 |
| * | | | | | Merge pull request #7260 from owncloud/watcher-policy | icewind1991 | 2014-02-19 | 1 | -13/+33 |
| |\ \ \ \ \ | |||||
| | * | | | | | Allow setting the frequency of which the file watcher checks for updates | Robin Appelman | 2014-02-18 | 1 | -13/+33 |
* | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | |