Commit Graph

760 Commits

Author SHA1 Message Date
SBiOSoftWhare 958da2c221 MockRoomSummary: Update with userIdsSharingLiveBeacon property. 2022-04-08 12:30:37 +02:00
SBiOSoftWhare 35766bf02e Merge branch 'develop' into steve/5903_lls_start
# Conflicts:
#	Riot/Modules/Room/RoomViewController.h
#	RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
2022-04-08 11:09:06 +02:00
SBiOSoftWhare 92a721c8b9 Merge branch 'develop' into steve/5903_lls_start
# Conflicts:
#	Riot/Modules/Room/RoomViewController.h
#	RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
2022-04-08 11:09:06 +02:00
Andy Uhnak 411279bef1 Merge branch 'develop' into andy/5619_home_reloads 2022-04-07 10:49:15 +01:00
Andy Uhnak 97f0237b01 Merge branch 'develop' into andy/5619_home_reloads 2022-04-07 10:49:15 +01:00
Andy Uhnak 58e48050d8 Align style 2022-04-07 10:47:06 +01:00
Andy Uhnak 3812f08eb1 Align style 2022-04-07 10:47:06 +01:00
Anderas ab0ca803ea Merge pull request #5968 from vector-im/andy/sections_refactor
Refactor sections as enum types
2022-04-07 10:43:23 +01:00
Anderas 62a81ecc9b Merge pull request #5968 from vector-im/andy/sections_refactor
Refactor sections as enum types
2022-04-07 10:43:23 +01:00
Andy Uhnak 94ea5f61e4 Merge branch 'develop' into andy/5958_home_scroll 2022-04-07 09:57:47 +01:00
Andy Uhnak 9684db157e Merge branch 'develop' into andy/5958_home_scroll 2022-04-07 09:57:47 +01:00
Doug f46b976101 Merge branch 'master' into develop 2022-04-06 17:48:50 +01:00
Doug b2c902a4f5 Merge branch 'master' into develop 2022-04-06 17:48:50 +01:00
Gil Eluard f92f5a5f0c Room context preview dismissed unexpectedly (#5993)
- fixed
2022-04-06 10:43:35 +02:00
Gil Eluard 0021c3f35b Room context preview dismissed unexpectedly (#5993)
- fixed
2022-04-06 10:43:35 +02:00
aringenbach 10cebea479 PresenceIndicatorView Swift implementation 2022-04-05 15:13:58 +02:00
aringenbach 38363b1832 PresenceIndicatorView Swift implementation 2022-04-05 15:13:58 +02:00
aringenbach ce05f3de08 Merge branch 'develop' into aringenbach/5933_presence_indicator 2022-04-05 14:14:45 +02:00
aringenbach fa3f01bb8f Merge branch 'develop' into aringenbach/5933_presence_indicator 2022-04-05 14:14:45 +02:00
Gil Eluard 75a5be19e9 Add support for Apple context menus in matrix items list screens (#5963) 2022-04-04 20:07:06 +02:00
Gil Eluard 1adfa904ae Add support for Apple context menus in matrix items list screens (#5963) 2022-04-04 20:07:06 +02:00
aringenbach 0745aa8c89 Enable presence indicator border colour update 2022-04-04 18:52:07 +02:00
aringenbach dbd38d79b2 Enable presence indicator border colour update 2022-04-04 18:52:07 +02:00
aringenbach 73dad42c6f Setup IBInspectable for indicator border width 2022-04-04 18:52:07 +02:00
aringenbach b79c924a18 Setup IBInspectable for indicator border width 2022-04-04 18:52:07 +02:00
aringenbach f084689434 Display presence indicator on home & DM list 2022-04-04 18:52:07 +02:00
aringenbach 93ce241a0b Display presence indicator on home & DM list 2022-04-04 18:52:07 +02:00
Andy Uhnak 87cc0d8940 Reduce the number of unnecessary home page reloads 2022-04-04 12:04:55 +01:00
Andy Uhnak e817286424 Reduce the number of unnecessary home page reloads 2022-04-04 12:04:55 +01:00
Andy Uhnak 95284762c8 Refactor sections as enum types 2022-04-04 09:40:26 +01:00
Andy Uhnak 3f34fd655a Refactor sections as enum types 2022-04-04 09:40:26 +01:00
Andy Uhnak 303d58ae49 Register unique cells for home screen sections 2022-04-04 08:30:25 +01:00
Andy Uhnak a7228a4aaf Register unique cells for home screen sections 2022-04-04 08:30:25 +01:00
Arnfried Griesert 594b22ddab 2809 force newest version 2022-03-31 05:52:47 +00:00
Andy Uhnak 4fe43da6d5 New loading indicators when creating a room 2022-03-29 17:18:11 +01:00
Andy Uhnak 34ad047ae4 New loading indicators when creating a room 2022-03-29 17:18:11 +01:00
Arnfried Griesert dc589828b0 feature/1873_unread_messanges_marker 2022-03-29 06:06:22 +00: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
SBiOSoftWhare dc8caac305 MockRoomSummary: Update with new property. 2022-03-28 10:14:11 +02:00
SBiOSoftWhare 56a31a0d13 MockRoomSummary: Update with new property. 2022-03-28 10:14:11 +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
Gil Eluard 2cc1d3ac2e Update suggested room preview to behave the same way in all cases #5771
- Done
2022-03-23 10:58:41 +01:00
Andy Uhnak 43220de4f5 Revert optionality and always pass url 2022-03-22 14:46:27 +00:00
Andy Uhnak 82fed12a85 Revert optionality and always pass url 2022-03-22 14:46:27 +00:00
Frank Rotermund 4b1ca0ff7f Feature/2897 restricted user 2022-03-22 14:37:58 +00:00
Frank Rotermund c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
Gil Eluard bd0041c5dc Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event 2022-03-15 10:32:19 +01:00
Gil Eluard 69cec41da0 Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event 2022-03-15 10:32:19 +01:00
Gil Eluard 67b0df922f Add trigger to join and view room metrics events #5769
- Added trigger for JoinedRoom event
- Tracking ViewRoom event for rooms and events
2022-03-15 10:31:24 +01:00
Gil Eluard c747ff86ac Add trigger to join and view room metrics events #5769
- Added trigger for JoinedRoom event
- Tracking ViewRoom event for rooms and events
2022-03-15 10:31:24 +01:00