Commit Graph

21 Commits

Author SHA1 Message Date
ismailgulek d0fd2951e1 Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-01 01:23:00 +03:00
David Langley 1e9fb6b625 Merge pull request #5293 from vector-im/langleyd/5292_refresh_tokens
App: Refresh Tokens Implementation
2022-01-31 08:59:19 +00:00
ismailgulek 38bb315866 Merge branch 'develop' into ismail/5096_thread_notifications 2022-01-27 03:20:25 +03:00
Doug 957815c79e Show social sign in buttons on register screen.
Set final strings for FTUE splash screen.
Add OnboardingSplashScreenTitleText to apply the accent colour to the "." in localised strings.
2022-01-26 14:25:48 +00:00
David Langley 21ec650e8f 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 679c036efc Move all MatrixKit cells + MXKRoomViewController into appropriated folders. 2022-01-21 17:18:59 +01:00
ismailgulek 8d6b2b7c20 Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2022-01-17 11:39:25 +03:00
ismailgulek 7a74dc422f Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
SBiOSoftWhare e6269edf0c MXRoomViewController: Remove unused cell classes. 2022-01-13 16:50:17 +01:00
David Langley 433fb4e2e8 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 dc32c77f44 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 b8a242b66b 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
Stefan Ceriu fc56a7c267 vector-im/element-ios/issues/5298 - Added body message content keys and replaced plain string usages. 2022-01-04 17:33:32 +02:00
Stefan Ceriu 3f715ec2c4 vector-im/element-ios/issues/5298 - Replaced "msgtype" strings with new kMXMessageTypeKey. 2022-01-04 17:33:32 +02:00
Stefan Ceriu ca2493f09d Rendering location messages in the timeline. 2022-01-04 17:33:32 +02:00
ismailgulek 58cd6058fa Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2021-12-16 14:46:43 +03:00
ismailgulek b754299d30 Merge branch 'develop' into ismail/5068_start_thread 2021-12-16 14:00:03 +03:00
ismailgulek 7339a4fe23 Adapt MXEventTimeline changes 2021-12-15 01:44:04 +03:00
SBiOSoftWhare 72077ab7fa RoomVC: Fix left room label memory management. 2021-12-14 18:33:37 +01:00
ismailgulek 924d1d0e30 Apply MatrixKit PR changes 2021-12-09 16:57:43 +03:00
SBiOSoftWhare 1d9f01b5e3 Merge MatrixKit develop with commit hash: b85b736313bec0592bd1cabc68035d97f5331137 2021-12-03 11:47:24 +01:00