summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #4228 from nextcloud/stable11-error-messagesMorris Jobke2017-04-063-4/+5
|\ \ \ | | | | | | | | [Stable11] Error messages
| * | | Replace unecessary unescaped prints with printLukas Reschke2017-04-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | There's no need to have those unescaped from what I can see. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Remove verbose error messageLukas Reschke2017-04-051-2/+3
| |/ / | | | | | | | | | | | | | | | There's no need to have this included in the error message. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* / / [tx-robot] updated from transifexNextcloud bot2017-04-06208-430/+678
|/ /
* | Merge pull request #4214 from nextcloud/share-dialog-no-avatarsRoeland Jago Douma2017-04-051-5/+7
|\ \ | | | | | | don't try to render the avatars if avatars are disabled
| * | don't try to render the avatars if avatars are disabledBjoern Schiessle2017-04-051-5/+7
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #4207 from nextcloud/masterkey-publiclink-nc11Roeland Jago Douma2017-04-052-18/+34
|\ \ \ | |/ / |/| | [stable11] Make public links work with master key
| * | Use master key for public links as wellVincent Petry2017-04-042-23/+35
| | |
| * | Add tests for null userVincent Petry2017-04-041-1/+5
| | |
| * | Fix public link for master keyVincent Petry2017-04-041-1/+1
| | | | | | | | | | | | | | | In public link mode there is no session, so the code should use the public key instead.
* | | [tx-robot] updated from transifexNextcloud bot2017-04-0540-82/+550
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-04-0434-38/+962
| |
* | Merge pull request #4167 from ↵Roeland Jago Douma2017-04-031-2/+2
|\ \ | | | | | | | | | | | | nextcloud/backport-4166-invalid-int-for-transparency-on-calendars [stable11] Make sure transparency is an integer when saving a calendar
| * | Make sure transparency is an integer when saving a calendarJoas Schilling2017-03-301-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-0332-24/+204
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-04-0218-2/+64
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-04-0126-200/+1036
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-03-3154-224/+568
| | |
* | | Merge pull request #3415 from ↵Roeland Jago Douma2017-03-303-104/+70
|\ \ \ | |/ / |/| | | | | | | | nextcloud/backport-3184-migration-restriction-by-vendor-version [stable11] Prevent migration from ownCloud 10 to Nextcloud 11
| * | Fix the update from NC 10 and 11 to the latest NC 11Joas Schilling2017-03-301-0/+23
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | fix version numberMorris Jobke2017-03-301-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Fix return value of getAllowedPreviousVersions()Morris Jobke2017-03-301-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Prevent migration from ownCloud 10 to Nextcloud 11Joas Schilling2017-03-303-105/+48
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / [tx-robot] updated from transifexNextcloud bot2017-03-3098-308/+402
|/
* Merge pull request #4029 from nextcloud/federation-fixes-stable11Morris Jobke2017-03-286-65/+121
|\ | | | | Federation fixes stable11
| * fix testsBjoern Schiessle2017-03-242-8/+28
| | | | | | | | | | | | calling getAbsoluteBundlePath() in the constructor makes other tests fail Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * Load cert file before syncing addressbooks and contactsJoas Schilling2017-03-241-16/+31
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * use right format for avatarsBjoern Schiessle2017-03-242-5/+5
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * don't add empty values to the vcardBjoern Schiessle2017-03-243-40/+56
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * only execute code if exception was thrown by the corresponding controllerBjoern Schiessle2017-03-242-3/+7
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * fix the way we create a new vcard to avoid to have multiple UIDsBjoern Schiessle2017-03-241-1/+2
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | [tx-robot] updated from transifexNextcloud bot2017-03-2952-76/+418
| |
* | [tx-robot] updated from transifexNextcloud bot2017-03-2888-52/+254
| |
* | [tx-robot] updated from transifexNextcloud bot2017-03-27700-15258/+1184
| |
* | [tx-robot] updated from transifexNextcloud bot2017-03-2634-24/+76
| |
* | [tx-robot] updated from transifexNextcloud bot2017-03-2550-86/+494
|/
* [tx-robot] updated from transifexNextcloud bot2017-03-24176-430/+452
|
* [tx-robot] updated from transifexNextcloud bot2017-03-2310-2/+52
|
* [tx-robot] updated from transifexNextcloud bot2017-03-2262-20/+348
|
* Merge pull request #3981 from nextcloud/stable11-3974Joas Schilling2017-03-221-1/+1
|\ | | | | [stable11] Fix reshare with user activity message
| * Fix reshare with user activity messageJoas Schilling2017-03-211-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-03-2262-52/+272
|/
* Merge pull request #3969 from nextcloud/stable11-fix-brandingLukas Reschke2017-03-211-1/+1
|\ | | | | [stable11] Fix branding and show Nextcloud
| * [stable11] Fix brandingLukas Reschke2017-03-211-1/+1
|/ | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* [tx-robot] updated from transifexNextcloud bot2017-03-2144-14/+130
|
* Merge pull request #3765 from ↵Morris Jobke2017-03-201-1/+20
|\ | | | | | | | | nextcloud/backport-3725-mimetype-detection-on-public-uploads [stable11] Fix mimetype detection on public uploads for the workflow engine
| * Fix mimetype detection on public uploads for the workflow engineJoas Schilling2017-03-081-1/+20
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-03-2028-438/+1386
| |
* | [tx-robot] updated from transifexNextcloud bot2017-03-198-0/+348
| |
* | [tx-robot] updated from transifexNextcloud bot2017-03-1832-178/+490
| |