Commit Graph

9363 Commits

Author SHA1 Message Date
Matthew Chen
ed4fa2e8cb Respond to CR. 2018-10-26 14:44:53 -04:00
Matthew Chen
38f3321e9a Improve startup logging. 2018-10-26 14:44:53 -04:00
Matthew Chen
c879878d68 Merge branch 'charlesmchen/contactManagerDeadlocks' into release/2.31.0 2018-10-26 14:44:08 -04:00
Matthew Chen
70f274598c Avoid deadlocks in contact manager. 2018-10-26 14:19:04 -04:00
Matthew Chen
f26241ebd0 Avoid deadlocks in contact manager. 2018-10-26 14:10:58 -04:00
Matthew Chen
bf140971e2 Merge branch 'charlesmchen/consistentAvatarColors' into release/2.31.0 2018-10-25 15:39:32 -04:00
Matthew Chen
5b339a642b Respond to CR. 2018-10-25 15:39:16 -04:00
Matthew Chen
25ed886e72 Update home and group cells' dependencies. 2018-10-25 09:48:58 -04:00
Matthew Chen
763acae158 Use thread to ensure consistent colors in contact cells. 2018-10-25 09:48:57 -04:00
Matthew Chen
28f37a7a34 Update contacts cells' dependencies. 2018-10-25 09:48:57 -04:00
Matthew Chen
08518c66bf Merge branch 'charlesmchen/groupAvatarUpdateAsserts' into release/2.31.0 2018-10-24 17:12:04 -04:00
Matthew Chen
278c61fd16 Remove assert around group avatar updates. 2018-10-24 17:11:48 -04:00
Matthew Chen
cc97090ef2 Merge branch 'charlesmchen/logWebRTCVersion' into release/2.31.0 2018-10-24 16:59:12 -04:00
Matthew Chen
8e1103c28f Log WebRTC version. 2018-10-24 16:58:45 -04:00
Matthew Chen
8cb62e7f8e "Bump build to 2.31.0.15." 2018-10-24 11:43:38 -04:00
Matthew Chen
81d6b60ad5 Fix icon layout in privacy settings. 2018-10-24 11:43:28 -04:00
Matthew Chen
7868bed2a2 Merge branch 'charlesmchen/syncMessagesForSuccess' into release/2.31.0 2018-10-24 11:37:46 -04:00
Matthew Chen
9df94b8477 Rework sync transcript sending. 2018-10-24 10:53:23 -04:00
Matthew Chen
6f6612048d "Bump build to 2.31.0.14." 2018-10-24 10:07:25 -04:00
Michael Kirk
0270423a17 Merge branch 'mkirk/voicenote-earpiece' into release/2.31.0 2018-10-24 07:49:27 -06:00
Michael Kirk
ce9ca1bdaa audio player type 2018-10-24 07:46:27 -06:00
Michael Kirk
4b4b18c625 Proximity playsback through earpiece
This is kind of unfortunate because playback doesn't allow the earpiece as an
output device.
2018-10-24 07:46:27 -06:00
Michael Kirk
3b4188f34b hoist audio session singleton to Environment 2018-10-24 07:46:25 -06:00
Michael Kirk
3d022adf4e WIP: audio activities 2018-10-24 07:44:50 -06:00
Michael Kirk
14f2b89367 Merge branch 'mkirk/m70' into release/2.31.0 2018-10-24 07:43:18 -06:00
Michael Kirk
9708a1aeda update WebRTC to M70 2018-10-23 23:52:53 -06:00
Matthew Chen
c8c63c18de "Bump build to 2.31.0.13." 2018-10-23 16:35:46 -04:00
Matthew Chen
6a91f021a2 Update l10n for UD. 2018-10-23 16:35:42 -04:00
Matthew Chen
11c5257a48 "Bump build to 2.31.0.12." 2018-10-23 16:24:49 -04:00
Matthew Chen
cc9dad02af Merge branch 'charlesmchen/deviceChangeVsWebsocket' 2018-10-23 15:09:32 -04:00
Matthew Chen
21cf467bb4 Don't use websocket after 409/410. 2018-10-23 15:09:22 -04:00
Matthew Chen
0ccda03a2d Merge branch 'charlesmchen/udCopy' 2018-10-23 15:08:48 -04:00
Matthew Chen
55ab6c39d4 Rework UD settings. 2018-10-23 15:08:02 -04:00
Matthew Chen
f765c6c1bb Update UD settings copy. 2018-10-23 15:08:02 -04:00
Michael Kirk
8194409f5c Merge branch 'mkirk/webrtc-repo' into master 2018-10-22 15:22:34 -06:00
Michael Kirk
91eba4dbfc Move WebRTC to separate submodule 2018-10-22 14:48:45 -06:00
Matthew Chen
0441d1fe71 "Bump build to 2.31.0.11." 2018-10-22 14:47:22 -04:00
Matthew Chen
910fa11ada Merge branch 'charlesmchen/testsVsNSUserDefaults' 2018-10-22 14:44:08 -04:00
Matthew Chen
1a53005e08 Respond to CR. 2018-10-22 14:43:07 -04:00
Matthew Chen
a9aabf763a Use temporary user defaults in tests. 2018-10-22 14:31:36 -04:00
Matthew Chen
196542fd95 Merge branch 'charlesmchen/udVsLinkedDevices2' 2018-10-22 14:29:40 -04:00
Matthew Chen
b003049d9c Improve UD logging. 2018-10-22 14:29:08 -04:00
Matthew Chen
b338863663 Always disable UD for users without verifier. 2018-10-22 14:29:08 -04:00
Matthew Chen
639f385715 Merge branch 'charlesmchen/udVsLinkedDevices' 2018-10-22 14:04:39 -04:00
Matthew Chen
8c8b3a95b8 Respond to CR. 2018-10-22 14:04:30 -04:00
Matthew Chen
00d79900e4 Fix edge cases around UD v. linked devices. 2018-10-22 12:52:10 -04:00
Matthew Chen
b83299888f Fix edge cases around UD v. linked devices. 2018-10-22 12:44:34 -04:00
Matthew Chen
8fec73dda5 Fix edge cases around UD v. linked devices. 2018-10-22 12:33:09 -04:00
Matthew Chen
d656ae1017 Fix edge cases around UD v. linked devices. 2018-10-22 12:31:28 -04:00
Matthew Chen
24e3dbbe46 "Bump build to 2.31.0.10." 2018-10-20 10:31:25 -04:00