Commit Graph

13178 Commits

Author SHA1 Message Date
Doug 9a45b38730 Remove directRoomBorderView from InviteRecentTableViewCell.xib. 2021-08-12 09:50:18 +01:00
Doug 7cce2921e7 Update the value of notificationBodyLocalizationKey to "NOTIFICATION". 2021-08-12 09:35:30 +01:00
ismailgulek df0580c844 Add changelog 2021-08-12 11:08:40 +03:00
ismailgulek 12a754fbc5 Merge branch 'develop' into element_4471 2021-08-12 11:08:29 +03:00
Doug 696b4eba32 Merge branch 'develop' into doug/4132_improve_notification_content 2021-08-11 17:18:09 +01:00
Doug 222e22880b Merge branch 'develop' into doug/4484_contacts_access 2021-08-11 17:15:23 +01:00
Doug 08188e3ffa Use areAllTermsAgreed instead of hasAccountDataIdentityServerValue. Move identity server terms modal from LegacyAppDelegate into ContactsTableViewController. 2021-08-11 17:13:15 +01:00
manuroe ef5377c8d6 Remove changelog files by hand
There was a bug in the release script
2021-08-11 15:32:13 +02:00
manuroe 2ef2a91f81 Prepare for new sprint 2021-08-11 15:21:10 +02:00
manuroe 6ba0b5cbf7 Merge branch 'master' into develop 2021-08-11 15:21:08 +02:00
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
Gil Eluard a6328b8f35 [Spaces] M10.8 Browsing users in a space #4682
- Added MVVM classes
- roughly integrated `RoomParticipantsViewController` to the MVVM
2021-08-10 20:26:27 +02:00
Doug ebe568bc6c Match StartChatViewController colours to latest Figma. 2021-08-10 13:05:11 +01:00
Doug 40a60e98ac Disable the contact access footer view in Unified Search. 2021-08-10 12:32:07 +01:00
Doug 70acef24ed Take into account the identity server when setting the default value of showLocalContacts. 2021-08-10 12:03:28 +01: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