Commit Graph

814 Commits

Author SHA1 Message Date
ismailgulek c6e7ae277e fix missing MXJSONModel setters 2022-03-17 15:31:15 +03:00
ismailgulek 6be1f0c37b fix missing MXJSONModel setters 2022-03-17 15:31:15 +03:00
ismailgulek 0fbb6cf324 Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:29 +03:00
ismailgulek 8d208e5b54 Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:29 +03:00
ismailgulek e18f1b6471 Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:22 +03:00
ismailgulek 57b5f996a1 Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:22 +03:00
ismailgulek 39245ae705 Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:14 +03:00
ismailgulek c59d052f22 Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:14 +03:00
ismailgulek fc5e2975b7 Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:05 +03:00
ismailgulek 9fa6e84a4c Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:05 +03:00
ismailgulek 5fe35c7259 Use event's new content when available 2022-03-17 14:24:02 +03:00
ismailgulek eaca186e5b Use event's new content when available 2022-03-17 14:24:02 +03:00
ismailgulek 1372271b26 Pass threadId of room data source on replies 2022-03-16 17:13:18 +03:00
ismailgulek 2666401a52 Pass threadId of room data source on replies 2022-03-16 17:13:18 +03:00
ismailgulek 5df8e0287e Fix tests 2022-03-15 13:55:44 +03:00
ismailgulek c5a80b8de9 Fix tests 2022-03-15 13:55:44 +03:00
ismailgulek af633ae03a Extend reply fallback for also non-thread events 2022-03-14 13:44:13 +03:00
ismailgulek e925bb0380 Extend reply fallback for also non-thread events 2022-03-14 13:44:13 +03:00
Gil Eluard cdd66146d8 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.h
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
Gil Eluard 4f43793313 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.h
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
Gil Eluard acf7d0de13 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Gil Eluard 24de57bb58 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Arnaud Ringenbach cfeae5bc64 Rename profile as userAvatarAndName 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach e300d6ea6f Rename profile as userAvatarAndName 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach fb95e6fd78 Remove duplicated roomScreenUseOnlyLatestProfiles setting test 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 70b99daa21 Remove duplicated roomScreenUseOnlyLatestProfiles setting test 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 1f59ed74e7 Revamp refreshProfiles as setRoomState 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 1ab4922d8d Revamp refreshProfiles as setRoomState 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 4eafe7fd9a Rename dataSource2 parameters and handle target profiles 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 4530b61df3 Rename dataSource2 parameters and handle target profiles 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 91d3411326 Handle use only latest profile live refreshes 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 31f63a72dd Handle use only latest profile live refreshes 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach a6ed656107 Use only latest profiles in the timeline (labs) 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 6ccf209ed8 Use only latest profiles in the timeline (labs) 2022-03-07 13:45:02 +01:00
Gil Eluard 59038e18c1 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
Gil Eluard 42b4144323 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
Doug 4d01740ce3 Remove unused NSBundle extension methods.
Fix compile errors and remove duplicate strings after rebase.
2022-03-03 10:04:20 +00:00
Doug 792e7ebb3b Remove unused NSBundle extension methods.
Fix compile errors and remove duplicate strings after rebase.
2022-03-03 10:04:20 +00:00
Doug 86c2b4ebb5 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Doug c9cc59d006 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Doug e9fbc9eede Merge MatrixKit strings into Vector strings. 2022-03-03 09:34:54 +00:00
Doug 62a37dd0e2 Merge MatrixKit strings into Vector strings. 2022-03-03 09:34:54 +00:00
Weblate 67fd7da9be Merge branch 'origin/develop' into Weblate. 2022-03-02 15:18:11 +00:00
Weblate 978d0b032d Merge branch 'origin/develop' into Weblate. 2022-03-02 15:18:11 +00:00
Jozef Gaal e92c993877 Translated using Weblate (Slovak)
Currently translated at 99.7% (441 of 442 strings)

Translation: Element iOS/Element iOS (MatrixKit)
Translate-URL: https://translate.element.io/projects/riot-ios/element-ios-matrixkit/sk/
2022-03-02 15:18:00 +00:00
Jozef Gaal 08071527fd Translated using Weblate (Slovak)
Currently translated at 99.7% (441 of 442 strings)

Translation: Element iOS/Element iOS (MatrixKit)
Translate-URL: https://translate.element.io/projects/riot-ios/element-ios-matrixkit/sk/
2022-03-02 15:18:00 +00:00
LinAGKar bb48aabfbe Translated using Weblate (Swedish)
Currently translated at 100.0% (442 of 442 strings)

Translation: Element iOS/Element iOS (MatrixKit)
Translate-URL: https://translate.element.io/projects/riot-ios/element-ios-matrixkit/sv/
2022-03-02 15:18:00 +00:00
LinAGKar 43adfdfe7c Translated using Weblate (Swedish)
Currently translated at 100.0% (442 of 442 strings)

Translation: Element iOS/Element iOS (MatrixKit)
Translate-URL: https://translate.element.io/projects/riot-ios/element-ios-matrixkit/sv/
2022-03-02 15:18:00 +00:00
ismailgulek d61891f2d3 Change font for message body if required 2022-03-01 16:48:33 +03:00
ismailgulek 7b01f00d77 Change font for message body if required 2022-03-01 16:48:33 +03:00