Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10881 from owncloud/touch-statcache | Robin Appelman | 2014-12-02 | 2 | -0/+2 |
|\ | |||||
| * | also clear statcache in mapped local | Robin Appelman | 2014-12-02 | 1 | -0/+1 |
| * | Clear statcache before getting the mtime from local storage backends | Robin Appelman | 2014-12-02 | 1 | -0/+1 |
* | | Merge pull request #11975 from owncloud/Combustible-combustible_dev | Morris Jobke | 2014-12-02 | 1 | -254/+267 |
|\ \ | |/ |/| | |||||
| * | Use \OCP\ILogger | Thomas Müller | 2014-12-01 | 1 | -257/+264 |
| * | Added error check to lib/private/image.php | Byron Marohn | 2014-12-01 | 1 | -0/+6 |
* | | Merge pull request #12310 from kampka/master | Thomas Müller | 2014-12-02 | 1 | -0/+48 |
|\ \ | |||||
| * | | Implement a logger to log to error_log | Christian Kampka | 2014-12-01 | 1 | -0/+48 |
* | | | Merge pull request #12419 from owncloud/read-only-config | Thomas Müller | 2014-12-01 | 2 | -3/+11 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Allow read-only configuration | Lukas Reschke | 2014-11-25 | 2 | -3/+11 |
* | | | Merge pull request #12469 from owncloud/issue/12460-port-local-changes2mapped | Vincent Petry | 2014-12-01 | 1 | -2/+21 |
|\ \ \ | |||||
| * | | | Also clearstatcache() in MappedLocal before using the stats | Joas Schilling | 2014-11-27 | 1 | -0/+1 |
| * | | | Check whether file exists before trying to touch() it | Joas Schilling | 2014-11-27 | 1 | -0/+3 |
| * | | | Check return of disk_free_space before returning it | Joas Schilling | 2014-11-27 | 1 | -1/+5 |
| * | | | Check file existance in MappedLocal in hasUpdated() | Joas Schilling | 2014-11-27 | 1 | -1/+5 |
| * | | | Make MappedLocal::isLocal() true like for Local | Joas Schilling | 2014-11-27 | 1 | -0/+7 |
* | | | | Merge pull request #12427 from owncloud/issue/6101-deprecate-namespaced-funct... | Lukas Reschke | 2014-12-01 | 1 | -3/+88 |
|\ \ \ \ | |||||
| * | | | | Depcrate namespaced functions, since they can not be autoloaded | Joas Schilling | 2014-11-26 | 1 | -3/+88 |
* | | | | | Merge pull request #12398 from oparoz/patch-5 | Morris Jobke | 2014-11-30 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | You can only change the oritentation of a JPEG | Olivier Paroz | 2014-11-24 | 1 | -0/+4 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-29 | 2 | -0/+6 |
* | | | | | | Merge pull request #12499 from owncloud/disableMSSQL | Lukas Reschke | 2014-11-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Disable OCI as it is unsupported by most CE apps | Lukas Reschke | 2014-11-28 | 1 | -1/+1 |
| * | | | | | | Disable MSSQL for new CE installations | Lukas Reschke | 2014-11-28 | 1 | -1/+1 |
* | | | | | | | Merge pull request #12488 from owncloud/activity_group_multiple_conditions | Lukas Reschke | 2014-11-28 | 1 | -2/+14 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | concatenate queries with 'or' | Bjoern Schiessle | 2014-11-28 | 1 | -2/+14 |
* | | | | | | | Merge pull request #12486 from owncloud/activity_priorities | Lukas Reschke | 2014-11-28 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add activity priorities to core so that other apps can reuse it | Bjoern Schiessle | 2014-11-28 | 1 | -0/+7 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #12483 from owncloud/issue/6101-preview-providers | Lukas Reschke | 2014-11-28 | 21 | -424/+491 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Split bitmap providers into one per file | Joas Schilling | 2014-11-28 | 7 | -74/+119 |
| * | | | | | | Split office providers into one class per file | Joas Schilling | 2014-11-28 | 8 | -125/+166 |
| * | | | | | | Fix intendation and doc blocks of preview providers | Joas Schilling | 2014-11-28 | 8 | -116/+143 |
| * | | | | | | Move registration of core preview providers to preview | Joas Schilling | 2014-11-27 | 10 | -132/+86 |
* | | | | | | | Merge pull request #12472 from owncloud/modifyCookies | Morris Jobke | 2014-11-28 | 6 | -16/+112 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Pass \OC::$WEBROOT to the ctr | Lukas Reschke | 2014-11-27 | 2 | -5/+12 |
| * | | | | | | | Remove redundant code | Lukas Reschke | 2014-11-27 | 1 | -3/+3 |
| * | | | | | | | Use server container | Lukas Reschke | 2014-11-27 | 3 | -1/+17 |
| * | | | | | | | Add functions to modify cookies to response class | Lukas Reschke | 2014-11-27 | 3 | -9/+82 |
* | | | | | | | | Merge pull request #12443 from owncloud/issue/6101-all-classes-autoloadable | Morris Jobke | 2014-11-28 | 8 | -98/+171 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move NaturalSort_DefaultCollator to its own file | Joas Schilling | 2014-11-27 | 2 | -11/+19 |
| * | | | | | | | | Move iHomeStorage to own file | Joas Schilling | 2014-11-27 | 2 | -4/+24 |
| * | | | | | | | | Move share interfaces to own files so they can be autoloaded | Joas Schilling | 2014-11-27 | 4 | -83/+128 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #12479 from rclarkson/master | Morris Jobke | 2014-11-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Limit blacklist to php files | Richard Clarkson | 2014-11-27 | 1 | -1/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* / | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-28 | 4 | -2/+4 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #12426 from owncloud/jail-mask-wrappers | Robin Appelman | 2014-11-27 | 6 | -1/+1059 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add storage and cache wrappers to apply a permissions mask to a storage | Robin Appelman | 2014-11-27 | 2 | -12/+53 |
| * | | | | | | | Add storage and cache wrappers to jail a storage to a subfolder | Robin Appelman | 2014-11-27 | 5 | -1/+1018 |
* | | | | | | | | Merge pull request #12470 from owncloud/jenkins-12447 | Lukas Reschke | 2014-11-27 | 8 | -33/+80 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Move OC_USER_BACKEND_* constants to OC_User_Backend class | Joas Schilling | 2014-11-27 | 4 | -22/+47 |