summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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-2621-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üller2016-04-2521-148/+239
| | | | | | | | | | | | 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-256-27/+55
|\ \ \ | | | | | | | | do propagation in a single query
| * | | do propagation in a single queryRobin Appelman2016-04-256-27/+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-252-3/+8
|\ \ \ | |/ / |/| | Allow automatic dependency injection for OCP\Mail\Mailer
| * | Fix the syntax and methods in the sampleJoas Schilling2016-04-251-3/+4
| | |
| * | 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
| | | |
* | | | Merge pull request #24213 from owncloud/systemtag_psr4Lukas Reschke2016-04-244-0/+0
|\ \ \ \ | | | | | | | | | | Move \OC\SystemTag to PSR-4
| * | | | Move \OC\SystemTag to PSR-4Roeland Jago Douma2016-04-224-0/+0
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-244-50/+66
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-234-48/+56
|/ / / /
* | | | Move \OC\Encryption to PSR-4Roeland Jago Douma2016-04-2216-0/+0
| | | |
* | | | Merge pull request #24187 from ↵Thomas Müller2016-04-221-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/fs-initmountpoint-rethrowifusernotfoundagain Mark $usersSetup only if user was found in initMountPoints
| * | | | Mark $usersSetup only if user was found in initMountPointsVincent Petry2016-04-221-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_psr4Thomas Müller2016-04-2224-18/+18
|\ \ \ \ \ | | | | | | | | | | | | Move \OC\AppFramework to PSR-4
| * | | | | Fix inconsistent nameing of AppFrameworkRoeland Jago Douma2016-04-226-13/+13
| | | | | |
| * | | | | Move \OC\AppFramework to PSR-4Roeland Jago Douma2016-04-2223-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üller2016-04-221-4/+8
| | | | | | | | | | | | | | | | | | | | https://github.com/owncloud/core/issues/23913#issuecomment-213432232
* | | | | Merge pull request #24124 from owncloud/encryped-size-progationThomas Müller2016-04-222-1/+11
|\ \ \ \ \ | |/ / / / |/| | | | dont do optimized size propagation for encrypted files
| * | | | dont do optimized size propagation for encrypted filesRobin Appelman2016-04-212-1/+11
| | | | |
* | | | | Merge pull request #23918 from owncloud/cruds-for-federated-sharesBjörn Schießle2016-04-221-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ßle2016-04-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | the file has changed or not
| * | | | | ask for share-permissions on propfindBjörn Schießle2016-04-201-1/+2
| | | | | |
* | | | | | Merge pull request #24085 from owncloud/feedback-on-app-migrationsThomas Müller2016-04-224-37/+126
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | App migration steps need to push feedback to the user ....
| * | | | | Adding pre- and post-migration repair stepsThomas Müller2016-04-224-27/+106
| | | | | |
| * | | | | Remove deprecated HTTPHelper from InfoParserThomas Müller2016-04-222-13/+23
| | | | | |
* | | | | | Merge pull request #24166 from owncloud/drop-old-calendar-and-contacts-tablesThomas Müller2016-04-221-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Drop old calendar and contacts tables
| * | | | | | Drop old calendar and contacts tables - fixes #21889Thomas Müller2016-04-221-0/+7
| | | | | | |
* | | | | | | Merge pull request #24191 from owncloud/setup_psr4Roeland Douma2016-04-225-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move \OC\Setup to PSR-4
| * | | | | | | Move \OC\Repair to PSR-4Roeland Jago Douma2016-04-225-0/+0
| |/ / / / / /
* | | | | | | Merge pull request #24183 from owncloud/change-background-job-sort-orderThomas Müller2016-04-221-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 ASCJoas Schilling2016-04-221-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.