Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #24251 from owncloud/fix-mailer | Roeland Douma | 2016-04-25 | 2 | -3/+8 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | 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 | |
|\ \ \ | ||||||
| * \ \ | 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 | |
* | | | | | 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 | |
* | | | | | 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 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 | 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 | 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 owncloud/fs-initmountpoint-rethrowifusernotfou... | Thomas Müller | 2016-04-22 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Mark $usersSetup only if user was found in initMountPoints | Vincent Petry | 2016-04-22 | 1 | -2/+2 | |
* | | | | | Merge pull request #24200 from owncloud/appframework_psr4 | Thomas Müller | 2016-04-22 | 24 | -18/+18 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Disable web updater if ldap or shibboleth are installed - refs https://github... | Thomas Müller | 2016-04-22 | 1 | -4/+8 | |
* | | | | | 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 | 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | if share-permissions exists we use this information as indicator to check if ... | Björn Schießle | 2016-04-20 | 1 | -0/+3 | |
| * | | | | | 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 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | 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 - 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\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 | Joas Schilling | 2016-04-22 | 1 | -3/+3 | |
| |/ / / / / / | ||||||
* / / / / / / | Throw NoUserException when attempting to init mount point for null user | Vincent Petry | 2016-04-22 | 1 | -0/+3 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #24173 from owncloud/master-certificate | Vincent Petry | 2016-04-22 | 1 | -0/+7 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [master] Ignore certificate file if it starts with file:// | Lukas Reschke | 2016-04-21 | 1 | -0/+7 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #24174 from owncloud/repair_psr4 | Thomas Müller | 2016-04-22 | 18 | -0/+0 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Move \OC\Repair to PSR-4 | Roeland Jago Douma | 2016-04-21 | 18 | -0/+0 | |
| |/ / / / | ||||||
* / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-22 | 8 | -0/+16 | |
|/ / / / | ||||||
* | | | | Merge pull request #24135 from owncloud/also-write-htaccess-from-cli | Thomas Müller | 2016-04-21 | 1 | -7/+15 | |
|\ \ \ \ | ||||||
| * | | | | Write .htaccess also from CLI | Lukas Reschke | 2016-04-20 | 1 | -7/+15 | |
* | | | | | Merge pull request #24133 from owncloud/tagging_psr4 | Joas Schilling | 2016-04-21 | 2 | -0/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | Move \OC\Tagging to PSR-4 | Roeland Jago Douma | 2016-04-20 | 2 | -0/+0 | |
| |/ / / / | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-21 | 74 | -174/+180 |