Commit graph

6036 commits

Author SHA1 Message Date
Doug
b61135ffb7 Merge branch 'develop' into doug/4479_media_size_selection 2021-08-23 12:49:06 +01:00
Doug
fc75307c54 Combine confirm image/video size settings into one. 2021-08-23 11:16:32 +01:00
Doug
7c0b9e581d
Merge pull request #4662 from vector-im/doug/4132_improve_notification_content
Improve notification content
2021-08-18 13:05:45 +01:00
Stefan Ceriu
f33dd76930 Fixes #4714 - Flickering voice message cells while being sent. 2021-08-18 14:58:32 +03:00
Doug
24ff73b413 Update from feedback.
Set notificationBodyLocalizationKey in CommonConfiguration. Remove redundant customisation. Use MXRoomMemberEventContent.
2021-08-18 12:32:32 +01:00
Doug
8a6fd69505 Add reaction content to notifications when available. 2021-08-17 15:51:18 +01:00
Doug
8773d77b5d Update strings from feedback. 2021-08-17 15:38:01 +01:00
Doug
0014b947a6 Merge branch 'develop' into doug/4132_improve_notification_content 2021-08-17 14:36:40 +01:00
Doug
9031412c02 Add an (optional) prompt when sending a video to select its size.
Use high quality when filming video in-app.
2021-08-16 17:48:26 +01:00
SBiOSoftWhare
51f9511d6b Include AppVersion.xcconfig in all Common.xcconfig. 2021-08-16 11:35:09 +02:00
Doug
b7245935a1 Merge branch 'develop' into doug/4479_media_size_selection
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
2021-08-16 10:01:54 +01:00
Stefan Ceriu
fc11b3476a Fixes #1482 - Popping the user back to the home screen after leaving a room. 2021-08-13 17:57:50 +03:00
ismailgulek
7197c020f6
Merge branch 'develop' into element_4471 2021-08-13 11:52:12 +03:00
Doug
3682d5c5be Remove directRoomBorderView from InviteRecentTableViewCell.xib. 2021-08-12 09:50:18 +01:00
Doug
730c7f93c9 Update the value of notificationBodyLocalizationKey to "NOTIFICATION". 2021-08-12 09:35:30 +01:00
ismailgulek
24a57512ca
Merge branch 'develop' into element_4471 2021-08-12 11:08:29 +03:00
Doug
5e8da21cff Merge branch 'develop' into doug/4132_improve_notification_content 2021-08-11 17:18:09 +01:00
manuroe
decb39ae6b
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
0e145b5f83
Merge pull request #4691 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Translations update from Weblate
2021-08-11 12:36:09 +02:00
Weblate
9c10038aa7 Merge branch 'origin/develop' into Weblate. 2021-08-11 10:25:58 +00:00
Weblate
560009b90d Merge branch 'origin/develop' into Weblate. 2021-08-11 10:25:53 +00:00
Weblate
f910f4c2f6 Merge branch 'origin/develop' into Weblate. 2021-08-11 10:22:48 +00:00
Doug
c0f0a115e1
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
2276fc8fc9
Merge pull request #4684 from HonkXL/develop
fixed typo "adress" - fixes issue #4480
2021-08-11 12:21:32 +02:00
Doug
538429eca1 Merge branch 'develop' into doug/4132_improve_notification_content 2021-08-10 10:28:40 +01:00
Linerly
e774f8b5f9 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
8ca97d904c 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
2a7ab5fca9 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
5b6dc0e4cb 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
92aaf3d43e Merge branch 'develop' into doug/4609_support_functional_members
# Conflicts:
#	CHANGES.md
2021-08-10 10:18:15 +01:00
Doug
41d156e948 Merge branch 'develop' into doug/4677_fix_contacts_warnings 2021-08-10 09:41:57 +01:00
Thomas Weiland
4d21e36d9c
fixed typo "adress" issue #4480 2021-08-10 10:20:35 +02:00
LinAGKar
1f86484ab9 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
c4d1036d2b 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
ismailgulek
c3019b4cb4
Merge remote-tracking branch 'origin/element_4362' into element_4362 2021-08-09 18:09:54 +03:00
ismailgulek
9a62d5d231
Merge branch 'develop' into element_4362 2021-08-09 18:09:45 +03:00
ismailgulek
0585ffe8d1
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
5303fcc894 Add missing Weakify/Strongify. 2021-08-09 15:59:46 +01:00
Doug
9b94fe9ab8 Fix warnings: Block implicitly retains 'self' 2021-08-09 15:45:59 +01:00
Doug
64758a98bb Merge branch 'develop' into doug/4609_support_functional_members
# Conflicts:
#	CHANGES.rst
2021-08-09 10:20:08 +01:00
Doug
e030126405 Add explanation. 2021-08-09 10:19:00 +01:00
Priit Jõerüüt
02c0769201 Translated using Weblate (Estonian)
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/et/
2021-08-07 09:25:24 +00:00
lvre
2daba1df9c Translated using Weblate (Portuguese (Brazil))
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/pt_BR/
2021-08-07 09:25:22 +00:00
Besnik Bleta
e5fcfd4b4f Translated using Weblate (Albanian)
Currently translated at 99.6% (1247 of 1251 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sq/
2021-08-07 09:25:22 +00:00
Szimszon
04ac4cdee9 Translated using Weblate (Hungarian)
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/hu/
2021-08-07 09:25:20 +00:00
Nikita Epifanov
2bce73c172 Translated using Weblate (Russian)
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/ru/
2021-08-07 09:25:20 +00:00
sr093906
1a89cb39ca Translated using Weblate (Chinese (Simplified))
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/zh_Hans/
2021-08-07 09:25:15 +00:00
jelv
15291989c3 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-07 09:25:14 +00:00
ismailgulek
d0fd3658db
Merge branch 'develop' into ismail/4642_additions 2021-08-06 16:22:38 +03:00
ismailgulek
058b819daf
Use new strings for ended calls 2021-08-06 16:20:10 +03:00