Commit Graph

18242 Commits

Author SHA1 Message Date
Juergen Wischer 1c68d5ea29 more details for forks 2023-01-18 15:35:32 +00:00
Frank Rotermund 14ea486899 Merge branch 'feature/4068_merge_foss_1_9_15' into develop 2023-01-17 10:22:17 +01:00
Frank Rotermund 3288335a79 MESSENGER-4068 buildfixes 2023-01-16 14:37:53 +01:00
Frank Rotermund d9057cd0cb Merge commit '0bf30fc7d2f35f80982c2d6cfd5e844de5f798e6' into feature/4068_merge_foss_1_9_15
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Assets/de.lproj/Localizable.strings
#	Riot/Modules/Room/RoomViewController.m
#	RiotNSE/NotificationService.swift
#	fastlane/Fastfile
2023-01-16 12:11:51 +01:00
Frank Rotermund 48cebfcfc5 Merge branch 'feature/4078_permalink_improvements' into 'develop'
MESSENGER-4078 permalinks only in open rooms, better texts and icons

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!73
2023-01-16 07:15:27 +00:00
Frank Rotermund cc5a9ed847 MESSENGER-4078 permalinks only in open rooms, better texts and icons 2023-01-16 08:06:13 +01:00
Arnfried Griesert c962a16917 merged develop into feature_3418_text_changes_chrosssigning 2023-01-11 15:29:03 +01:00
Arnfried Griesert 05e9eb846d Scan verification screen shows again the old icon instead of the activity indicator 2023-01-11 15:21:52 +01:00
Frank Rotermund 9d6b348812 Merge branch 'feature/4032_disable_thread_functions' into 'develop'
MESSENGER-4032 disable thread options

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!72
2023-01-11 13:26:13 +00:00
JanNiklas Grabowski b959345067 MESSENGER-4032 disable thread options 2023-01-11 13:26:13 +00:00
Frank Rotermund 314bee6dca Merge branch 'feature/3418_text_changes_chrosssigning' into 'develop'
MESSENGER-3418 text changes chrosssigning

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!69
2023-01-11 13:11:20 +00:00
Arnfried Griesert 6285b3c1b9 MESSENGER-3418 text changes chrosssigning 2023-01-11 13:11:20 +00:00
Arnfried Griesert 6886a1de4f Enable cross signing 2023-01-10 21:11:52 +01:00
Arnfried Griesert c6a2684926 Bugfixes 2023-01-10 21:10:42 +01:00
Doug 0bf30fc7d2 Merge branch 'release/1.9.15/master' 2023-01-10 16:50:13 +00:00
Doug ade70074d9 finish version++ 2023-01-10 16:50:13 +00:00
Doug 16c4049df9 Merge pull request #7255 from vector-im/release/1.9.15/release
Release 1.9.15
2023-01-10 16:49:41 +00:00
Frank Rotermund c1f7d20bdd Merge branch 'feature/4030_disable_empty_direct_message' into 'develop'
MESSENGER-4030 and MESSENGER-4031 creation of multiple dms with one user...

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!70
2023-01-10 14:37:37 +00:00
JanNiklas Grabowski 17fd93cd3d MESSENGER-4030 and MESSENGER-4031 creation of multiple dms with one user... 2023-01-10 14:37:37 +00:00
Doug 6fd8512008 version++ 2023-01-10 14:13:25 +00:00
Doug bbfbb924c9 changelog.d: Upgrade MatrixSDK version ([v0.24.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.24.7)). 2023-01-10 14:13:24 +00:00
Alfonso Grillo 3f97f89e0a Merge pull request #7231 from vector-im/alfogrillo/render_poll_end_event
Render poll ended event in the timeline (PSG-196)
2023-01-10 14:49:13 +01:00
Doug 6914fff70d Merge pull request #7251 from vector-im/doug/weblate
Weblate (with fixes)
2023-01-10 12:08:48 +00:00
Alfonso Grillo 0ed86d2b26 Fix ut build errors 2023-01-10 12:20:34 +01:00
Alfonso Grillo e1e870c883 Add changelog.d file 2023-01-10 12:20:34 +01:00
Alfonso Grillo c156f76ec5 Refine MXKEventFormatter 2023-01-10 12:20:34 +01:00
Alfonso Grillo 2ec0777b06 Remove warnings 2023-01-10 12:20:34 +01:00
Alfonso Grillo 493c91b2da Add warnings 2023-01-10 12:20:34 +01:00
Alfonso Grillo 2ed4231ac0 Add push notification body for poll.end 2023-01-10 12:20:34 +01:00
Alfonso Grillo d965becd7a Fix poll.end read receipts 2023-01-10 12:20:34 +01:00
Alfonso Grillo 43d4ceb101 Cleanup code 2023-01-10 12:20:34 +01:00
Alfonso Grillo 64f904f8dd Fix reactions layout 2023-01-10 12:19:39 +01:00
Doug ea183bedc6 Fix broken strings 2023-01-10 11:19:10 +00:00
Alfonso Grillo c18f3a1be5 Fix reload bug 2023-01-10 12:18:00 +01:00
Alfonso Grillo d95a47ba80 Customize TimePollView for poll.end events 2023-01-10 12:18:00 +01:00
Alfonso Grillo d982174efe Push poll.end event to PollAggregator 2023-01-10 12:17:15 +01:00
Alfonso Grillo 96fca04471 Remove filter for poll.end events 2023-01-10 12:17:15 +01:00
Doug 787272757a Merge pull request #7250 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Translations update from Weblate
2023-01-10 11:13:36 +00:00
Doug 14cbf41fa1 Merge pull request #7249 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Translations update from Weblate
2023-01-10 11:13:15 +00:00
Doug 27f7c97251 Merge pull request #7248 from RiotTranslateBot/weblate-riot-ios-riot-ios
Translations update from Weblate
2023-01-10 11:12:53 +00:00
Linerly d5e2c92b3f Translated using Weblate (Indonesian)
Currently translated at 100.0% (50 of 50 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/id/
2023-01-10 11:03:13 +00:00
Vri 888d059fe0 Translated using Weblate (German)
Currently translated at 100.0% (50 of 50 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/de/
2023-01-10 11:03:13 +00:00
Jozef Gaal 221fdfb5e2 Translated using Weblate (Slovak)
Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sk/
2023-01-10 09:54:24 +00:00
Linerly 285dd8eed5 Translated using Weblate (Indonesian)
Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/id/
2023-01-10 09:54:24 +00:00
Priit Jõerüüt b1120c107d Translated using Weblate (Estonian)
Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/et/
2023-01-10 09:54:24 +00:00
Ihor Hordiichuk db1c73d199 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/uk/
2023-01-10 09:54:24 +00:00
Szimszon 6511a193fe Translated using Weblate (Hungarian)
Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/hu/
2023-01-10 09:54:24 +00:00
Vri 5c44e895c7 Translated using Weblate (German)
Currently translated at 99.9% (2350 of 2351 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
2023-01-10 09:54:24 +00:00
Christian Paul 4dbc60ac0d Translated using Weblate (Esperanto)
Currently translated at 63.8% (1500 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/eo/
2023-01-10 09:54:24 +00:00
Besnik Bleta bad42dbd58 Translated using Weblate (Albanian)
Currently translated at 99.6% (2340 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sq/
2023-01-10 09:54:24 +00:00