Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #4228 from nextcloud/stable11-error-messages | Morris Jobke | 2017-04-06 | 3 | -4/+5 | |
|\ \ \ | | | | | | | | | [Stable11] Error messages | |||||
| * | | | Replace unecessary unescaped prints with print | Lukas Reschke | 2017-04-05 | 2 | -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 message | Lukas Reschke | 2017-04-05 | 1 | -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 transifex | Nextcloud bot | 2017-04-06 | 208 | -430/+678 | |
|/ / | ||||||
* | | Merge pull request #4214 from nextcloud/share-dialog-no-avatars | Roeland Jago Douma | 2017-04-05 | 1 | -5/+7 | |
|\ \ | | | | | | | don't try to render the avatars if avatars are disabled | |||||
| * | | don't try to render the avatars if avatars are disabled | Bjoern Schiessle | 2017-04-05 | 1 | -5/+7 | |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | |||||
* | | | Merge pull request #4207 from nextcloud/masterkey-publiclink-nc11 | Roeland Jago Douma | 2017-04-05 | 2 | -18/+34 | |
|\ \ \ | |/ / |/| | | [stable11] Make public links work with master key | |||||
| * | | Use master key for public links as well | Vincent Petry | 2017-04-04 | 2 | -23/+35 | |
| | | | ||||||
| * | | Add tests for null user | Vincent Petry | 2017-04-04 | 1 | -1/+5 | |
| | | | ||||||
| * | | Fix public link for master key | Vincent Petry | 2017-04-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | In public link mode there is no session, so the code should use the public key instead. | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-05 | 40 | -82/+550 | |
|/ / | ||||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-04 | 34 | -38/+962 | |
| | | ||||||
* | | Merge pull request #4167 from ↵ | Roeland Jago Douma | 2017-04-03 | 1 | -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 calendar | Joas Schilling | 2017-03-30 | 1 | -2/+2 | |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-03 | 32 | -24/+204 | |
| | | | ||||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-02 | 18 | -2/+64 | |
| | | | ||||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-01 | 26 | -200/+1036 | |
| | | | ||||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-31 | 54 | -224/+568 | |
| | | | ||||||
* | | | Merge pull request #3415 from ↵ | Roeland Jago Douma | 2017-03-30 | 3 | -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 11 | Joas Schilling | 2017-03-30 | 1 | -0/+23 | |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
| * | | fix version number | Morris Jobke | 2017-03-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
| * | | Fix return value of getAllowedPreviousVersions() | Morris Jobke | 2017-03-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | |||||
| * | | Prevent migration from ownCloud 10 to Nextcloud 11 | Joas Schilling | 2017-03-30 | 3 | -105/+48 | |
|/ / | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* / | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-30 | 98 | -308/+402 | |
|/ | ||||||
* | Merge pull request #4029 from nextcloud/federation-fixes-stable11 | Morris Jobke | 2017-03-28 | 6 | -65/+121 | |
|\ | | | | | Federation fixes stable11 | |||||
| * | fix tests | Bjoern Schiessle | 2017-03-24 | 2 | -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 contacts | Joas Schilling | 2017-03-24 | 1 | -16/+31 | |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
| * | use right format for avatars | Bjoern Schiessle | 2017-03-24 | 2 | -5/+5 | |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | |||||
| * | don't add empty values to the vcard | Bjoern Schiessle | 2017-03-24 | 3 | -40/+56 | |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | |||||
| * | only execute code if exception was thrown by the corresponding controller | Bjoern Schiessle | 2017-03-24 | 2 | -3/+7 | |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | |||||
| * | fix the way we create a new vcard to avoid to have multiple UIDs | Bjoern Schiessle | 2017-03-24 | 1 | -1/+2 | |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-29 | 52 | -76/+418 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-28 | 88 | -52/+254 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-27 | 700 | -15258/+1184 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-26 | 34 | -24/+76 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-25 | 50 | -86/+494 | |
|/ | ||||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-24 | 176 | -430/+452 | |
| | ||||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-23 | 10 | -2/+52 | |
| | ||||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-22 | 62 | -20/+348 | |
| | ||||||
* | Merge pull request #3981 from nextcloud/stable11-3974 | Joas Schilling | 2017-03-22 | 1 | -1/+1 | |
|\ | | | | | [stable11] Fix reshare with user activity message | |||||
| * | Fix reshare with user activity message | Joas Schilling | 2017-03-21 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-22 | 62 | -52/+272 | |
|/ | ||||||
* | Merge pull request #3969 from nextcloud/stable11-fix-branding | Lukas Reschke | 2017-03-21 | 1 | -1/+1 | |
|\ | | | | | [stable11] Fix branding and show Nextcloud | |||||
| * | [stable11] Fix branding | Lukas Reschke | 2017-03-21 | 1 | -1/+1 | |
|/ | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-21 | 44 | -14/+130 | |
| | ||||||
* | Merge pull request #3765 from ↵ | Morris Jobke | 2017-03-20 | 1 | -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 engine | Joas Schilling | 2017-03-08 | 1 | -1/+20 | |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-20 | 28 | -438/+1386 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-19 | 8 | -0/+348 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-18 | 32 | -178/+490 | |
| | |