Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24256 from owncloud/scanner-propagate | Morris Jobke | 2016-04-26 | 1 | -0/+16 |
|\ | | | | | triger the propagator from the command line scanner | ||||
| * | triger the propagator from the command line scanner | Robin Appelman | 2016-04-25 | 1 | -0/+16 |
| | | |||||
* | | Merge pull request #24262 from owncloud/fix-24228 | Morris Jobke | 2016-04-26 | 1 | -1/+2 |
|\ \ | | | | | | | check whether index is set before using it | ||||
| * | | check whether index is set before using it | Arthur Schiwon | 2016-04-25 | 1 | -1/+2 |
| |/ | |||||
* | | Merge pull request #24199 from owncloud/ocp-repair | Morris Jobke | 2016-04-26 | 21 | -148/+239 |
|\ \ | | | | | | | Introduce OCP\Migration\IRepairStep and adopt all repair steps to thi… | ||||
| * | | Introduce OCP\Migration\IRepairStep and adopt all repair steps to this new ↵ | Thomas Müller | 2016-04-25 | 21 | -148/+239 |
| | | | | | | | | | | | | interface - refs #24198 | ||||
* | | | Move \OC\Search to PSR-4 | Roeland Jago Douma | 2016-04-26 | 5 | -0/+0 |
| | | | |||||
* | | | Merge pull request #22648 from owncloud/propagate-single | Thomas Müller | 2016-04-25 | 6 | -27/+55 |
|\ \ \ | | | | | | | | | do propagation in a single query | ||||
| * | | | do propagation in a single query | Robin Appelman | 2016-04-25 | 6 | -27/+55 |
| | |/ | |/| | |||||
* | | | Merge pull request #24264 from owncloud/route_psr4 | Lukas Reschke | 2016-04-25 | 3 | -0/+0 |
|\ \ \ | | | | | | | | | Move \OC\Route to PSR-4 | ||||
| * | | | Move \OC\Route to PSR-4 | Roeland Jago Douma | 2016-04-25 | 3 | -0/+0 |
| |/ / | |||||
* | | | Merge pull request #24251 from owncloud/fix-mailer | Roeland Douma | 2016-04-25 | 2 | -3/+8 |
|\ \ \ | |/ / |/| | | Allow automatic dependency injection for OCP\Mail\Mailer | ||||
| * | | Fix the syntax and methods in the sample | Joas Schilling | 2016-04-25 | 1 | -3/+4 |
| | | | |||||
| * | | Allow automatic dependency injection for OCP\Mail\Mailer | Joas Schilling | 2016-04-25 | 1 | -0/+4 |
| |/ | |||||
* | | Merge pull request #24248 from owncloud/d--j-master | Thomas Müller | 2016-04-25 | 5 | -10/+34 |
|\ \ | | | | | | | D j master | ||||
| * \ | Merge branch 'master' of https://github.com/d--j/core into d--j-master | Thomas Müller | 2016-04-25 | 5 | -10/+34 |
| |\ \ | |||||
| | * | | Call private cache methods only for `OC\Files\Cache\Cache` | Daniel Jagszent | 2016-04-15 | 5 | -10/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two implementation detail methods `correctFolderSize` and `calculateFolderSize` should only be called for instances of `OC\Files\Cache\Cache`. This commit adds guarding checks whenever they are called. | ||||
* | | | | Merge branch 'patch-1' of https://github.com/weits/core into weits-patch-1 | Thomas Müller | 2016-04-25 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | solves problem with moving files via WebDAV | Petr Svoboda | 2016-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When moving files via WebDAV I sometimes got PHP Fatal error: Nesting level too deep - recursive dependency? in /var/www/owncloud/lib/private/files/view.php on line 729 This small change has fixed the problem for me | ||||
* | | | | Merge pull request #24205 from owncloud/scanner-locking | Thomas Müller | 2016-04-25 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | add locks in the scanner to prevent multiple scanners running on the … | ||||
| * | | | | add locks in the scanner to prevent multiple scanners running on the same files | Robin Appelman | 2016-04-25 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Move \OC\Updater to PSR-4 | Roeland Jago Douma | 2016-04-25 | 1 | -0/+0 |
|/ / / / | |||||
* | | | | Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_app | Björn Schießle | 2016-04-25 | 1 | -1/+2 |
|\ \ \ \ | |_|_|/ |/| | | | move federated sharing settings to the federatedfilesharing app | ||||
| * | | | move federated sharing settings to the federatedfilesharing app | Björn Schießle | 2016-04-22 | 1 | -1/+2 |
| | | | | |||||
* | | | | Move \OC\Files to PSR-4 | Roeland Jago Douma | 2016-04-24 | 65 | -0/+0 |
| | | | | |||||
* | | | | Merge pull request #24213 from owncloud/systemtag_psr4 | Lukas Reschke | 2016-04-24 | 4 | -0/+0 |
|\ \ \ \ | | | | | | | | | | | Move \OC\SystemTag to PSR-4 | ||||
| * | | | | Move \OC\SystemTag to PSR-4 | Roeland Jago Douma | 2016-04-22 | 4 | -0/+0 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-24 | 4 | -50/+66 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-23 | 4 | -48/+56 |
|/ / / / | |||||
* | | | | Move \OC\Encryption to PSR-4 | Roeland Jago Douma | 2016-04-22 | 16 | -0/+0 |
| | | | | |||||
* | | | | Merge pull request #24187 from ↵ | Thomas Müller | 2016-04-22 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/fs-initmountpoint-rethrowifusernotfoundagain Mark $usersSetup only if user was found in initMountPoints | ||||
| * | | | | Mark $usersSetup only if user was found in initMountPoints | Vincent Petry | 2016-04-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initMountPoints is marking a user as successfully initialized too early. If the user was not found an NoUserException was thrown, the second time initMountPoints is called would not rethrow the exception and happily continue. This fix makes sure that we consistently throw NoUserException when initMountPoints is called repeatedly with invalid users. | ||||
* | | | | | Merge pull request #24200 from owncloud/appframework_psr4 | Thomas Müller | 2016-04-22 | 24 | -18/+18 |
|\ \ \ \ \ | | | | | | | | | | | | | Move \OC\AppFramework to PSR-4 | ||||
| * | | | | | Fix inconsistent nameing of AppFramework | Roeland Jago Douma | 2016-04-22 | 6 | -13/+13 |
| | | | | | | |||||
| * | | | | | Move \OC\AppFramework to PSR-4 | Roeland Jago Douma | 2016-04-22 | 23 | -5/+5 |
| | |/ / / | |/| | | | | | | | | | | | | | * Also moved the autoloader setup a bit up since we need it in initpaths | ||||
* | | | | | Disable web updater if ldap or shibboleth are installed - refs ↵ | Thomas Müller | 2016-04-22 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | https://github.com/owncloud/core/issues/23913#issuecomment-213432232 | ||||
* | | | | | Merge pull request #24124 from owncloud/encryped-size-progation | Thomas Müller | 2016-04-22 | 2 | -1/+11 |
|\ \ \ \ \ | |/ / / / |/| | | | | dont do optimized size propagation for encrypted files | ||||
| * | | | | dont do optimized size propagation for encrypted files | Robin Appelman | 2016-04-21 | 2 | -1/+11 |
| | | | | | |||||
* | | | | | Merge pull request #23918 from owncloud/cruds-for-federated-shares | Björn Schießle | 2016-04-22 | 1 | -1/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | bring back CRUDS permissions for federated shares | ||||
| * | | | | | if share-permissions exists we use this information as indicator to check if ↵ | Björn Schießle | 2016-04-20 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | the file has changed or not | ||||
| * | | | | | ask for share-permissions on propfind | Björn Schießle | 2016-04-20 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #24085 from owncloud/feedback-on-app-migrations | Thomas Müller | 2016-04-22 | 4 | -37/+126 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | App migration steps need to push feedback to the user .... | ||||
| * | | | | | Adding pre- and post-migration repair steps | Thomas Müller | 2016-04-22 | 4 | -27/+106 |
| | | | | | | |||||
| * | | | | | Remove deprecated HTTPHelper from InfoParser | Thomas Müller | 2016-04-22 | 2 | -13/+23 |
| | | | | | | |||||
* | | | | | | Merge pull request #24166 from owncloud/drop-old-calendar-and-contacts-tables | Thomas Müller | 2016-04-22 | 1 | -0/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Drop old calendar and contacts tables | ||||
| * | | | | | | Drop old calendar and contacts tables - fixes #21889 | Thomas Müller | 2016-04-22 | 1 | -0/+7 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #24191 from owncloud/setup_psr4 | Roeland Douma | 2016-04-22 | 5 | -0/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Move \OC\Setup to PSR-4 | ||||
| * | | | | | | | Move \OC\Repair to PSR-4 | Roeland Jago Douma | 2016-04-22 | 5 | -0/+0 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #24183 from owncloud/change-background-job-sort-order | Thomas Müller | 2016-04-22 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Change the sort order of background jobs to be DESC instead of ASC | ||||
| * | | | | | | | Change the sort order of background jobs to be DESC instead of ASC | Joas Schilling | 2016-04-22 | 1 | -3/+3 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In theory, if your instance ever creates more jobs then your system cron can handle, the default background jobs get never executed anymore. Because everytime when the joblist returns the next job it looks for the next ID, however there is always a new next ID, so it will never wrap back to execute the low IDs. But when we change the sort order to be DESC, we make sure that these low IDs are always executed, before the system jumps back up to execute the new IDs. |