Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24352 from owncloud/psr4_more | Roeland Douma | 2016-04-29 | 11 | -0/+0 |
|\ | | | | | Move more of \OC to PSR-4 | ||||
| * | Move more of \OC to PSR-4 | Roeland Jago Douma | 2016-04-29 | 11 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \OC\DateTimeFormatter * \OC\DateTimeZone * \OC\ForbiddenException * \OC\HTTPHelper * \OC\HintException * \OC\LargeFileHelper * \OC\Log * \OC\NaturalSort * \OC\NavigationManager * \OC\NeedsUpdateException * \OC\NotSquareException | ||||
* | | Merge pull request #24305 from owncloud/update-show-repair-step-progress | Vincent Petry | 2016-04-29 | 3 | -34/+20 |
|\ \ | |/ |/| | [Update] show repair step progress ... | ||||
| * | Adding progress to web upgrade | Thomas Müller | 2016-04-28 | 2 | -5/+9 |
| | | |||||
| * | Remove emitter from class Repair | Thomas Müller | 2016-04-28 | 2 | -29/+8 |
| | | |||||
| * | Adding progress to occ maintenance:repair | Thomas Müller | 2016-04-28 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #24342 from owncloud/fix_private_root_files | Thomas Müller | 2016-04-29 | 11 | -0/+0 |
|\ \ | | | | | | | Moved some files in \OC to PSR-4 | ||||
| * | | Moved some files in \OC to PSR-4 | Roeland Jago Douma | 2016-04-29 | 11 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \OC\ActivityManager * \OC\AllConfig * \OC\AppConfig * \OC\AppHelper * \OC\Avatar * \OC\AvatarManager * \OC\CapabilitiesManager * \OC\Config * \OC\ContactsManager * \OC\DatabaseException * \OC\DatabaseSetupException | ||||
* | | | Merge pull request #24317 from owncloud/app-require-bits | Lukas Reschke | 2016-04-29 | 2 | -0/+13 |
|\ \ \ | |/ / |/| | | Allow app developers to specify the minimum int size | ||||
| * | | allow app developers to specify the minimum int size | Bernhard Posselt | 2016-04-28 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | simplify comparison remove additional null fix off by 1 error | ||||
* | | | Merge pull request #24332 from owncloud/http_psr4 | Thomas Müller | 2016-04-29 | 3 | -0/+0 |
|\ \ \ | |/ / |/| | | Move \OC\Http to PSR-4 | ||||
| * | | Move \OC\Http to PSR-4 | Roeland Jago Douma | 2016-04-28 | 3 | -0/+0 |
| |/ | |||||
* | | Merge pull request #24326 from owncloud/fix_for_php_7_0_6 | Roeland Douma | 2016-04-28 | 1 | -0/+3 |
|\ \ | | | | | | | Make ownCloud work again in php 7.0.6 | ||||
| * | | Make ownCloud work again in php 7.0.6 | Roeland Jago Douma | 2016-04-28 | 1 | -0/+3 |
| |/ | | | | | | | See https://bugs.php.net/bug.php?id=72117 | ||||
* | | Merge pull request #24274 from owncloud/async-repair-steps | Thomas Müller | 2016-04-28 | 3 | -0/+136 |
|\ \ | |/ |/| | Introduce background repair steps | ||||
| * | Introduce background repair steps | Thomas Müller | 2016-04-26 | 3 | -0/+136 |
| | | |||||
* | | Move \OC\L10N to PSR-4 | Roeland Jago Douma | 2016-04-27 | 2 | -0/+0 |
| | | |||||
* | | Move OC_L10N_String to legacy folder | Roeland Jago Douma | 2016-04-27 | 1 | -0/+0 |
| | | |||||
* | | Merge pull request #24286 from owncloud/hooks_psr4 | Thomas Müller | 2016-04-27 | 6 | -0/+0 |
|\ \ | | | | | | | Move \OC\Hooks to PSR-4 | ||||
| * | | Move \OC\Hooks to PSR-4 | Roeland Jago Douma | 2016-04-26 | 6 | -0/+0 |
| | | | |||||
* | | | Merge pull request #24246 from owncloud/local-invalid | Lukas Reschke | 2016-04-26 | 1 | -0/+3 |
|\ \ \ | |/ / |/| | | error out if a local storage isn't setup correctly | ||||
| * | | error out if a local storage isn't setup correctly | Robin Appelman | 2016-04-25 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #24277 from owncloud/more-sanity | Thomas Müller | 2016-04-26 | 1 | -1/+9 |
|\ \ \ | | | | | | | | | Don't write empty RewriteBase | ||||
| * | | | Don't write empty RewriteBase | Lukas Reschke | 2016-04-26 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | ownCloud may be configured to live at the root folder without a trailing slash being specified. In this case manually set the rewrite base to `/` | ||||
* | | | | Merge pull request #24269 from owncloud/backgroundjob_psr4 | Thomas Müller | 2016-04-26 | 6 | -0/+0 |
|\ \ \ \ | |/ / / |/| | | | Move \OC\BackgroundJob to PSR-4 | ||||
| * | | | Move \OC\BackgroundJob to PSR-4 | Roeland Jago Douma | 2016-04-26 | 6 | -0/+0 |
| | | | | |||||
* | | | | 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 | 20 | -188/+172 |
|\ \ \ \ | |_|/ / |/| | | | 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 | 20 | -188/+172 |
| | | | | | | | | | | | | | | | | 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 | 5 | -26/+55 |
|\ \ \ \ | | | | | | | | | | | do propagation in a single query | ||||
| * | | | | do propagation in a single query | Robin Appelman | 2016-04-25 | 5 | -26/+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 | 1 | -0/+4 |
|\ \ \ \ | |/ / / |/| | | | Allow automatic dependency injection for OCP\Mail\Mailer | ||||
| * | | | 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 |
| | | | |