Commit Graph

12250 Commits

Author SHA1 Message Date
manuroe 4490d345a6 Merge branch 'release/1.5.0/master' 2021-08-11 15:21:04 +02:00
manuroe 86b82c91f3 finish version++ 2021-08-11 15:21:04 +02:00
manuroe f5a2a7a09e Merge pull request #4694 from vector-im/release/1.5.0/release
Release 1.5.0
2021-08-11 15:20:26 +02:00
manuroe a0a656a4bd version++ 2021-08-11 14:48:25 +02:00
manuroe 2bcda5b897 Merge pull request #4692 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Translations update from Weblate
2021-08-11 12:36:39 +02:00
manuroe a5a33333bb Merge pull request #4691 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Translations update from Weblate
2021-08-11 12:36:09 +02:00
manuroe b78535835a Merge pull request #4690 from RiotTranslateBot/weblate-riot-ios-riot-ios
Translations update from Weblate
2021-08-11 12:35:39 +02:00
Weblate 6909ff210f Merge branch 'origin/develop' into Weblate. 2021-08-11 10:25:58 +00:00
Weblate bfc8e5c3fb Merge branch 'origin/develop' into Weblate. 2021-08-11 10:25:53 +00:00
Weblate 0dba441c10 Merge branch 'origin/develop' into Weblate. 2021-08-11 10:22:48 +00:00
Doug 816355f3c8 Merge pull request #4643 from vector-im/doug/4609_support_functional_members
Add support for functional members
2021-08-11 11:21:57 +01:00
manuroe 947d712862 Merge pull request #4684 from HonkXL/develop
fixed typo "adress" - fixes issue #4480
2021-08-11 12:21:32 +02:00
manuroe cd607d918a Merge pull request #4689 from vector-im/manu/4393_towncrier_release_script
Make Towncrier compatible with the release script
2021-08-11 12:07:28 +02:00
manuroe ffde5e7569 changelog 2021-08-11 11:47:39 +02:00
manuroe f432692ad0 Make Towncrier compatible with the release script 2021-08-11 11:45:01 +02:00
Doug c09b8e7c82 Merge pull request #4681 from vector-im/doug/4677_fix_contacts_warnings
Fix warnings in Contacts module
2021-08-10 11:04:24 +01:00
Thomas Weiland 16e034eec9 Create 4480.bugfix 2021-08-10 11:52:16 +02:00
Doug 5b391fc03d Fix localisation key. 2021-08-10 10:45:33 +01:00
Doug 4d9c4612c4 Add changelog entries. 2021-08-10 10:31:34 +01:00
Doug d9d20d0042 Merge branch 'develop' into doug/4132_improve_notification_content 2021-08-10 10:28:40 +01:00
Doug dbf501380b Revert "Update CHANGES.rst."
This reverts commit ee059e2ddf76b5f5309acb89a3fea5b87580a764.
2021-08-10 10:28:30 +01:00
Doug 4e2318a670 Rename pr_4681.misc to 4677.misc 2021-08-10 10:27:12 +01:00
Linerly 88e539266c Translated using Weblate (Indonesian)
Currently translated at 7.5% (94 of 1251 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/id/
2021-08-10 09:25:18 +00:00
random 0507bd81f4 Translated using Weblate (Italian)
Currently translated at 100.0% (1251 of 1251 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/it/
2021-08-10 09:25:15 +00:00
artevaeckt e6d898cb92 Translated using Weblate (German)
Currently translated at 99.2% (1242 of 1251 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
2021-08-10 09:25:15 +00:00
jelv b3118cc8db Translated using Weblate (Dutch)
Currently translated at 100.0% (1251 of 1251 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/nl/
2021-08-10 09:25:14 +00:00
Doug cc24082245 Add changelog entry. 2021-08-10 10:19:36 +01:00
Doug bf9bab8928 Merge branch 'develop' into doug/4609_support_functional_members
# Conflicts:
#	CHANGES.md
2021-08-10 10:18:15 +01:00
Doug 98fa4eca00 Add changelog entry. 2021-08-10 09:44:42 +01:00
Doug c6170e6efa Merge branch 'develop' into doug/4677_fix_contacts_warnings 2021-08-10 09:41:57 +01:00
Doug d5a8dfe26d Revert "Updated CHANGES.rst"
This reverts commit d0bf0ca1fba38722d12565928a759543578dd85c.
2021-08-10 09:41:35 +01:00
Thomas Weiland f5b06198cd fixed typo "adress" issue #4480 2021-08-10 10:20:35 +02:00
LinAGKar e988041db7 Translated using Weblate (Swedish)
Currently translated at 100.0% (6 of 6 strings)

Translation: Element iOS/Element iOS (Dialogs)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-dialogs/sv/
2021-08-10 07:25:14 +00:00
artevaeckt 5f478990e2 Translated using Weblate (German)
Currently translated at 100.0% (6 of 6 strings)

Translation: Element iOS/Element iOS (Dialogs)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-dialogs/de/
2021-08-10 07:25:14 +00:00
manuroe 903c8f3a01 Merge pull request #4683 from vector-im/manu/4393_towncrier
Enable Towncrier
2021-08-09 18:38:01 +02:00
manuroe 6b673056c5 Merge remote-tracking branch 'origin/develop' into manu/4393_towncrier 2021-08-09 18:09:58 +02:00
manuroe 4ea6873ac8 Merge remote-tracking branch 'origin/develop' into manu/4393_towncrier 2021-08-09 18:06:09 +02:00
ismailgulek cabfe64214 Merge pull request #4645 from vector-im/element_4362
Stable ids for MSC 2858
2021-08-09 18:48:34 +03:00
manuroe 93c7a2afbb PULL_REQUEST_TEMPLATE: Use a true hyperlink for changelog 2021-08-09 17:35:30 +02:00
manuroe e443c04ce6 Xcodegen: Use CHANGES.md 2021-08-09 17:22:54 +02:00
manuroe 47993a3529 Towncrier: Create changelog files for current changes 2021-08-09 17:21:18 +02:00
ismailgulek c76aa7f595 Merge remote-tracking branch 'origin/element_4362' into element_4362 2021-08-09 18:09:54 +03:00
ismailgulek 0d63496ec6 Merge branch 'develop' into element_4362 2021-08-09 18:09:45 +03:00
ismailgulek 6aae1c0408 Update Riot/Modules/Authentication/SSO/SSOURLConstants.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2021-08-09 18:06:08 +03:00
Doug 1ae2559e25 Add missing Weakify/Strongify. 2021-08-09 15:59:46 +01:00
Doug 6bd8b55fe7 Updated CHANGES.rst 2021-08-09 15:49:11 +01:00
Doug 5ec7f4cd61 Fix warnings: Block implicitly retains 'self' 2021-08-09 15:45:59 +01:00
SBiOSoftWhare acbcd24ab2 App variants: Update script in order to use only on command to merge variant into project folder. 2021-08-09 16:33:11 +02:00
SBiOSoftWhare 0fbdf24c4c App variants: Use same folder tree to make merge easier. 2021-08-09 16:29:42 +02:00
manuroe a6a77226b3 Convert CHANGES to MarkDown 2021-08-09 16:24:14 +02:00