Commit Graph

11988 Commits

Author SHA1 Message Date
ismailgulek 17f602b9e6 Merge branch 'develop' into element_4471 2021-08-13 11:52:12 +03:00
manuroe 3d71ae48cc Prepare for new sprint 2021-08-12 16:28:03 +02:00
manuroe 194883e500 Merge branch 'master' into develop 2021-08-12 16:27:59 +02:00
manuroe 613319e57b Merge branch 'release/1.5.1/master' 2021-08-12 16:27:55 +02:00
manuroe d3c03ea7dd finish version++ 2021-08-12 16:27:55 +02:00
manuroe 16341ca9cd 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 7567882e53 version++ 2021-08-12 15:49:07 +02:00
manuroe e2ebe9c422 Remove changelog files by hand 2021-08-12 15:11:41 +02:00
manuroe 16f62a5e07 Remove changelog files by hand 2021-08-12 15:03:53 +02:00
Doug 58ac80e621 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 59fe6b59a9 Add changelog entry. 2021-08-12 10:07:08 +01:00
Doug f63f669c1a Remove additional directRoomBorderView from RecentRoomTableViewCell (share extension). 2021-08-12 10:03:49 +01:00
Doug 00c557f23d Remove directRoomBorderView from InviteRecentTableViewCell.xib. 2021-08-12 09:50:18 +01:00
ismailgulek e14e4d2798 Add changelog 2021-08-12 11:08:40 +03:00
ismailgulek 15f548febe Merge branch 'develop' into element_4471 2021-08-12 11:08:29 +03:00
manuroe c26bd86ea5 Remove changelog files by hand
There was a bug in the release script
2021-08-11 15:32:13 +02:00
manuroe 75cbc4a2a2 Prepare for new sprint 2021-08-11 15:21:10 +02:00
manuroe 47b475ede3 Merge branch 'master' into develop 2021-08-11 15:21:08 +02:00
manuroe e2436c50a8 Merge branch 'release/1.5.0/master' 2021-08-11 15:21:04 +02:00
manuroe 753ed54dbd finish version++ 2021-08-11 15:21:04 +02:00
manuroe a7af81a7e1 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 c117c67265 version++ 2021-08-11 14:48:25 +02:00
manuroe 682e66c6db 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 a302cdc362 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 e674637f3f Merge pull request #4690 from RiotTranslateBot/weblate-riot-ios-riot-ios
Translations update from Weblate
2021-08-11 12:35:39 +02:00
Weblate 00efbc4de3 Merge branch 'origin/develop' into Weblate. 2021-08-11 10:25:58 +00:00
Weblate 85c2fc87c6 Merge branch 'origin/develop' into Weblate. 2021-08-11 10:25:53 +00:00
Weblate 75b85d1c1f Merge branch 'origin/develop' into Weblate. 2021-08-11 10:22:48 +00:00
Doug 309bf1da50 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 fdab81bd73 Merge pull request #4684 from HonkXL/develop
fixed typo "adress" - fixes issue #4480
2021-08-11 12:21:32 +02:00
manuroe 003d70cd3a 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 12478b8697 changelog 2021-08-11 11:47:39 +02:00
manuroe 7ebc884d4f Make Towncrier compatible with the release script 2021-08-11 11:45:01 +02:00
Doug e063eaa616 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 133e4550ae Create 4480.bugfix 2021-08-10 11:52:16 +02:00
Doug 5fedd6ee17 Rename pr_4681.misc to 4677.misc 2021-08-10 10:27:12 +01:00
Linerly 4bb769adc5 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 e1801c52ae 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 7e521b56a0 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 c72838c462 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 c2575baa01 Add changelog entry. 2021-08-10 10:19:36 +01:00
Doug e847704cdf Merge branch 'develop' into doug/4609_support_functional_members
# Conflicts:
#	CHANGES.md
2021-08-10 10:18:15 +01:00
Doug 9c72149acb Add changelog entry. 2021-08-10 09:44:42 +01:00
Doug 23b30876e3 Merge branch 'develop' into doug/4677_fix_contacts_warnings 2021-08-10 09:41:57 +01:00
Doug fc8e56c202 Revert "Updated CHANGES.rst"
This reverts commit c9dd8ed999d89264ad088a14dee79412bfb29b93.
2021-08-10 09:41:35 +01:00
Thomas Weiland 7b7a27e3fe fixed typo "adress" issue #4480 2021-08-10 10:20:35 +02:00
LinAGKar fa31244335 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 c63700d4aa 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 836a9564a9 Merge pull request #4683 from vector-im/manu/4393_towncrier
Enable Towncrier
2021-08-09 18:38:01 +02:00
manuroe d074e261be Merge remote-tracking branch 'origin/develop' into manu/4393_towncrier 2021-08-09 18:09:58 +02:00