summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-08-02116-192/+614
|
* Merge pull request #5948 from nextcloud/remove-explicit-declarationMorris Jobke2017-08-0114-34/+34
|\ | | | | Remove explicit type hints for Controller
| * Remove explicit type hints for ControllerLukas Reschke2017-08-0114-34/+34
|/ | | | | | This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #5907 from nextcloud/add-metadata-to-throttle-callMorris Jobke2017-08-016-5/+28
|\ | | | | Add metadata to \OCP\AppFramework\Http\Response::throttle
| * Add metadata to \OCP\AppFramework\Http\Response::throttleLukas Reschke2017-07-276-5/+28
| | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/5891 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #5877 from nextcloud/typehint_middlewareMorris Jobke2017-08-0118-120/+140
|\ \ | | | | | | Prop argument type for Middleware
| * | Fix testsRoeland Jago Douma2017-07-315-69/+81
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Fix middleware implementations signaturesRoeland Jago Douma2017-07-3112-47/+55
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Prop argument type for MiddlewareRoeland Jago Douma2017-07-311-4/+4
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #5939 from nextcloud/dont-have-set-uid-as-displaynameMorris Jobke2017-08-011-12/+0
|\ \ \ | | | | | | | | Remove setUidAsDisplayName
| * | | Remove setUidAsDisplayNameLukas Reschke2017-07-311-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | This code is a leftover from the old Shibboleth implementation from ownCloud days, nowadays it causes more issues than it does good (such as https://github.com/nextcloud/user_saml/pull/137). Let's remove it for the future thus. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #5897 from nextcloud/add-share-mail-for-user-shareRoeland Jago Douma2017-08-015-11/+146
|\ \ \ \ | | | | | | | | | | Send an email once a file/folder is shared with a user
| * | | | Disable default activity email for incoming sharesMorris Jobke2017-07-312-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Send an email once a file/folder is shared with a userMorris Jobke2017-07-283-9/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * only if user has set an email address * only for user shares (no group shares for now) Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #5943 from nextcloud/update-URLs-in-testsRoeland Jago Douma2017-08-013-18/+18
|\ \ \ \ \ | | | | | | | | | | | | Update the URLs in tests to use example.org
| * | | | | Update the URLs in tests to use example.orgMorris Jobke2017-08-013-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #5942 from nextcloud/typo-tRicksLukas Reschke2017-08-011-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix typo ticks to tRicks
| * | | | | Update server.phpJos Poortvliet2017-08-011-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Typo: tips and tRicks ... Signed-off-by: Jos Poortvliet <jospoortvliet@gmail.com>
* | | | | Merge pull request #5847 from nextcloud/make-phan-config-more-strict-2Roeland Jago Douma2017-08-01145-317/+402
|\ \ \ \ \ | | | | | | | | | | | | Phan fixes
| * | | | | Fix testsRoeland Jago Douma2017-08-013-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix sabre testRoeland Jago Douma2017-08-011-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix OCS ExceptionRoeland Jago Douma2017-08-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix L10N::tRoeland Jago Douma2017-08-019-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | [files_external] Fix phpdocRoeland Jago Douma2017-08-013-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | [DAV] Fix URLUtil::splitPath usageRoeland Jago Douma2017-08-0114-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | [DAV][CalDAV] FixesRoeland Jago Douma2017-08-015-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix CommentsRoeland Jago Douma2017-08-015-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | [files_external] fix commandsRoeland Jago Douma2017-08-016-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | [files_external] Fix phpdocRoeland Jago Douma2017-08-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Some more invalid PHPDocs in legacy classesLukas Reschke2017-08-018-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Function also accepts intsLukas Reschke2017-08-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Properly name variableLukas Reschke2017-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | null is a valid parameterLukas Reschke2017-08-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Replace wrong PHPDocsLukas Reschke2017-08-0142-113/+136
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Properly suppressLukas Reschke2017-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Fix MigrationSchemaChecker and CryptoWrapperLukas Reschke2017-08-012-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Fix template functionsLukas Reschke2017-08-012-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Fix lib/public/User.phpLukas Reschke2017-08-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Fix settings/Controller/Lukas Reschke2017-08-014-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | AppData is no longer internalRoeland Jago Douma2017-08-014-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix OCSControllerRoeland Jago Douma2017-08-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix ContactsMenuControllerRoeland Jago Douma2017-08-011-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix AvatarControllerRoeland Jago Douma2017-08-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Add |null to PHPDocLukas Reschke2017-08-0111-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Fix \OCP\UtilLukas Reschke2017-08-012-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Suppress deprecated function in \OCP\JSONLukas Reschke2017-08-013-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Add proper PHPDocLukas Reschke2017-08-013-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Take IUser instead of UserLukas Reschke2017-08-014-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Return '0' instead of nullLukas Reschke2017-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Stricter phan config fixesLukas Reschke2017-08-019-22/+22
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>