Commit Graph

11 Commits

Author SHA1 Message Date
David Langley 9005878bc1 Fix bad formatting from merge moar. 2022-01-24 18:39:42 +00:00
David Langley 9030845250 Revert bad merge formatting from "Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens"
This reverts commit d8a4b4a3e550d2f5b63ffaa0983a13b4342cdb7b, reversing
changes made to 347438c0c533630ecc8c4216b6c917575d00e935.
2022-01-24 18:35:00 +00:00
David Langley d940c49a2d Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens 2022-01-24 17:06:55 +00:00
David Langley c1f2cc3302 Change HomeViewControllerWithBannerWrapperViewController to MXKViewControllerActivityHandling conformance. 2022-01-19 09:48:16 +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
Gil Eluard 5521802bc2 [Spaces] M10.6.1 Handle space link #4498
- Update after code review
2021-09-23 17:15:32 +02:00
Gil Eluard 4a7a75564b reverted HomeViewControllerWithBannerWrapperViewController 2021-09-23 15:38:43 +02:00
Gil Eluard fe15785d7b fixed FAB button in Home screen 2021-09-22 22:57:21 +02:00
Gil Eluard 3db7e10c15 [Spaces] M10.6.1 Handle space link #4498
- Fixed universal links
- Added support for space links
2021-09-22 14:58:19 +02:00
Stefan Ceriu 9ed36b1690 Fixes #4449 - Clipped home view on search. 2021-08-31 11:03:26 +03:00
Stefan Ceriu 95572d5e44 Implements #4693 - Alert users of Element on iOS11 deprecation. 2021-08-25 13:57:32 +03:00