summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #24251 from owncloud/fix-mailerRoeland Douma2016-04-252-3/+8
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \
| * \ \ 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
* | | | | 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
* | | | | 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 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 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-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 owncloud/fs-initmountpoint-rethrowifusernotfou...Thomas Müller2016-04-221-2/+2
|\ \ \ \
| * | | | Mark $usersSetup only if user was found in initMountPointsVincent Petry2016-04-221-2/+2
* | | | | Merge pull request #24200 from owncloud/appframework_psr4Thomas Müller2016-04-2224-18/+18
|\ \ \ \ \
| * | | | | Fix inconsistent nameing of AppFrameworkRoeland Jago Douma2016-04-226-13/+13
| * | | | | Move \OC\AppFramework to PSR-4Roeland Jago Douma2016-04-2223-5/+5
| | |/ / / | |/| | |
* | | | | Disable web updater if ldap or shibboleth are installed - refs https://github...Thomas Müller2016-04-221-4/+8
* | | | | Merge pull request #24124 from owncloud/encryped-size-progationThomas Müller2016-04-222-1/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
|\ \ \ \ \
| * | | | | if share-permissions exists we use this information as indicator to check if ...Björn Schießle2016-04-201-0/+3
| * | | | | 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | 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 - fixes #21889Thomas Müller2016-04-221-0/+7
* | | | | | | Merge pull request #24191 from owncloud/setup_psr4Roeland Douma2016-04-225-0/+0
|\ \ \ \ \ \ \
| * | | | | | | 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 ASCJoas Schilling2016-04-221-3/+3
| |/ / / / / /
* / / / / / / Throw NoUserException when attempting to init mount point for null userVincent Petry2016-04-221-0/+3
|/ / / / / /
* | | | | | Merge pull request #24173 from owncloud/master-certificateVincent Petry2016-04-221-0/+7
|\ \ \ \ \ \
| * | | | | | [master] Ignore certificate file if it starts with file://Lukas Reschke2016-04-211-0/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #24174 from owncloud/repair_psr4Thomas Müller2016-04-2218-0/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Move \OC\Repair to PSR-4Roeland Jago Douma2016-04-2118-0/+0
| |/ / / /
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2016-04-228-0/+16
|/ / / /
* | | | Merge pull request #24135 from owncloud/also-write-htaccess-from-cliThomas Müller2016-04-211-7/+15
|\ \ \ \
| * | | | Write .htaccess also from CLILukas Reschke2016-04-201-7/+15
* | | | | Merge pull request #24133 from owncloud/tagging_psr4Joas Schilling2016-04-212-0/+0
|\ \ \ \ \
| * | | | | Move \OC\Tagging to PSR-4Roeland Jago Douma2016-04-202-0/+0
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2174-174/+180