Commit Graph

26992 Commits

Author SHA1 Message Date
Michelle Linington
93fa39e53f "Bump build to 5.27.0.116." 2022-01-28 13:32:36 -08:00
Michelle Linington
a2bfe15fbc "Feature flags for .production." 2022-01-28 13:32:33 -08:00
Michelle Linington
e3d18733da Bump copyright 2022-01-28 13:23:47 -08:00
Michelle Linington
29d7ef4adb Sync translations 2022-01-28 13:23:25 -08:00
Michelle Linington
5c5bdf7ace Sync translations 2022-01-28 10:54:00 -08:00
Michelle Linington
c2a631b782 Update release notes for production 2022-01-28 10:54:00 -08:00
Martin Böttcher
86f9a31839 Merge branch 'martin/IOS-2140' into release/5.27.0 2022-01-28 13:56:59 +01:00
Martin Böttcher
e27834b66b corrected line break 2022-01-28 13:55:56 +01:00
Martin Böttcher
5e197748b3 non-selectable rows in the homeview are automatically deselected if tapped 2022-01-28 10:32:32 +01:00
Martin Böttcher
3786367d6f goto archive cell respects iPad color scheme and does not trigger anything if pressed in disabled state 2022-01-28 10:26:35 +01:00
Martin Böttcher
3c6743a57b various improvements to multi select mode 2022-01-28 10:12:35 +01:00
Michelle Linington
c67bd90454 "Bump build to 5.27.0.115." (Internal) 2022-01-27 16:13:03 -08:00
Michelle Linington
f2350eb9aa "Feature flags for .qa." 2022-01-27 16:12:57 -08:00
Michelle Linington
ad7961a02a "Bump build to 5.27.0.114." (Beta) 2022-01-27 16:12:53 -08:00
Michelle Linington
8def7021bf "Feature flags for .beta." 2022-01-27 16:12:47 -08:00
Michelle Linington
b709ff6db2 Sync translations 2022-01-27 16:12:42 -08:00
Nora Trapp
390a9243cb Merge branch 'nt/pin-fixes' into release/5.27.0 2022-01-27 16:03:12 -08:00
Nora Trapp
ef1af793c6 Update introducing PINs copy. 2022-01-27 15:22:38 -08:00
Nora Trapp
4b820d0f74 Improve PIN setup error handling 2022-01-27 15:22:38 -08:00
Nora Trapp
58bf1d1326 Mark registration lock as disabled locally when PIN is disabled 2022-01-27 15:22:38 -08:00
Nora Trapp
e27680b57a Allow the introducingPins megaphone to be completed multiple times 2022-01-27 15:22:38 -08:00
Michelle Linington
3abac4f12b Merge branch 'mlin/PR/MultiSelectDBPerf' into release/5.27.0 2022-01-27 14:57:13 -08:00
Michelle Linington
da7963626f Database perf improvements in home view 2022-01-27 14:55:54 -08:00
Martin Böttcher
e5ff284f4e Merge branch 'martin/IOS-2156' into release/5.27.0 2022-01-27 22:08:33 +01:00
Martin Böttcher
42e3b2eb99 entering multi select mode if row actions or search results are shown, hides the actions and the disables the search 2022-01-27 22:07:50 +01:00
Martin Böttcher
e91c73881b Merge branch 'martin/multiselectimprovements' into release/5.27.0 2022-01-27 22:02:53 +01:00
Martin Böttcher
1051241672 corrected broken display of updated search results 2022-01-27 21:54:15 +01:00
Martin Böttcher
9aeb55e43e entering multi select mode if row actions or search results are shown, hides the actions and the disables the search 2022-01-27 19:56:01 +01:00
Nora Trapp
14a4d84b76 Make change number splash scrollable 2022-01-26 14:59:57 -08:00
Michelle Linington
d9e17c1844 "Bump build to 5.27.0.113." (Internal) 2022-01-26 12:02:06 -08:00
Michelle Linington
182c233f65 "Feature flags for .qa." 2022-01-26 12:02:03 -08:00
Michelle Linington
5723687ec7 "Bump build to 5.27.0.112." (Beta) 2022-01-26 12:02:00 -08:00
Michelle Linington
4e3c4851f1 "Feature flags for .beta." 2022-01-26 12:01:55 -08:00
Michelle Linington
00c60332a2 Sync translations 2022-01-26 12:01:35 -08:00
Nora Trapp
dc788cd347 Ignore messages with StoryContext 2022-01-26 10:28:52 -08:00
Martin Böttcher
f403fb8bf3 fixed visibility of typing indicator 2022-01-26 16:55:57 +01:00
Martin Böttcher
82287522b4 receiving a push notification immediatly updates the homeview again 2022-01-26 15:13:26 +01:00
Martin Böttcher
fcbd352462 renamed some properties and arguments; removed orphaned protocol 2022-01-26 10:46:08 +01:00
Martin Böttcher
777c9785a2 refactored background color handling (part of cell configuration), fixed colors searching on iPad, changed handling of theme change during multi-selection 2022-01-26 10:46:08 +01:00
Martin Böttcher
8aee99968f fixed setting cell background color 2022-01-26 10:46:08 +01:00
Martin Böttcher
625fc41416 cell background and context menu react to Theme changes 2022-01-26 10:46:08 +01:00
Martin Böttcher
738cb3c198 home view cells and toolbar reacts to Theme change 2022-01-26 10:46:08 +01:00
Martin Böttcher
db39ea30bb pinning an archived conversation automatically moves it into inbox again
(cherry picked from commit f25aa47805)
2022-01-26 09:59:20 +01:00
Martin Böttcher
768ed37943 pinning an archived conversation, unarchives and pins the conversation
(cherry picked from commit 432e4ea4c6)
2022-01-26 09:59:20 +01:00
Jordan Rose
1ecea28f08 Merge branch 'jrose/fix-skin-tone-reacts' 2022-01-25 18:04:24 -08:00
Jordan Rose
68a1a10773 Don't validate custom reactions when sync'd from storage-service
Instead, defer validation until use, which allows us to preserve
whatever weird state another device has set. Locally-invalid reactions
will still be replaced with the default reaction at the same index
when the user actually tries to apply a reaction, and this will stick
if the user customizes their reactions locally.
2022-01-25 17:33:58 -08:00
Jordan Rose
ca06daf06d Require skin tone to match when looking at an existing reaction
...and deciding if it's one of your default reactions. This is
consistent with the previous commit.
2022-01-25 17:33:58 -08:00
Jordan Rose
398331f512 Don't apply "preferred" skin tones to the default set of reactions
This is a change from past behavior in order to standardize on
explicit customization being the only way to change the default set of
reactions.
2022-01-25 17:33:58 -08:00
Jordan Rose
cc0ad75524 Fix handling of customized emoji reactions with skin tone modifiers
iOS keeps track of the last-used skin tone modifiers for every
reaction emoji you use. Before reactions were customizable, this
applied to the default set of reactions as well: if you went into the
full picker to select a light-skinned thumbs-up, the short picker
would also have a light-skinned thumbs-up from then on, and if you
changed to dark skin or back to "default" (yellow in our font), the
short picker would be updated again.

However, this is *not* how the customized reactions sync'd through
storage service work; those have skin tone modifiers "baked in", so to
speak. These reactions weren't being treated as valid because they
weren't "base" emoji that could have a skin tone applied to them.

This PR changes things so that there are now two possible states:

- You have never customized your reactions on any platform. In this
  case, skin tones continue to follow your most recent choice for that
  emoji from the full picker.

- You *have* customized your reactions, in which case it's assumed
  they already have the skin tones you want. This even allows you to
  have multiple reactions in your default set with the same base emoji
  but different skin tones.

Further commits will remove the special nature of the first state.
2022-01-25 17:33:58 -08:00
Jordan Rose
b567e9add9 Format EmojiReactionPickerConfigViewController.swift 2022-01-25 17:33:58 -08:00