Commit Graph

13473 Commits

Author SHA1 Message Date
Nora Trapp
7aadee0062 Merge branch 'nt/live-camera' 2019-08-09 12:57:37 -07:00
Nora Trapp
21259ec24b PR Feedback 2019-08-09 12:57:03 -07:00
Nora Trapp
b560fc0afd Show live camera preview in attachment keyboard 2019-08-09 12:54:34 -07:00
Nora Trapp
ead88a56cd Merge branch 'nt/location-share' 2019-08-09 12:53:35 -07:00
Nora Trapp
36ce5d2940 PR feedback 2019-08-09 12:53:19 -07:00
Nora Trapp
28a4dfe3e6 Some small design tweaks. 2019-08-09 12:53:19 -07:00
Nora Trapp
8a167072b8 Don't ask for photo permissions until the attachment keyboard is presented. 2019-08-09 12:53:19 -07:00
Nora Trapp
17f961f6ad Allow location sharing 2019-08-09 12:53:19 -07:00
Michael Kirk
44f032feb4 Merge branch 'mkirk/fix-index-vs-thread-details' 2019-08-09 13:51:47 -06:00
Michael Kirk
f1eac5c0ef Fix crash when presenting media.
ThreadDetailView has a cell, but wasn't accounted for in the conversation
mapping, so our index calculations were off-by-one.
2019-08-09 13:51:23 -06:00
Michael Kirk
4c3d367d7f Merge branch 'mkirk/warning-followup' 2019-08-09 13:48:19 -06:00
Michael Kirk
d3b501bdc8 cant synthesize atomic property with custom setter 2019-08-09 13:47:07 -06:00
Michael Kirk
7d2684cafd Merge branch 'mkirk/fix-missing-declined-call-record' 2019-08-09 13:44:25 -06:00
Michael Kirk
37468c4158 Fix missing: "you declined call" record for CallKit adapter
And fixes the corresponding debug assert that uncovered this bug.
2019-08-09 13:43:59 -06:00
Michael Kirk
e49e7f10d1 Merge branch 'mkirk/notifications-fix' 2019-08-09 13:42:22 -06:00
Michael Kirk
f0157f5e6c Fix missed call notification
Notification userInfo must support NSSecureCoding
2019-08-09 13:42:22 -06:00
Matthew Chen
95e08db965 Merge branch 'charlesmchen/shuffleKeyValueStores' 2019-08-09 16:40:52 -03:00
Matthew Chen
f4ed21ad11 Consolidate key-value store registration. 2019-08-09 16:40:40 -03:00
Matthew Chen
1449bc8391 Merge branch 'charlesmchen/mediaSendFlowTweaks_' 2019-08-09 16:17:22 -03:00
Matthew Chen
36efe2b0d7 Respond to CR. 2019-08-09 16:16:48 -03:00
Matthew Chen
6ed12aa9fe Respond to CR. 2019-08-09 15:29:47 -03:00
Matthew Chen
f61feaf4e1 Respond to CR. 2019-08-09 14:43:50 -03:00
Matthew Chen
2b8967974e Clean up ahead of PR. 2019-08-09 14:43:50 -03:00
Matthew Chen
f53bc36c4c Hide the 'View once photo' indicator. 2019-08-09 14:43:50 -03:00
Matthew Chen
d48bdb208f Enable batch select mode by default (for now). 2019-08-09 14:43:50 -03:00
Matthew Chen
21b21df94a Restore & move camera button. 2019-08-09 14:43:50 -03:00
Michael Kirk
7a565a1d6c Merge branch 'mkirk/fix-warnings-1' 2019-08-09 09:43:11 -06:00
Michael Kirk
4dc75aed3d fix warnings 2019-08-09 09:41:59 -06:00
Michael Kirk
0bd5f7f0ba use modern icon 2019-08-08 14:12:14 -06:00
Matthew Chen
704e900980 Merge branch 'charlesmchen/accessibilityLabels' 2019-08-08 15:56:16 -03:00
Matthew Chen
0c9f85bf48 Respond to CR. 2019-08-08 15:55:56 -03:00
Matthew Chen
d8177eec5d Add accessibility labels indicating conversation message status. 2019-08-08 15:49:18 -03:00
Matthew Chen
4cdf9d9d9d Add accessibility labels to conversation messages. 2019-08-08 15:49:18 -03:00
Matthew Chen
24087b44da Add accessibility labels to conversation messages. 2019-08-08 15:49:17 -03:00
Matthew Chen
b907552226 Tweak RI. 2019-08-08 14:48:57 -03:00
Matthew Chen
6435ae5d1c Merge branch 'charlesmchen/swiftDebug' 2019-08-08 12:58:50 -03:00
Matthew Chen
4e9930e4ef Ensure DEBUG is defined in all targets. 2019-08-08 12:55:12 -03:00
Matthew Chen
9b626ee2d8 "Bump build to 2.42.0.2." 2019-08-08 10:09:22 -03:00
Matthew Chen
05ffbbddd9 Fix production build breakage. 2019-08-08 10:08:57 -03:00
Matthew Chen
516cccb1ed "Bump build to 2.42.0.1." 2019-08-08 09:00:32 -03:00
Matthew Chen
5c98b44b3f Update feature flags for QAS. 2019-08-08 09:00:25 -03:00
Matthew Chen
95649b85ab "Bump build to 2.42.0.0." 2019-08-08 08:55:38 -03:00
Matthew Chen
069401b194 Merge remote-tracking branch 'private/release/2.41.0' 2019-08-08 08:55:18 -03:00
Nora Trapp
d53efd58b3 Merge branch 'nt/attachment-keyboard-3' 2019-08-07 16:43:40 -07:00
Nora Trapp
3494f605f0 Add attachment type picker 2019-08-07 16:43:25 -07:00
Nora Trapp
329ca05e1a Allow attachment keyboard to send photos 2019-08-07 16:43:25 -07:00
Matthew Chen
16a01bb64f Merge branch 'charlesmchen/stickerDownloadConcurrency' 2019-08-07 17:55:14 -03:00
Matthew Chen
d69bc04fc5 Allow multiple sticker downloads. 2019-08-07 17:55:04 -03:00
Matthew Chen
fe5e202f7c Merge branch 'charlesmchen/anyFullTextSearch2_' 2019-08-07 17:53:54 -03:00
Matthew Chen
bc6c909deb Respond to CR. 2019-08-07 17:48:54 -03:00