Commit Graph

12250 Commits

Author SHA1 Message Date
manuroe 34570ce840 Merge tag 'v0.10.2' into develop
Finish IntegrationsManagerTerms

# Conflicts:
#	CHANGES.rst
2019-11-15 17:36:59 +01:00
manuroe 56a399da0d Finish IntegrationsManagerTerms 2019-11-15 17:35:38 +01:00
manuroe 46ebb77149 version++ 2019-11-15 17:31:24 +01:00
manuroe 4a77c98275 Integrations: Fix terms consent display HTTP requests 2019-11-15 17:30:21 +01:00
manuroe c2bcee2392 Integrations: Fix terms consent display when they are required
(cherry picked from commit 394aedbf5fdfb7979775667287f0441e99427902)
2019-11-15 16:39:27 +01:00
송태섭 4ac26754d8 Translated using Weblate (Korean)
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ko/
2019-11-13 18:44:57 +00:00
Besnik Bleta 8f9805fa64 Translated using Weblate (Albanian)
Currently translated at 99.4% (822 of 827 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/
2019-11-13 18:44:55 +00:00
Weblate a2cc79f7ab Merge branch 'origin/develop' into Weblate. 2019-11-12 09:32:14 +00:00
Weblate b1efa763b2 Merge branch 'origin/develop' into Weblate. 2019-11-12 09:32:13 +00:00
manuroe 272b4cbe81 i18n: Add Welsh (cy) 2019-11-12 10:32:01 +01:00
Weblate 25bbbfa669 Merge branch 'origin/develop' into Weblate. 2019-11-12 09:07:39 +00:00
Weblate 265de77547 Merge branch 'origin/develop' into Weblate. 2019-11-12 09:07:39 +00:00
Riot Translate Bot 3f00ebee31 Update from Weblate (#2830)
* Added translation using Weblate (Welsh)

* Translated using Weblate (Welsh)

Currently translated at 100.0% (28 of 28 strings)

Translation: Riot iOS/Riot iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/cy/
2019-11-12 10:07:34 +01:00
Weblate 8cfce75cc1 Merge branch 'origin/develop' into Weblate. 2019-11-12 09:07:12 +00:00
Weblate a519b64c64 Merge branch 'origin/develop' into Weblate. 2019-11-12 09:07:12 +00:00
manuroe a80a40d3a2 Merge pull request #2829 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2019-11-12 10:07:06 +01:00
Weblate 1e203d276b Merge branch 'origin/develop' into Weblate. 2019-11-12 09:06:51 +00:00
Weblate 3efd88cb0f Merge branch 'origin/develop' into Weblate. 2019-11-12 09:06:51 +00:00
manuroe 778cfbf539 Merge pull request #2828 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2019-11-12 10:06:45 +01:00
Besnik Bleta dce49e2593 Translated using Weblate (Albanian)
Currently translated at 97.2% (804 of 827 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/
2019-11-11 18:44:50 +00:00
Elwyn Malethan 53cf6684e5 Translated using Weblate (Welsh)
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/cy/
2019-11-10 14:44:57 +00:00
Elwyn Malethan 77d986eab1 Translated using Weblate (Welsh)
Currently translated at 100.0% (28 of 28 strings)

Translation: Riot iOS/Riot iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/cy/
2019-11-10 14:44:43 +00:00
Elwyn Malethan 50a323f70e Translated using Weblate (Welsh)
Currently translated at 100.0% (5 of 5 strings)

Translation: Riot iOS/Riot iOS (Dialogs)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-dialogs/cy/
2019-11-10 14:44:42 +00:00
Elwyn Malethan c06a0872e0 Added translation using Weblate (Welsh) 2019-11-09 14:04:20 +00:00
Elwyn Malethan 8c524dbc36 Added translation using Weblate (Welsh) 2019-11-09 14:01:30 +00:00
Weblate fa948c57ff Merge branch 'origin/develop' into Weblate. 2019-11-08 10:54:23 +00:00
Weblate 91cb3cabbf Merge branch 'origin/develop' into Weblate. 2019-11-08 10:54:22 +00:00
Weblate 9fae096aaf Merge branch 'origin/develop' into Weblate. 2019-11-08 10:54:22 +00:00
SBiOSoftWhare 20996d7f89 version++ 2019-11-08 11:54:11 +01:00
Weblate 550cf76cb8 Merge branch 'origin/develop' into Weblate. 2019-11-08 10:45:22 +00:00
Weblate 639ed564b1 Merge branch 'origin/develop' into Weblate. 2019-11-08 10:45:22 +00:00
Weblate 96354c73cf Merge branch 'origin/develop' into Weblate. 2019-11-08 10:45:22 +00:00
SBiOSoftWhare 2b8de245ca Merge pull request #2825 from vector-im/update_matomo
Update MatomoTracker pod to 7.2.0
2019-11-08 11:45:17 +01:00
SBiOSoftWhare 64fd8bb2f4 Update MatomoTracker pod to 7.2.0. 2019-11-08 11:24:03 +01:00
SBiOSoftWhare ecf285b8ad Project: For each target use "$(inherited)" value for ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES build setting. 2019-11-08 11:21:13 +01:00
Weblate b9f51d276b Merge branch 'origin/develop' into Weblate. 2019-11-08 09:34:50 +00:00
Weblate 350b72107d Merge branch 'origin/develop' into Weblate. 2019-11-08 09:34:50 +00:00
Weblate 3ea0809e40 Merge branch 'origin/develop' into Weblate. 2019-11-08 09:34:50 +00:00
manuroe 623bc2d000 Merge pull request #2823 from vector-im/riot_2815
Integrations: Use the integrations manager provided by the homeserver admin
2019-11-08 10:34:43 +01:00
manuroe 3cc9dc25dd Merge branch 'develop' into riot_2815 2019-11-08 10:34:13 +01:00
Slavi Pantaleev 7d9df4e489 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/bg/
2019-11-08 08:44:39 +00:00
manuroe 83f58771b7 Integrations: Use the integrations manager provided by the homeserver admin via .well-known
#2815
2019-11-07 18:46:50 +01:00
manuroe ae5da701bf Integrations: Fix terms consent display when they are required 2019-11-07 18:25:11 +01:00
Weblate 5797223014 Merge branch 'origin/develop' into Weblate. 2019-11-07 10:29:37 +00:00
Weblate 6c14676d51 Merge branch 'origin/develop' into Weblate. 2019-11-07 10:29:37 +00:00
SBiOSoftWhare a0ac22c1c0 Merge branch 'release/v0.10.1' 2019-11-07 11:29:28 +01:00
SBiOSoftWhare c3275953df Merge tag 'v0.10.1' into develop
no message
2019-11-07 11:29:28 +01:00
SBiOSoftWhare fa6074983e version++ 2019-11-07 11:27:08 +01:00
Weblate 37817eae83 Merge branch 'origin/develop' into Weblate. 2019-11-06 17:23:45 +00:00
Weblate f5a368b28e Merge branch 'origin/develop' into Weblate. 2019-11-06 17:23:45 +00:00