Commit Graph

259 Commits

Author SHA1 Message Date
Arnfried Griesert d2b034e2e3 patched bwm 1.19.0 into develop 2022-05-11 11:42:46 +02:00
Arnfried Griesert 966f5299d9 merged from element 1.8.13 2022-05-05 06:57:45 +02:00
Arnfried Griesert 990962285a merged element 1.8.10 2022-05-03 12:48:01 +02:00
Doug 4d72a4e93a Fix some warnings. 2022-04-13 17:21:11 +01:00
ismailgulek e82203ff8c Copy dictionary before enumerating, fixes crash #6 2022-04-12 14:26:52 +03:00
aringenbach 740b04f799 Merge pull request #5999 from vector-im/aringenbach/5995_presence_offline_mode
Presence offline mode setting
2022-04-07 11:43:13 +02:00
aringenbach 53d8379af6 Rename build setting & encode with string value 2022-04-07 09:38:21 +02:00
Doug f46b976101 Merge branch 'master' into develop 2022-04-06 17:48:50 +01:00
Doug e910061416 Notification strings fall back to English if missing 2022-04-06 15:44:12 +01:00
aringenbach 18e2e9940b Add presence offline mode setting 2022-04-06 15:18:54 +02:00
Gil Eluard f92f5a5f0c Room context preview dismissed unexpectedly (#5993)
- fixed
2022-04-06 10:43:35 +02:00
aringenbach d492f6764c Weakify self on presence notifications observers 2022-04-05 15:21:53 +02:00
aringenbach ce05f3de08 Merge branch 'develop' into aringenbach/5933_presence_indicator 2022-04-05 14:14:45 +02:00
ismailgulek fff61b12c1 Reload thread data source without notifying the screen 2022-04-05 14:04:48 +03:00
aringenbach a169c18cf1 Add presence to MXKRecentCellData 2022-04-04 18:52:07 +02:00
MaximeEvrard42 a11a153c1a Merge pull request #5957 from vector-im/maximee/5858_pin_drop_sharing
[Location Sharing]: Pin drop location sharing
2022-04-04 18:04:22 +02:00
MaximeE 2133bb44bb 5858: Modification of the event send according to coordinate type 2022-03-31 16:52:16 +02:00
Frank Rotermund 61d260a8e0 Feature/2581 permalinks 2022-03-31 05:51:40 +00:00
Anderas b8931e183c Merge pull request #5942 from vector-im/andy/5604_join_indicators
Join room loading indicators
2022-03-30 11:05:21 +01:00
Andy Uhnak 1b24371337 Join room loading indicators 2022-03-29 15:03:09 +01:00
Doug 3679282084 Merge pull request #5923 from vector-im/johannes/5058_room_data_source_leak
Fix retain cycle in MXKRoomDataSource
2022-03-29 12:10:36 +01:00
Gil Eluard 2ebcd78a5e Update suggested room preview to behave the same way in all cases #5771
- Done
2022-03-28 13:45:03 +03:00
Stefan Ceriu 36ecded6a7 Fixed the regular expression used for link detection in attributed strings. 2022-03-28 11:57:50 +03:00
Johannes Marbach f9b844db0d Fix retain cycle in MXKRoomDataSource
Relates to: #5058
Signed-off-by: Johannes Marbach <johannesm@element.io>
2022-03-27 20:53:46 +02:00
Gil Eluard e80f697587 Update suggested room preview to behave the same way in all cases #5771
- Done
2022-03-23 10:58:41 +01:00
Stefan Ceriu 11a11ac300 Prevent the homescreen from resetting on every appearance. 2022-03-22 12:44:26 +02:00
Andy Uhnak 7e6f386347 Do not clear cache if there are no stored filters 2022-03-21 16:08:17 +00:00
ismailgulek 6be1f0c37b fix missing MXJSONModel setters 2022-03-17 15:31:15 +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 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 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 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 eaca186e5b Use event's new content when available 2022-03-17 14:24:02 +03:00
ismailgulek 2666401a52 Pass threadId of room data source on replies 2022-03-16 17:13:18 +03:00
ismailgulek c5a80b8de9 Fix tests 2022-03-15 13:55:44 +03:00
ismailgulek e925bb0380 Extend reply fallback for also non-thread events 2022-03-14 13:44:13 +03: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 24de57bb58 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Arnaud Ringenbach e300d6ea6f Rename profile as userAvatarAndName 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 1ab4922d8d Revamp refreshProfiles as setRoomState 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 31f63a72dd Handle use only latest profile live refreshes 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 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 792e7ebb3b Remove unused NSBundle extension methods.
Fix compile errors and remove duplicate strings after rebase.
2022-03-03 10:04:20 +00:00
Doug c9cc59d006 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
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 978d0b032d Merge branch 'origin/develop' into Weblate. 2022-03-02 15:18:11 +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