Commit Graph

116 Commits

Author SHA1 Message Date
Andy Uhnak e07afc87de Merge branch 'develop' into andy/4829_activity_indicators 2022-02-16 11:32:52 +00:00
Andy Uhnak 8675a606ae Merge branch 'develop' into andy/4829_activity_indicators 2022-02-16 11:32:52 +00:00
Andy Uhnak 514bdb4705 Add new loading indicators 2022-02-14 16:51:02 +00:00
Andy Uhnak b9b2c642e3 Add new loading indicators 2022-02-14 16:51:02 +00:00
Simon Wiedmer eda8dcd086 Merge remote-tracking branch 'upstream/develop' into wiedmer_proximity_sensor 2022-02-14 08:24:25 +01:00
Simon Wiedmer 1cfebedc01 Merge remote-tracking branch 'upstream/develop' into wiedmer_proximity_sensor 2022-02-14 08:24:25 +01:00
Doug 200a1623ce Merge pull request #5510 from aaronraimist/register-spec
Make registration spec compliant (fixes registration on Conduit)
2022-02-10 10:09:52 +00:00
Doug aaefc2c9c4 Merge pull request #5510 from aaronraimist/register-spec
Make registration spec compliant (fixes registration on Conduit)
2022-02-10 10:09:52 +00:00
ismailgulek 30fda7b926 Merge pull request #5539 from vector-im/ismail/5537_home_badges
Home Screen: Fix Section & TabBar Badges
2022-02-10 11:49:50 +03:00
ismailgulek 3f5e5f3c1e Merge pull request #5539 from vector-im/ismail/5537_home_badges
Home Screen: Fix Section & TabBar Badges
2022-02-10 11:49:50 +03:00
Stefan Ceriu 4b1eb75fd3 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Stefan Ceriu 1ab7643de1 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Aaron Raimist 82bee33aeb Switch to using m.login.dummy
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2022-02-10 00:19:02 +00:00
Aaron Raimist 5d980bd46b Switch to using m.login.dummy
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2022-02-10 00:19:02 +00:00
ismailgulek 16135e6e8a Reuse section headers 2022-02-10 03:19:00 +03:00
ismailgulek 8fb3a34c7b Reuse section headers 2022-02-10 03:19:00 +03:00
Aaron Raimist 3b3d4189b2 Make registration spec compliant (fixes registration on Conduit)
Web PR: https://github.com/matrix-org/matrix-react-sdk/pull/4347

Signed-off-by: Aaron Raimist <aaron@raim.ist>
2022-02-06 21:07:17 +00:00
Aaron Raimist 6bf3fc31de Make registration spec compliant (fixes registration on Conduit)
Web PR: https://github.com/matrix-org/matrix-react-sdk/pull/4347

Signed-off-by: Aaron Raimist <aaron@raim.ist>
2022-02-06 21:07:17 +00:00
Simon Wiedmer 4913be0b15 Merge remote-tracking branch 'upstream/develop' into wiedmer_proximity_sensor 2022-02-03 16:52:37 +01:00
Simon Wiedmer 23d0482d3b Merge remote-tracking branch 'upstream/develop' into wiedmer_proximity_sensor 2022-02-03 16:52:37 +01:00
ismailgulek cf2420669f Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-01 01:23:00 +03:00
ismailgulek c358f10272 Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-01 01:23:00 +03:00
Simon Wiedmer 3a1cd3d930 Call native api only if there is a change 2022-01-31 11:13:07 +01:00
Simon Wiedmer ec96c04ea1 Call native api only if there is a change 2022-01-31 11:13:07 +01:00
David Langley 7378847594 Merge pull request #5293 from vector-im/langleyd/5292_refresh_tokens
App: Refresh Tokens Implementation
2022-01-31 08:59:19 +00:00
David Langley ac0bda01ec Merge pull request #5293 from vector-im/langleyd/5292_refresh_tokens
App: Refresh Tokens Implementation
2022-01-31 08:59:19 +00:00
ismailgulek a13d5704dc Merge branch 'develop' into ismail/5096_thread_notifications 2022-01-27 03:20:25 +03:00
ismailgulek d2e5e29ad9 Merge branch 'develop' into ismail/5096_thread_notifications 2022-01-27 03:20:25 +03:00
Doug 59e98dc52e 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
Doug 8cc6644378 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
Simon Wiedmer a02e1d6ca4 Disable proximity sensor and enable sleep after call ended 2022-01-25 08:53:03 +01:00
Simon Wiedmer 31ba6d5ab7 Disable proximity sensor and enable sleep after call ended 2022-01-25 08:53:03 +01: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
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
SBiOSoftWhare 9f3d57da55 Move all MatrixKit cells + MXKRoomViewController into appropriated folders. 2022-01-21 17:18:59 +01:00
SBiOSoftWhare 87bba993bc Move all MatrixKit cells + MXKRoomViewController into appropriated folders. 2022-01-21 17:18:59 +01:00
ismailgulek 26a6060e3e Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2022-01-17 11:39:25 +03:00
ismailgulek 23eeedb9ac Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2022-01-17 11:39:25 +03:00
ismailgulek 7e92b7cef5 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
ismailgulek a314deb7a1 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
SBiOSoftWhare 4beab83f87 MXRoomViewController: Remove unused cell classes. 2022-01-13 16:50:17 +01:00
SBiOSoftWhare 2b0b59a3b6 MXRoomViewController: Remove unused cell classes. 2022-01-13 16:50:17 +01: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
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 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 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 fb6dede930 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
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
Stefan Ceriu b9e718c6a8 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 7826faf6ea vector-im/element-ios/issues/5298 - Added body message content keys and replaced plain string usages. 2022-01-04 17:33:32 +02:00