summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24352 from owncloud/psr4_moreRoeland Douma2016-04-2911-0/+0
|\ | | | | Move more of \OC to PSR-4
| * Move more of \OC to PSR-4Roeland Jago Douma2016-04-2911-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-progressVincent Petry2016-04-293-34/+20
|\ \ | |/ |/| [Update] show repair step progress ...
| * Adding progress to web upgradeThomas Müller2016-04-282-5/+9
| |
| * Remove emitter from class RepairThomas Müller2016-04-282-29/+8
| |
| * Adding progress to occ maintenance:repairThomas Müller2016-04-281-1/+4
| |
* | Merge pull request #24342 from owncloud/fix_private_root_filesThomas Müller2016-04-2911-0/+0
|\ \ | | | | | | Moved some files in \OC to PSR-4
| * | Moved some files in \OC to PSR-4Roeland Jago Douma2016-04-2911-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-bitsLukas Reschke2016-04-292-0/+13
|\ \ \ | |/ / |/| | Allow app developers to specify the minimum int size
| * | allow app developers to specify the minimum int sizeBernhard Posselt2016-04-282-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | simplify comparison remove additional null fix off by 1 error
* | | Merge pull request #24332 from owncloud/http_psr4Thomas Müller2016-04-293-0/+0
|\ \ \ | |/ / |/| | Move \OC\Http to PSR-4
| * | Move \OC\Http to PSR-4Roeland Jago Douma2016-04-283-0/+0
| |/
* | Merge pull request #24326 from owncloud/fix_for_php_7_0_6Roeland Douma2016-04-281-0/+3
|\ \ | | | | | | Make ownCloud work again in php 7.0.6
| * | Make ownCloud work again in php 7.0.6Roeland Jago Douma2016-04-281-0/+3
| |/ | | | | | | See https://bugs.php.net/bug.php?id=72117
* | Merge pull request #24274 from owncloud/async-repair-stepsThomas Müller2016-04-283-0/+136
|\ \ | |/ |/| Introduce background repair steps
| * Introduce background repair stepsThomas Müller2016-04-263-0/+136
| |
* | Move \OC\L10N to PSR-4Roeland Jago Douma2016-04-272-0/+0
| |
* | Move OC_L10N_String to legacy folderRoeland Jago Douma2016-04-271-0/+0
| |
* | Merge pull request #24286 from owncloud/hooks_psr4Thomas Müller2016-04-276-0/+0
|\ \ | | | | | | Move \OC\Hooks to PSR-4
| * | Move \OC\Hooks to PSR-4Roeland Jago Douma2016-04-266-0/+0
| | |
* | | Merge pull request #24246 from owncloud/local-invalidLukas Reschke2016-04-261-0/+3
|\ \ \ | |/ / |/| | error out if a local storage isn't setup correctly
| * | error out if a local storage isn't setup correctlyRobin Appelman2016-04-251-0/+3
| | |
* | | Merge pull request #24277 from owncloud/more-sanityThomas Müller2016-04-261-1/+9
|\ \ \ | | | | | | | | Don't write empty RewriteBase
| * | | Don't write empty RewriteBaseLukas Reschke2016-04-261-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_psr4Thomas Müller2016-04-266-0/+0
|\ \ \ \ | |/ / / |/| | | Move \OC\BackgroundJob to PSR-4
| * | | Move \OC\BackgroundJob to PSR-4Roeland Jago Douma2016-04-266-0/+0
| | | |
* | | | Merge pull request #24256 from owncloud/scanner-propagateMorris Jobke2016-04-261-0/+16
|\ \ \ \ | | | | | | | | | | triger the propagator from the command line scanner
| * | | | triger the propagator from the command line scannerRobin Appelman2016-04-251-0/+16
| | | | |
* | | | | Merge pull request #24262 from owncloud/fix-24228Morris Jobke2016-04-261-1/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | check whether index is set before using it
| * | | | check whether index is set before using itArthur Schiwon2016-04-251-1/+2
| |/ / /
* | | | Merge pull request #24199 from owncloud/ocp-repairMorris Jobke2016-04-2620-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üller2016-04-2520-188/+172
| | | | | | | | | | | | | | | | interface - refs #24198
* | | | Move \OC\Search to PSR-4Roeland Jago Douma2016-04-265-0/+0
| | | |
* | | | Merge pull request #22648 from owncloud/propagate-singleThomas Müller2016-04-255-26/+55
|\ \ \ \ | | | | | | | | | | do propagation in a single query
| * | | | do propagation in a single queryRobin Appelman2016-04-255-26/+55
| | |/ / | |/| |
* | | | Merge pull request #24264 from owncloud/route_psr4Lukas Reschke2016-04-253-0/+0
|\ \ \ \ | | | | | | | | | | Move \OC\Route to PSR-4
| * | | | Move \OC\Route to PSR-4Roeland Jago Douma2016-04-253-0/+0
| |/ / /
* | | | Merge pull request #24251 from owncloud/fix-mailerRoeland Douma2016-04-251-0/+4
|\ \ \ \ | |/ / / |/| | | Allow automatic dependency injection for OCP\Mail\Mailer
| * | | Allow automatic dependency injection for OCP\Mail\MailerJoas Schilling2016-04-251-0/+4
| |/ /
* | | Merge pull request #24248 from owncloud/d--j-masterThomas Müller2016-04-255-10/+34
|\ \ \ | | | | | | | | D j master
| * \ \ Merge branch 'master' of https://github.com/d--j/core into d--j-masterThomas Müller2016-04-255-10/+34
| |\ \ \
| | * | | Call private cache methods only for `OC\Files\Cache\Cache`Daniel Jagszent2016-04-155-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-1Thomas Müller2016-04-251-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | solves problem with moving files via WebDAVPetr Svoboda2016-04-191-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-lockingThomas Müller2016-04-251-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 filesRobin Appelman2016-04-251-0/+2
| | |_|_|/ | |/| | |
* / | | | Move \OC\Updater to PSR-4Roeland Jago Douma2016-04-251-0/+0
|/ / / /
* | | | Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_appBjörn Schießle2016-04-251-1/+2
|\ \ \ \ | |_|_|/ |/| | | move federated sharing settings to the federatedfilesharing app
| * | | move federated sharing settings to the federatedfilesharing appBjörn Schießle2016-04-221-1/+2
| | | |
* | | | Move \OC\Files to PSR-4Roeland Jago Douma2016-04-2465-0/+0
| | | |