summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Fix testsMorris Jobke2017-09-052-2/+6
| * | | Fix unit testsJoas Schilling2017-09-051-1/+1
| * | | Merge setMetaData into constructorJoas Schilling2017-09-0510-41/+34
| * | | Set the meta data before everythingJoas Schilling2017-09-051-12/+11
| * | | Fix naming of user id in email meta dataJoas Schilling2017-09-051-4/+4
| * | | Implement metadata for email templates of remaining emailsMorris Jobke2017-09-054-0/+38
|/ / /
* / / [tx-robot] updated from transifexNextcloud bot2017-09-052-0/+14
|/ /
* | Merge pull request #6355 from nextcloud/6221-12blizzz2017-09-043-19/+50
|\ \
| * | Correctly format OCS response with favoritesRoeland Jago Douma2017-09-043-19/+50
* | | Merge pull request #6333 from nextcloud/new-dav-event-stable12Morris Jobke2017-09-042-0/+8
|\ \ \ | |/ / |/| |
| * | also allow to register additional plugins if the old endpoint is usedBjoern Schiessle2017-09-011-0/+5
| * | add a new dav event to allow apps to register their own sabredav pluginsBjoern Schiessle2017-09-011-0/+3
* | | [tx-robot] updated from transifexNextcloud bot2017-09-034-2/+38
* | | [tx-robot] updated from transifexNextcloud bot2017-09-0218-4/+106
|/ /
* / [tx-robot] updated from transifexNextcloud bot2017-09-0110-8/+40
|/
* [tx-robot] updated from transifexNextcloud bot2017-08-3144-12/+174
* Merge pull request #6285 from nextcloud/generate-system-wide-key-pair-12Morris Jobke2017-08-308-29/+230
|\
| * update autoloaderBjoern Schiessle2017-08-302-0/+2
| * move repair step to stable12Bjoern Schiessle2017-08-302-3/+3
| * Bump versionRoeland Jago Douma2017-08-301-1/+1
| * add prefix to user and system keys to avoid name collisionsBjoern Schiessle2017-08-304-8/+122
| * extend the identity proof manager to allow system wide key pairsBjoern Schiessle2017-08-303-23/+108
* | Merge pull request #5841 from nextcloud/bugfix-stable12/2855/dont_send_invita...Morris Jobke2017-08-304-5/+134
|\ \ | |/ |/|
| * Sabre/VObject returns DateTimeImmutable, not a simple DateTimeGeorg Ehrke2017-07-232-7/+13
| * don't send invitation emails for past eventsGeorg Ehrke2017-07-234-5/+128
* | Merge pull request #6311 from nextcloud/stable12-specify-slo-urlMorris Jobke2017-08-308-38/+46
|\ \
| * | Inject \OCP\IURLGenerator to make tests workLukas Reschke2017-08-304-5/+16
| * | Properly allow \OCP\Authentication\IApacheBackend to specify logout URLLukas Reschke2017-08-308-37/+34
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-08-30104-506/+596
* | Merge pull request #6300 from nextcloud/add-share-withMorris Jobke2017-08-292-0/+2
|\ \
| * | Add shareWith to email template metadataMorris Jobke2017-08-292-0/+2
* | | Merge pull request #6278 from nextcloud/stable12-6182-fixes-in-files-drop-jsMorris Jobke2017-08-291-16/+14
|\ \ \ | |/ / |/| |
| * | Do not iterate over the filesDaniel Calviño Sánchez2017-08-271-5/+4
| * | Replace fileName variable with data.files[0].nameDaniel Calviño Sánchez2017-08-271-8/+6
| * | Update the whole file item instead of only its contentsDaniel Calviño Sánchez2017-08-271-7/+8
| * | Remove "errorThrown" parameterDaniel Calviño Sánchez2017-08-271-1/+1
* | | Merge pull request #6284 from nextcloud/add-new-propfind-stable12Björn Schießle2017-08-291-1/+7
|\ \ \
| * | | add propfind to detect encryption statusBjoern Schiessle2017-08-281-1/+7
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-2914-28/+52
* | | | Merge pull request #6287 from nextcloud/12-6255Morris Jobke2017-08-286-4/+50
|\ \ \ \ | |/ / / |/| | |
| * | | Allow the expiration date to be set to nullMorris Jobke2017-08-282-3/+3
| * | | Allow the expiration date to be set to nullMorris Jobke2017-08-282-2/+4
| * | | Also for reset passwordJoas Schilling2017-08-281-0/+3
| * | | Add meta information to emails for better customisationJoas Schilling2017-08-284-4/+45
|/ / /
* / / [tx-robot] updated from transifexNextcloud bot2017-08-2812-162/+178
|/ /
* | Merge pull request #6270 from nextcloud/6252-12Roeland Jago Douma2017-08-263-0/+6
|\ \
| * | Don't try the actual file upload if the checks already error outRoeland Jago Douma2017-08-263-0/+6
* | | Merge pull request #6269 from nextcloud/6251-12Roeland Jago Douma2017-08-261-1/+1
|\ \ \
| * | | Don't fetch the translation from core but from filesRoeland Jago Douma2017-08-261-1/+1
| |/ /
* | | Merge pull request #6268 from nextcloud/smb-2.0.2-12Roeland Jago Douma2017-08-2613-52/+265
|\ \ \