Commit Graph

12060 Commits

Author SHA1 Message Date
manuroe e483a4cf4c Merge branch 'release/1.5.1/master' 2021-08-12 16:27:55 +02:00
manuroe e2f6791a82 finish version++ 2021-08-12 16:27:55 +02:00
manuroe 44a0977c08 Merge pull request #4704 from vector-im/release/1.5.1/release
Release 1.5.1
2021-08-12 16:22:45 +02:00
manuroe b197b49f1c version++ 2021-08-12 15:49:07 +02:00
manuroe 7d28ad4bc8 Remove changelog files by hand 2021-08-12 15:11:41 +02:00
manuroe 5ceca23d5c Remove changelog files by hand 2021-08-12 15:03:53 +02:00
Doug 06db94ffb5 Merge pull request #4699 from vector-im/doug/4698_fix_dm_border_crash
Fix crash when showing an invite in the People tab.
2021-08-12 13:11:19 +01:00
Doug 7498dc6e8c Add changelog entry. 2021-08-12 10:07:08 +01:00
Doug 23be2bf1ae Remove additional directRoomBorderView from RecentRoomTableViewCell (share extension). 2021-08-12 10:03:49 +01:00
Doug 69ca6b0536 Remove directRoomBorderView from InviteRecentTableViewCell.xib. 2021-08-12 09:50:18 +01:00
Doug d6dc900a9b Update the value of notificationBodyLocalizationKey to "NOTIFICATION". 2021-08-12 09:35:30 +01:00
ismailgulek d273e62652 Add changelog 2021-08-12 11:08:40 +03:00
ismailgulek eeeb2f9d5e Merge branch 'develop' into element_4471 2021-08-12 11:08:29 +03:00
Doug 73d0762d32 Merge branch 'develop' into doug/4132_improve_notification_content 2021-08-11 17:18:09 +01:00
manuroe d19e4ecef5 Remove changelog files by hand
There was a bug in the release script
2021-08-11 15:32:13 +02:00
manuroe e13559ceb2 Prepare for new sprint 2021-08-11 15:21:10 +02:00
manuroe 28f49a7619 Merge branch 'master' into develop 2021-08-11 15:21:08 +02:00
manuroe ce285ad5d9 Merge branch 'release/1.5.0/master' 2021-08-11 15:21:04 +02:00
manuroe 3670aa12fd finish version++ 2021-08-11 15:21:04 +02:00
manuroe fe821e124d 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 cf2eacdb88 version++ 2021-08-11 14:48:25 +02:00
manuroe 04da929924 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 c2def8059c 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 bafe6aef93 Merge pull request #4690 from RiotTranslateBot/weblate-riot-ios-riot-ios
Translations update from Weblate
2021-08-11 12:35:39 +02:00
Weblate cb04f906c1 Merge branch 'origin/develop' into Weblate. 2021-08-11 10:25:58 +00:00
Weblate 13b206c1f7 Merge branch 'origin/develop' into Weblate. 2021-08-11 10:25:53 +00:00
Weblate afb109606c Merge branch 'origin/develop' into Weblate. 2021-08-11 10:22:48 +00:00
Doug de3521b4c9 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 bdc61706f0 Merge pull request #4684 from HonkXL/develop
fixed typo "adress" - fixes issue #4480
2021-08-11 12:21:32 +02:00
manuroe 39758b1fc3 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 47d2934de8 changelog 2021-08-11 11:47:39 +02:00
manuroe 24e9d04d03 Make Towncrier compatible with the release script 2021-08-11 11:45:01 +02:00
Doug c796bba42f 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 b27c04d931 Create 4480.bugfix 2021-08-10 11:52:16 +02:00
Doug d93a4994a7 Fix localisation key. 2021-08-10 10:45:33 +01:00
Doug eb336cf578 Add changelog entries. 2021-08-10 10:31:34 +01:00
Doug 84bbe19fe5 Merge branch 'develop' into doug/4132_improve_notification_content 2021-08-10 10:28:40 +01:00
Doug 0a926295ee Revert "Update CHANGES.rst."
This reverts commit 89b5146efd.
2021-08-10 10:28:30 +01:00
Doug bb237cc554 Rename pr_4681.misc to 4677.misc 2021-08-10 10:27:12 +01:00
Linerly 1361e816ab 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 cfe9e674c1 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 17c23531fe 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 11a9c395f0 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 6737d59694 Add changelog entry. 2021-08-10 10:19:36 +01:00
Doug fb78e290e6 Merge branch 'develop' into doug/4609_support_functional_members
# Conflicts:
#	CHANGES.md
2021-08-10 10:18:15 +01:00
Doug 4293ad4022 Add changelog entry. 2021-08-10 09:44:42 +01:00
Doug 18635b0277 Merge branch 'develop' into doug/4677_fix_contacts_warnings 2021-08-10 09:41:57 +01:00
Doug 6a7b99efd7 Revert "Updated CHANGES.rst"
This reverts commit e40978da44.
2021-08-10 09:41:35 +01:00
Thomas Weiland 9321a77ab6 fixed typo "adress" issue #4480 2021-08-10 10:20:35 +02:00
LinAGKar da3c848233 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