Commit Graph

250 Commits

Author SHA1 Message Date
aringenbach 320fa8d59a Add presence offline mode setting 2022-04-06 15:18:54 +02:00
David Langley da5d49f358 Actually fix merge. 2022-03-21 10:41:10 +00:00
David Langley ad35b38d90 Revert "fix merge"
This reverts commit 0251a01bb05f9c2139f09847adc2313609a77103.
2022-03-21 10:39:50 +00:00
David Langley 3619134fdd fix merge 2022-03-17 09:16:11 +00:00
David Langley f449acf4f6 Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/5017_uisi_autoreporter 2022-03-16 21:45:33 +00:00
David Langley 4784084ab0 Update detector to match web implementation(only track decryption attempts), add labs flag, increase rate limit spacing. 2022-03-16 17:47:41 +00:00
Gil Eluard acf7d0de13 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Arnaud Ringenbach cfeae5bc64 Rename profile as userAvatarAndName 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach a6ed656107 Use only latest profiles in the timeline (labs) 2022-03-07 13:45:02 +01:00
Doug 86c2b4ebb5 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Stefan Ceriu 92f633cccb Merge branch 'master' into develop 2022-02-16 12:45:06 +02:00
Doug 67fa312cb7 Use UIControlEventTouchUpInside for all toggles. 2022-02-16 12:42:00 +02:00
SBiOSoftWhare aab66e1485 SettingsViewController: Fix indent issue. 2022-02-16 12:42:00 +02:00
SBiOSoftWhare eabf7350f3 Message bubbles: Move bubbles settings to labs section atm. 2022-02-16 12:42:00 +02:00
aringenbach 7964d314c8 Add objective C support to SwiftGen assets helpers (#5533)
* Add objective C support to SwiftGen assets helpers

* Use dot notation in ObjC & fix minor issues

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-10 17:13:23 +01:00
SBiOSoftWhare 39a7d16261 SettingsViewController: Fix indent issue. 2022-02-10 15:08:24 +01:00
SBiOSoftWhare 7ff40270e1 Message bubbles: Move bubbles settings to labs section atm. 2022-02-10 14:59:45 +01: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
ismailgulek 95db348bdc Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-02 12:46:00 +03:00
Stefan Ceriu a3c6fc56c6 De-labs location sharing and enable it by default. 2022-02-02 09:59:45 +02:00
ismailgulek f99197e6ec Feed threading option in the SDK 2022-01-28 04:32:06 +03:00
ismailgulek 6ac01ae245 Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03: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
ismailgulek 701d38c798 Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu f3422613cd vector-im/element-ios/issues/5114 - De-labs-ed polls, disabled editing and undisclosed polls until platform parity. 2022-01-18 20:05:10 +02:00
ismailgulek 2fde94f38c Reset detail screen after lab setting change, fixes #5273 2022-01-18 02:14:23 +03:00
ismailgulek a314deb7a1 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
SBiOSoftWhare 4a27aaaf2f SettingsVC: Handle possibility to change room timeline style and apply changes. 2022-01-14 10:06:40 +01:00
SBiOSoftWhare ca87f9b1f6 Merge pull request #5342 from vector-im/steve/5321_bubbles_lauching
Message bubbles: Add settings and build flag
2022-01-13 09:50:23 +01:00
Stefan Ceriu 0bac754ad9 vector-im/element-ios/issues/5298 - Added build setting + ui and unit tests. 2022-01-04 17:33:32 +02:00
Stefan Ceriu 5f6b6b27aa vector-im/element-ios/issues/5298 - Settings screen toggle for disabling location sharing. 2022-01-04 17:33:32 +02:00
ismailgulek ac1b79ff92 Merge branch 'develop' into ismail/5068_start_thread 2022-01-04 15:28:19 +03:00
SBiOSoftWhare 41b2851905 Settings: Add enable room message bubbles parameter. 2022-01-03 18:30:59 +01:00
Doug 315f5a9cc4 Add AnalyticsScreenTimer and track more screens.
Update Analytics with new methods in MXAnalyticsDelegate.
2021-12-16 16:59:45 +00:00
Doug 33ef957053 Use matrix-analytics-events generated stubs (locally for now).
Track screens, removing any that aren't part of the schema.
2021-12-16 16:59:45 +00:00
Doug e8d02c5458 Don't read analytics opt in status from account data.
Update PostHog to 1.4.3.

Add tests for prompt type.
2021-12-16 16:59:45 +00:00
Doug a984028479 Begin migration from Matomo to PostHog
Add CocoaPods-Keys.
2021-12-16 16:59:26 +00:00
ismailgulek 061f62251b Apply MatrixKit PR changes 2021-12-09 16:57:43 +03:00
ismailgulek 3a6e7a19e2 Merge branch 'develop' into ismail/5068_start_thread 2021-12-09 15:25:14 +03:00
Stefan Ceriu ac6561a3d3 vector-im/element-ios/issues/5114 - Polls in the timeline. 2021-12-09 09:37:02 +02:00
SBiOSoftWhare e8d4af46d2 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
ismailgulek bcec32f8da Merge branch 'develop' into ismail/5068_start_thread 2021-11-19 00:23:24 +03:00
Doug 6dd471045f Merge branch 'master' into develop
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +00:00
ismailgulek 8c1dbd8311 Merge branch 'develop' into ismail/5068_start_thread 2021-11-11 21:43:16 +03:00
ismailgulek 49cadec685 Add labs setting for threads 2021-11-09 15:18:18 +03:00
Phl-Pro 31a99e2e09 Merge branch 'develop' into phlpro/4722_objc_headers 2021-11-05 14:41:36 +01:00
SBiOSoftWhare c534fa1187 Merge pull request #5091 from vector-im/steve/5090_update_settings_about_section
Settings: Update about section footer text
2021-11-04 12:02:10 +01:00
SBiOSoftWhare 9a9f79a67d SettingsVC: Update about section footer text. 2021-11-04 11:48:06 +01:00
Doug 36fa788312 Keep strong refs to weak views before display. 2021-11-01 17:38:56 +00:00
SBiOSoftWhare b6614109a0 SettingsViewController: Prevent retain cycles. 2021-10-29 10:49:29 +02:00