Commit Graph

263 Commits

Author SHA1 Message Date
Arnfried Griesert d3aa80857d feature/3074_password_change_wording 2022-06-29 11:17:04 +00:00
Frank Rotermund 1ab51f37f8 Merge branch 'master' of https://github.com/vector-im/element-ios into feature/3269_merge_element_1_8_18
# Conflicts:
#	Config/AppIdentifiers.xcconfig
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Modules/Analytics/DecryptionFailureTracker.m
#	Riot/Modules/Application/LegacyAppDelegate.h
#	Riot/Modules/Onboarding/OnboardingCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/SupportingFiles/Info.plist
#	Riot/Utils/EventFormatter.m
#	Riot/Utils/Tools.h
#	Riot/Utils/Tools.m
#	Riot/target.yml
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
#	fastlane/Fastfile
#	project.yml
2022-06-12 19:49:46 +02:00
Arnfried Griesert c20966c2ab Feature/1801 ruhezeit einstellungsmenu 2022-06-02 03:41:21 +00:00
MaximeE d8312bb13b 6195: Apply PR comments 2022-05-31 09:49:46 +02:00
MaximeE d8e9c211b5 6195: Hide live location sharing lab setting for now 2022-05-30 17:32:12 +02:00
MaximeE be383be23f 6195: Add labbs flag for live location sharing 2022-05-24 11:43:00 +02:00
Arnfried Griesert 966f5299d9 merged from element 1.8.13 2022-05-05 06:57:45 +02:00
Frank Rotermund 557848def2 MESSENGER_2910 buildfixes VII build successful 2022-05-03 16:45:58 +02:00
Arnfried Griesert 990962285a merged element 1.8.10 2022-05-03 12:48:01 +02:00
ismailgulek 365203fb9c Add discourage view when server doesn't support threads 2022-04-19 13:32:15 +03:00
Arnfried Griesert df5dfbc6a6 feature/2821_downtime_login_screen 2022-04-12 08:26:29 +00:00
aringenbach 53d8379af6 Rename build setting & encode with string value 2022-04-07 09:38:21 +02:00
aringenbach 18e2e9940b Add presence offline mode setting 2022-04-06 15:18:54 +02:00
David Langley 12d0ba3ca8 Actually fix merge. 2022-03-21 10:41:10 +00:00
David Langley c9334eb5e9 Revert "fix merge"
This reverts commit 3c26c9a7da6f161076ce68c8b51ba52adf34fc13.
2022-03-21 10:39:50 +00:00
Frank Rotermund c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
David Langley 6ca00b84e7 fix merge 2022-03-17 09:16:11 +00:00
David Langley 712a9bee13 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 d53c90f47c 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 24de57bb58 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Arnaud Ringenbach e300d6ea6f Rename profile as userAvatarAndName 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 6ccf209ed8 Use only latest profiles in the timeline (labs) 2022-03-07 13:45:02 +01:00
Doug c9cc59d006 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Stefan Ceriu 02ab8eec9e Merge branch 'master' into develop 2022-02-16 12:45:06 +02:00
Doug 79aaf9f2c0 Use UIControlEventTouchUpInside for all toggles. 2022-02-16 12:42:00 +02:00
SBiOSoftWhare 23df7ed75e SettingsViewController: Fix indent issue. 2022-02-16 12:42:00 +02:00
SBiOSoftWhare 65d68c58dc Message bubbles: Move bubbles settings to labs section atm. 2022-02-16 12:42:00 +02:00
aringenbach 2f6546799e 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 c5e926d4e6 SettingsViewController: Fix indent issue. 2022-02-10 15:08:24 +01:00
SBiOSoftWhare 1e26681e34 Message bubbles: Move bubbles settings to labs section atm. 2022-02-10 14:59:45 +01: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
ismailgulek e84e78b1e7 Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-02 12:46:00 +03:00
Stefan Ceriu 500aba906e De-labs location sharing and enable it by default. 2022-02-02 09:59:45 +02:00
ismailgulek 1b055a7dcd Feed threading option in the SDK 2022-01-28 04:32:06 +03:00
ismailgulek 4dc28af682 Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03: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 3e2c4b32b0 Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu 9ddf80f54b 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 0776599369 Reset detail screen after lab setting change, fixes #5273 2022-01-18 02:14:23 +03:00
ismailgulek 7e92b7cef5 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
SBiOSoftWhare f5929bfd1a SettingsVC: Handle possibility to change room timeline style and apply changes. 2022-01-14 10:06:40 +01:00
SBiOSoftWhare 3b82f6e56e 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 8d97959cac vector-im/element-ios/issues/5298 - Added build setting + ui and unit tests. 2022-01-04 17:33:32 +02:00
Stefan Ceriu 7e212887c8 vector-im/element-ios/issues/5298 - Settings screen toggle for disabling location sharing. 2022-01-04 17:33:32 +02:00
ismailgulek 9cd27d293c Merge branch 'develop' into ismail/5068_start_thread 2022-01-04 15:28:19 +03:00
SBiOSoftWhare b69fa7cc31 Settings: Add enable room message bubbles parameter. 2022-01-03 18:30:59 +01:00
Doug 47348b7f34 Add AnalyticsScreenTimer and track more screens.
Update Analytics with new methods in MXAnalyticsDelegate.
2021-12-16 16:59:45 +00:00
Doug d43bf82bca 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 b52a83e171 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 efdbdcd117 Begin migration from Matomo to PostHog
Add CocoaPods-Keys.
2021-12-16 16:59:26 +00:00