aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-0920-16/+94
|
* [tx-robot] updated from transifexNextcloud bot2017-04-0818-38/+44
|
* [tx-robot] updated from transifexNextcloud bot2017-04-0718-30/+70
|
* Merge pull request #4234 from ↵Morris Jobke2017-04-067-452/+371
|\ | | | | | | | | nextcloud/backport-4066-always-fix-broken-dav-values [stable11] Directly fix invalid values of DTEND and DTSTART
| * Directly fix the valuesJoas Schilling2017-04-067-452/+371
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4235 from ↵Morris Jobke2017-04-061-1/+1
|\ \ | | | | | | | | | | | | nextcloud/backport-3857-legacy-caldav-endpoint-email-invitations [stable11] Fix scheduling plugin on legacy caldav endpoint
| * | Fix scheduling plugin on legacy caldav endpointJoas Schilling2017-04-061-1/+1
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4238 from nextcloud/4094-stable11Joas Schilling2017-04-061-2/+2
|\ \ | | | | | | [stable11] Fix LDAP description
| * | Fix LDAP descriptionMarius Blüm2017-04-061-2/+2
| |/ | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* / Also add the root of external storages to the file id listJoas Schilling2017-04-061-5/+13
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #4154 from nextcloud/stable11-4153Joas Schilling2017-04-061-1/+2
|\ | | | | [stable11] Fix upload of folders in Chrome
| * Fix upload of folders in ChromeMorris Jobke2017-04-061-1/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4229 from ↵Morris Jobke2017-04-062-16/+4
|\ \ | | | | | | | | | | | | nextcloud/stable11-dont-list-on-public-calendar-endpoint [stable11] Don't list on public calendar endpoints
| * | Don't list on public calendar endpointsLukas Reschke2017-04-052-16/+4
| | | | | | | | | | | | | | | | | | There is no need to allow listing here. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4228 from nextcloud/stable11-error-messagesMorris Jobke2017-04-061-1/+1
|\ \ \ | | | | | | | | [Stable11] Error messages
| * | | Replace unecessary unescaped prints with printLukas Reschke2017-04-051-1/+1
| |/ / | | | | | | | | | | | | | | | There's no need to have those unescaped from what I can see. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* / / [tx-robot] updated from transifexNextcloud bot2017-04-0628-48/+224
|/ /
* | 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-0532-56/+402
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-04-0422-38/+404
| |
* | 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-0320-8/+170
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-04-0212-2/+56
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-04-0122-168/+362
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-03-3144-148/+382
|/ /
* / [tx-robot] updated from transifexNextcloud bot2017-03-3088-172/+230
|/
* 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-2912-76/+362
| |
* | [tx-robot] updated from transifexNextcloud bot2017-03-2822-2/+184
| |
* | [tx-robot] updated from transifexNextcloud bot2017-03-27448-5360/+602
| |
* | [tx-robot] updated from transifexNextcloud bot2017-03-2620-14/+36
| |
* | [tx-robot] updated from transifexNextcloud bot2017-03-2530-84/+468
|/
* [tx-robot] updated from transifexNextcloud bot2017-03-2472-324/+346
|
* [tx-robot] updated from transifexNextcloud bot2017-03-238-2/+32
|
* [tx-robot] updated from transifexNextcloud bot2017-03-2240-14/+280
|
* 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-2238-50/+224
|/
* [stable11] Fix brandingLukas Reschke2017-03-211-1/+1
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* [tx-robot] updated from transifexNextcloud bot2017-03-2122-6/+90
|