Commit graph

7630 commits

Author SHA1 Message Date
Matthew Chen
89523f556b Tweak intra-cell spacing. 2018-06-27 09:33:47 -04:00
Matthew Chen
afa003926e Merge branch 'charlesmchen/breaks' 2018-06-27 09:27:20 -04:00
Matthew Chen
d04ee35216 Respond to CR. 2018-06-27 09:27:09 -04:00
Matthew Chen
4fc24540dc Breaks: unread indicators and date headers. 2018-06-27 09:20:49 -04:00
Matthew Chen
a4703cec76 Breaks: unread indicators and date headers. 2018-06-27 09:20:49 -04:00
Matthew Chen
4b60037e35 Breaks: unread indicators and date headers. 2018-06-27 09:20:49 -04:00
Matthew Chen
d34e53a163 Breaks: unread indicators and date headers. 2018-06-27 09:20:49 -04:00
Matthew Chen
a55505a7aa Merge branch 'charlesmchen/compactLayout' 2018-06-27 09:20:19 -04:00
Matthew Chen
572fee6173 Respond to CR. 2018-06-27 09:19:51 -04:00
Matthew Chen
f5239a4fbd Compact layout / widow reduction. 2018-06-27 09:11:55 -04:00
Michael Kirk
3bee54dbef Merge tag '2.27.0.6' 2018-06-26 15:55:29 -06:00
Michael Kirk
cf4847b6fc Merge tag '2.27.0.5' 2018-06-26 15:55:26 -06:00
Matthew Chen
ec8db7ee6f Merge branch 'charlesmchen/fixedBubbleSize' 2018-06-26 17:27:13 -04:00
Michael Kirk
ad351de5cf "Bump build to 2.27.0.6." 2018-06-26 15:02:08 -06:00
Michael Kirk
a16df5cd73 sync translations
// FREEBIE
2018-06-26 15:01:39 -06:00
Michael Kirk
b4bda29d11 Merge branch 'mkirk/fix-hidden-searchbar' into release/2.27.0 2018-06-26 14:59:06 -06:00
Michael Kirk
d9d5131e5f FIX: obscured searchbar upon returning
When navigating back from a conversation, we could be scrolled down a ways.
Since the search bar lives in the inbox table view, we need to make sure the
inbox table view is scrolled all the way up to keep the search bar visible.

// FREEBIE
2018-06-26 14:58:40 -06:00
Michael Kirk
00cde6a034 Merge branch 'mkirk/group-search' into release/2.27.0 2018-06-26 14:11:56 -06:00
Michael Kirk
1fcf25fabd FIX: compose search group cell
We switched sizing to automatic, but cell wasn't autolayout ready.
2018-06-26 14:11:42 -06:00
Michael Kirk
9c73dbc880 Merge branch 'mkirk/sync-touchups' into release/2.27.0 2018-06-26 14:10:37 -06:00
Michael Kirk
b5b51eba24 CR: make members private where possible
add missing weak capture

// FREEBIE
2018-06-26 14:10:32 -06:00
Michael Kirk
3e4603920f Merge branch 'charlesmchen/searchFinderAssert' into release/2.27.0 2018-06-26 12:47:30 -06:00
Matthew Chen
a6dbb7704a Remove overzealous assert in search finder. 2018-06-26 12:47:21 -06:00
Matthew Chen
2232c25487 Ensure bubble sizing. 2018-06-26 13:33:53 -04:00
Matthew Chen
c7f9575df6 Ensure bubble sizing. 2018-06-26 13:33:47 -04:00
Matthew Chen
5e676c13d2 Merge branch 'charlesmchen/footerView' 2018-06-26 13:32:22 -04:00
Matthew Chen
3fba101421 Respond to CR. 2018-06-26 13:32:05 -04:00
Matthew Chen
18417edbde Introduce message cell footer view. 2018-06-26 13:25:07 -04:00
Matthew Chen
7d5ad0e165 Introduce message cell footer view. 2018-06-26 13:25:07 -04:00
Matthew Chen
6626e2ecc3 Introduce message cell footer view. 2018-06-26 13:25:07 -04:00
Matthew Chen
f363a196f3 Introduce message cell footer view. 2018-06-26 13:25:07 -04:00
Matthew Chen
a769499f56 Remove overzealous assert in search finder. 2018-06-26 13:25:07 -04:00
Matthew Chen
cbacda87ca Introduce message cell footer view. 2018-06-26 13:25:07 -04:00
Matthew Chen
538cd4f893 Merge branch 'charlesmchen/refineConversationStyle' 2018-06-26 13:24:35 -04:00
Matthew Chen
8cfb6eef18 Refine conversation style. 2018-06-26 10:22:05 -04:00
Matthew Chen
ad663ee06c Merge branch 'charlesmchen/conversationStyle' 2018-06-26 10:21:40 -04:00
Matthew Chen
33b1628c26 Rename to ConversationStyle. 2018-06-26 10:20:26 -04:00
Matthew Chen
661272750b Merge branch 'charlesmchen/groupSenderAvatars' 2018-06-26 10:19:28 -04:00
Michael Kirk
05b200c607 "Bump build to 2.27.0.5." 2018-06-25 18:20:00 -06:00
Michael Kirk
4576747bb7 sync translations 2018-06-25 18:19:27 -06:00
Michael Kirk
89402d0d27 Merge branch 'mkirk/webrtcM67' into release/2.27.0 2018-06-25 17:51:34 -06:00
Michael Kirk
38ee3653f7 synchronize access to CaptureController state
// FREEBIE
2018-06-25 17:43:54 -06:00
Michael Kirk
af603e53c7 remove more unused state from PCC 2018-06-25 15:44:57 -06:00
Michael Kirk
61156656aa Only PCC needs to know about the local RTCTrack 2018-06-25 15:21:27 -06:00
Michael Kirk
afa385feae adapt to capturer abstraction 2018-06-25 15:03:25 -06:00
Michael Kirk
0cd1cb80cc Compiling, but video sending not working. 2018-06-25 15:03:25 -06:00
Michael Kirk
064035f3f4 WIP M67 - plumb through AVCaptureSession
TODO:

-[x] plumb through AVCaptureSession
-[] get AVCaptureSession from PeerConnectionClient
-[] RTCDataChannel not unwrapped
-[] no member avFoundationSource
-[] no member "back camera"
2018-06-25 15:03:25 -06:00
Michael Kirk
51c3a3df65 update to latest webrtc artifact 2018-06-25 15:03:25 -06:00
Matthew Chen
a5d52c4203 Clean up ahead of PR. 2018-06-25 15:09:45 -04:00
Matthew Chen
4effa56d50 Tweak 'group sender' avatars. 2018-06-25 15:07:46 -04:00