summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5923 from nextcloud/expire-federation-jobsRoeland Jago Douma2017-08-0215-219/+400
|\
| * Close all the cursorsJoas Schilling2017-08-021-12/+26
| * Use automatic injection whenever possibleJoas Schilling2017-08-026-80/+38
| * Use ITimeFactoryRoeland Jago Douma2017-08-019-103/+231
| * we don't need to remove the job manually here, even if we ask once more the o...Bjoern Schiessle2017-08-012-11/+0
| * update unit testsBjoern Schiessle2017-08-012-12/+34
| * cleanup constructorsBjoern Schiessle2017-08-012-53/+33
| * expire requestSharedSecret job after 30 daysBjoern Schiessle2017-08-013-5/+48
| * expire getShareadSecret job after 30 daysBjoern Schiessle2017-08-013-12/+60
* | Merge pull request #5952 from nextcloud/appmanager-isshippedMorris Jobke2017-08-024-24/+16
|\ \
| * | Use public methods for OC_App::isShippedMorris Jobke2017-08-014-24/+16
* | | Merge pull request #5949 from nextcloud/fix-broken-codeMorris Jobke2017-08-021-0/+1
|\ \ \
| * | | Use IUserLukas Reschke2017-08-021-0/+1
* | | | Merge pull request #5957 from nextcloud/updatenotification-show-statusMorris Jobke2017-08-023-3/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Show correct status in update notificationMorris Jobke2017-08-023-3/+9
|/ / /
* | | Merge pull request #5951 from nextcloud/use-public-methodMorris Jobke2017-08-021-8/+8
|\ \ \
| * | | Use public API instead of privateLukas Reschke2017-08-011-8/+8
| |/ /
* | | [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 ControllerLukas Reschke2017-08-0114-34/+34
|/ /
* | Merge pull request #5907 from nextcloud/add-metadata-to-throttle-callMorris Jobke2017-08-016-5/+28
|\ \
| * | Add metadata to \OCP\AppFramework\Http\Response::throttleLukas Reschke2017-07-276-5/+28
* | | Merge pull request #5877 from nextcloud/typehint_middlewareMorris Jobke2017-08-0118-120/+140
|\ \ \
| * | | Fix testsRoeland Jago Douma2017-07-315-69/+81
| * | | Fix middleware implementations signaturesRoeland Jago Douma2017-07-3112-47/+55
| * | | Prop argument type for MiddlewareRoeland Jago Douma2017-07-311-4/+4
* | | | Merge pull request #5939 from nextcloud/dont-have-set-uid-as-displaynameMorris Jobke2017-08-011-12/+0
|\ \ \ \
| * | | | Remove setUidAsDisplayNameLukas Reschke2017-07-311-12/+0
* | | | | Merge pull request #5897 from nextcloud/add-share-mail-for-user-shareRoeland Jago Douma2017-08-015-11/+146
|\ \ \ \ \
| * | | | | Disable default activity email for incoming sharesMorris Jobke2017-07-312-2/+2
| * | | | | Send an email once a file/folder is shared with a userMorris Jobke2017-07-283-9/+144
* | | | | | Merge pull request #5943 from nextcloud/update-URLs-in-testsRoeland Jago Douma2017-08-013-18/+18
|\ \ \ \ \ \
| * | | | | | Update the URLs in tests to use example.orgMorris Jobke2017-08-013-18/+18
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #5942 from nextcloud/typo-tRicksLukas Reschke2017-08-011-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update server.phpJos Poortvliet2017-08-011-1/+1
|/ / / / /
* | | | | Merge pull request #5847 from nextcloud/make-phan-config-more-strict-2Roeland Jago Douma2017-08-01145-317/+402
|\ \ \ \ \
| * | | | | Fix testsRoeland Jago Douma2017-08-013-4/+5
| * | | | | Fix sabre testRoeland Jago Douma2017-08-011-3/+5
| * | | | | Fix OCS ExceptionRoeland Jago Douma2017-08-011-0/+4
| * | | | | Fix L10N::tRoeland Jago Douma2017-08-019-20/+20
| * | | | | [files_external] Fix phpdocRoeland Jago Douma2017-08-013-3/+3
| * | | | | [DAV] Fix URLUtil::splitPath usageRoeland Jago Douma2017-08-0114-23/+23
| * | | | | [DAV][CalDAV] FixesRoeland Jago Douma2017-08-015-14/+15
| * | | | | Fix CommentsRoeland Jago Douma2017-08-015-13/+12
| * | | | | [files_external] fix commandsRoeland Jago Douma2017-08-016-13/+13
| * | | | | [files_external] Fix phpdocRoeland Jago Douma2017-08-012-2/+2
| * | | | | Some more invalid PHPDocs in legacy classesLukas Reschke2017-08-018-11/+21
| * | | | | Function also accepts intsLukas Reschke2017-08-012-2/+2
| * | | | | Properly name variableLukas Reschke2017-08-011-1/+1
| * | | | | null is a valid parameterLukas Reschke2017-08-011-2/+2