Commit Graph

652 Commits

Author SHA1 Message Date
aringenbach 53d8379af6 Rename build setting & encode with string value 2022-04-07 09:38:21 +02:00
aringenbach 320fa8d59a Add presence offline mode setting 2022-04-06 15:18:54 +02:00
aringenbach 18e2e9940b 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 12d0ba3ca8 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 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 3619134fdd fix merge 2022-03-17 09:16:11 +00:00
David Langley 6ca00b84e7 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 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 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
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 acf7d0de13 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Gil Eluard 24de57bb58 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 e300d6ea6f 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
Arnaud Ringenbach 6ccf209ed8 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
Doug c9cc59d006 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
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
Doug 67fa312cb7 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 aab66e1485 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
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
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 39a7d16261 SettingsViewController: Fix indent issue. 2022-02-10 15:08:24 +01:00
SBiOSoftWhare c5e926d4e6 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
SBiOSoftWhare 1e26681e34 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
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 95db348bdc Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-02 12:46:00 +03:00
ismailgulek e84e78b1e7 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
Stefan Ceriu 500aba906e 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 1b055a7dcd 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
ismailgulek 4dc28af682 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
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 701d38c798 Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
ismailgulek 3e2c4b32b0 Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00