Commit Graph

36859 Commits

Author SHA1 Message Date
Nextcloud bot 96c20ebddb
[tx-robot] updated from transifex 2017-04-06 00:08:02 +00:00
Lukas Reschke 7f199a2c6b
[stable11] Increase to 11.0.3 RC1
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-05 23:27:20 +02:00
Lukas Reschke 022768387c
Don't list on public calendar endpoints
There is no need to allow listing here.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-05 23:18:13 +02:00
Lukas Reschke f9b258a371
Replace unecessary unescaped prints with print
There's no need to have those unescaped from what I can see.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-05 23:14:12 +02:00
Lukas Reschke 462073c686
Remove verbose error message
There's no need to have this included in the error message.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-05 23:14:04 +02:00
Lukas Reschke cabb52b909
Add integration tests for token auth
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-05 23:00:53 +02:00
Robin Appelman f4b6c34ddf
Save the scope of an auth token in the session
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-05 23:00:53 +02:00
Roeland Jago Douma f6ebdee8fd Merge pull request #4214 from nextcloud/share-dialog-no-avatars
don't try to render the avatars if avatars are disabled
2017-04-05 14:07:44 +02:00
Bjoern Schiessle 616b767835
don't try to render the avatars if avatars are disabled
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-05 12:26:27 +02:00
Roeland Jago Douma 7f0c07fa5d Merge pull request #4207 from nextcloud/masterkey-publiclink-nc11
[stable11] Make public links work with master key
2017-04-05 10:21:34 +02:00
Nextcloud bot 9c9bdabf74
[tx-robot] updated from transifex 2017-04-05 00:08:31 +00:00
Vincent Petry 6cbb6ceba3
Use master key for public links as well 2017-04-04 17:57:40 +02:00
Vincent Petry f000df0263
Add tests for null user 2017-04-04 17:57:32 +02:00
Vincent Petry c215255771
Fix public link for master key
In public link mode there is no session, so the code should use the
public key instead.
2017-04-04 17:57:20 +02:00
Nextcloud bot e5468409b5
[tx-robot] updated from transifex 2017-04-04 00:07:55 +00:00
Roeland Jago Douma 8bab4ecffc Merge pull request #4167 from nextcloud/backport-4166-invalid-int-for-transparency-on-calendars
[stable11] Make sure transparency is an integer when saving a calendar
2017-04-03 11:00:18 +02:00
Nextcloud bot 9964782b79
[tx-robot] updated from transifex 2017-04-03 00:08:30 +00:00
Nextcloud bot 82eb215c41
[tx-robot] updated from transifex 2017-04-02 00:07:57 +00:00
Nextcloud bot df5ca72796
[tx-robot] updated from transifex 2017-04-01 00:08:18 +00:00
Nextcloud bot 6fa95a2ecf
[tx-robot] updated from transifex 2017-03-31 00:08:44 +00:00
Roeland Jago Douma 00a023ec7b Merge pull request #3415 from nextcloud/backport-3184-migration-restriction-by-vendor-version
[stable11] Prevent migration from ownCloud 10 to Nextcloud 11
2017-03-30 23:13:03 +02:00
Joas Schilling 21b413b08b
Make sure transparency is an integer when saving a calendar
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-30 18:01:21 +02:00
Joas Schilling cf8a680b97
Fix the update from NC 10 and 11 to the latest NC 11
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-30 15:31:50 +02:00
Morris Jobke 0b17068c9e
fix version number
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-30 15:22:40 +02:00
Morris Jobke 9a526a2eb8
Fix return value of getAllowedPreviousVersions()
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-30 15:22:40 +02:00
Joas Schilling e8bbef462f
Prevent migration from ownCloud 10 to Nextcloud 11
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-30 15:22:39 +02:00
Nextcloud bot fc43bbe2c0
[tx-robot] updated from transifex 2017-03-30 00:07:51 +00:00
Morris Jobke ca08ab9bd9 Merge pull request #4029 from nextcloud/federation-fixes-stable11
Federation fixes stable11
2017-03-28 18:11:31 -06:00
Nextcloud bot bac0384f16
[tx-robot] updated from transifex 2017-03-29 00:07:51 +00:00
Nextcloud bot 3d3b0d0cdf
[tx-robot] updated from transifex 2017-03-28 00:08:03 +00:00
Nextcloud bot 2ed9c196bd
[tx-robot] updated from transifex 2017-03-27 00:08:07 +00:00
Nextcloud bot 62c7299cda
[tx-robot] updated from transifex 2017-03-26 01:07:13 +00:00
Nextcloud bot 9f060e3073
[tx-robot] updated from transifex 2017-03-25 01:07:54 +00:00
Bjoern Schiessle d44913eeb5
fix tests
calling getAbsoluteBundlePath() in the constructor makes other tests fail

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 14:36:40 +01:00
Joas Schilling 338636fb3f
Load cert file before syncing addressbooks and contacts
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-24 14:36:28 +01:00
Bjoern Schiessle 55b10e777e
use right format for avatars
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 14:36:16 +01:00
Bjoern Schiessle 3dabb256c0
don't add empty values to the vcard
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 14:35:59 +01:00
Bjoern Schiessle e2656c6521
only execute code if exception was thrown by the corresponding controller
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 14:35:50 +01:00
Bjoern Schiessle 4de5947c07
fix the way we create a new vcard to avoid to have multiple UIDs
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 14:35:36 +01:00
Nextcloud bot 623647661e
[tx-robot] updated from transifex 2017-03-24 01:08:12 +00:00
Nextcloud bot 677f1e5f67
[tx-robot] updated from transifex 2017-03-23 01:08:02 +00:00
Nextcloud bot 756e8a988c
[tx-robot] updated from transifex 2017-03-22 21:14:15 +00:00
Joas Schilling f5330ed33f Merge pull request #3981 from nextcloud/stable11-3974
[stable11] Fix reshare with user activity message
2017-03-22 10:05:08 +01:00
Nextcloud bot 025c9b7420
[tx-robot] updated from transifex 2017-03-22 01:08:03 +00:00
Joas Schilling 9dca9ff8cd
Fix reshare with user activity message
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-21 16:56:37 -06:00
Lukas Reschke 5d8014fff2 Merge pull request #3969 from nextcloud/stable11-fix-branding
[stable11] Fix branding and show Nextcloud
2017-03-21 13:55:05 +01:00
Lukas Reschke a288c2e50a
[stable11] Fix branding
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 12:22:51 +01:00
Nextcloud bot e195116332
[tx-robot] updated from transifex 2017-03-21 01:08:25 +00:00
Morris Jobke 0ae993b16b Merge pull request #3765 from nextcloud/backport-3725-mimetype-detection-on-public-uploads
[stable11] Fix mimetype detection on public uploads for the workflow engine
2017-03-20 13:10:01 -06:00
Nextcloud bot 7c51f9f25d
[tx-robot] updated from transifex 2017-03-20 01:07:52 +00:00