Commit Graph

291 Commits

Author SHA1 Message Date
ismailgulek 9c5b83a1b3 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-26 14:27:25 +03:00
ismailgulek a24e208cb1 Fix review remarks 2022-01-25 23:59:19 +03:00
ismailgulek f7694e27cb Fix review remarks 2022-01-25 23:59:19 +03:00
ismailgulek 6ac01ae245 Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03:00
ismailgulek 4dc28af682 Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03:00
David Langley 0084965518 Remove NSLog and fix Analytics documentation. 2022-01-24 12:44:26 +00:00
David Langley 303bbccb83 Remove NSLog and fix Analytics documentation. 2022-01-24 12:44:26 +00:00
David Langley 50defa7e3e Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens 2022-01-24 12:19:45 +00:00
David Langley 583d5b32fe Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens 2022-01-24 12:19:45 +00:00
SBiOSoftWhare 535af1caf3 Merge pull request #5383 from vector-im/steve/5208_text_msg_layout
Message bubbles: Text message layout
2022-01-21 16:06:57 +01:00
SBiOSoftWhare 04267efeee Merge pull request #5383 from vector-im/steve/5208_text_msg_layout
Message bubbles: Text message layout
2022-01-21 16:06:57 +01:00
ismailgulek 5c653b5346 Implement going back to live room data sources for threads, fix bugs around it 2022-01-21 01:56:51 +03:00
ismailgulek f5512d1be4 Implement going back to live room data sources for threads, fix bugs around it 2022-01-21 01:56:51 +03:00
SBiOSoftWhare 8997578680 MXKRoomBubbleCellData: Improve getFirstBubbleComponentWithDisplay and getLastBubbleComponentWithDisplay. 2022-01-20 16:01:45 +01:00
SBiOSoftWhare 4ea9804cf9 MXKRoomBubbleCellData: Improve getFirstBubbleComponentWithDisplay and getLastBubbleComponentWithDisplay. 2022-01-20 16:01:45 +01:00
ismailgulek 849bfa9b59 Disable thread timelines for now 2022-01-19 01:05:48 +03:00
ismailgulek 97cfc5b8ae Disable thread timelines for now 2022-01-19 01:05:48 +03:00
ismailgulek 8cee4153e5 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-19 00:12:40 +03:00
ismailgulek 81405b4dd6 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-19 00:12:40 +03:00
ismailgulek 83948f113f Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-19 00:09:26 +03:00
ismailgulek f3334ad5ae Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-19 00:09:26 +03:00
ismailgulek 701d38c798 Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
ismailgulek 3e2c4b32b0 Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu f2572ee34f vector-im/element-ios/issues/5114 - Renamed unstable extensible audio key. 2022-01-18 20:05:10 +02:00
Stefan Ceriu cca89d517b vector-im/element-ios/issues/5114 - Renamed unstable extensible audio key. 2022-01-18 20:05:10 +02:00
ismailgulek 1f3a8acaeb Add background color management on text message highlights 2022-01-18 16:20:12 +03:00
ismailgulek 0d74667d7d Add background color management on text message highlights 2022-01-18 16:20:12 +03:00
ismailgulek b400133517 Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2022-01-17 11:55:28 +03:00
ismailgulek c3cd95072c Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2022-01-17 11:55:28 +03:00
ismailgulek 6b2805b161 Add threadId parameter 2022-01-17 11:54:36 +03:00
ismailgulek 8404562325 Add threadId parameter 2022-01-17 11:54:36 +03:00
ismailgulek 23eeedb9ac Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2022-01-17 11:39:25 +03:00
ismailgulek 26a6060e3e Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2022-01-17 11:39:25 +03:00
ismailgulek a314deb7a1 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
ismailgulek 7e92b7cef5 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
David Langley 021b34be21 Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens 2022-01-14 11:43:09 +00:00
David Langley 4bc9df0549 Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens 2022-01-14 11:43:09 +00:00
David Langley 06e8f0a71b Add analytics for Unauthenticated errors 2022-01-13 17:33:51 +00:00
David Langley 21d49a5067 Add analytics for Unauthenticated errors 2022-01-13 17:33:51 +00:00
SBiOSoftWhare 80391fba8c MXKRoomBubbleCellData: Add convenient method. 2022-01-13 16:54:45 +01:00
SBiOSoftWhare cf21517bc4 MXKRoomBubbleCellData: Add convenient method. 2022-01-13 16:54:45 +01:00
David Langley b779eccfce Remove duplicated logout code and fix spinner.
- Remove some duplication of logout behaviour
- Fix additional spinner on homeViewController
2022-01-10 21:38:24 +00:00
David Langley bc08428f4c Remove duplicated logout code and fix spinner.
- Remove some duplication of logout behaviour
- Fix additional spinner on homeViewController
2022-01-10 21:38:24 +00:00
ismailgulek 0c6ad81781 Merge branch 'develop' into ismail/4384_summary_db 2022-01-08 00:54:17 +03:00
ismailgulek 6a2ac67696 Merge branch 'develop' into ismail/4384_summary_db 2022-01-08 00:54:17 +03:00
ismailgulek ee13ff1079 Adapt summaries module name change 2022-01-07 18:30:30 +03:00
ismailgulek 13f77cd00b Adapt summaries module name change 2022-01-07 18:30:30 +03:00
David Langley 72bcae9d15 Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens 2022-01-06 22:43:20 +00:00
David Langley 6df4713eba Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens 2022-01-06 22:43:20 +00:00
David Langley 756b1c3d1d Split MXKAccount from Data so just data can be loaded from disk without side effects. Also change force reload of accounts to stop double load on init. 2022-01-06 20:35:37 +00:00