9778 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Chen	86d006ba14	Respond to CR.	2018-11-15 13:14:55 -05:00
Matthew Chen	2919e8d780	Respond to CR.	2018-11-15 13:14:55 -05:00
Matthew Chen	ea080eda72	Sketch out the photo collection picker.	2018-11-15 13:14:55 -05:00
Matthew Chen	9641edbfd2	Fix build breakage.	2018-11-15 12:34:38 -05:00
Michael Kirk	80585126d9	update pods	2018-11-15 10:39:38 -06:00
Michael Kirk	92135af8be	Merge branch 'release/2.32.0'	2018-11-15 10:38:43 -06:00
Michael Kirk	12b916ad36	Merge tag '2.31.0.37' into release/2.32.0	2018-11-15 10:35:03 -06:00
Michael Kirk	a27b04613d	CR: simplify scroll check	2018-11-15 10:29:49 -06:00
Michael Kirk	a60dc2bfe7	Merge branch 'mkirk/pager-rail-style' into release/2.32.0	2018-11-15 10:24:21 -06:00
Michael Kirk	ff63c31dae	CR: rename colors	2018-11-15 10:23:53 -06:00
Michael Kirk	47a7114317	Gallery pager style changes	2018-11-15 10:16:51 -06:00
Michael Kirk	c5bcba45be	Merge branch 'mkirk/fix-all-media-view' into release/2.32.0	2018-11-15 10:16:30 -06:00
Michael Kirk	f6e9fce0d3	fix All Media button from conversation settings	2018-11-15 10:16:22 -06:00
Matthew Chen	5c02f8d34c	"Bump build to 2.31.0.37."	2018-11-14 23:29:56 -05:00
Matthew Chen	b38a1030d5	Merge branch 'charlesmchen/socketCleanup' into release/2.31.0	2018-11-14 23:28:33 -05:00
Michael Kirk	542d5826de	fix a million retain cycles in conversation settings	2018-11-14 18:55:29 -06:00
Matthew Chen	dacccccf74	Remove UD websocket.	2018-11-14 18:03:10 -05:00
Matthew Chen	99d41256a9	"Bump build to 2.31.0.36."	2018-11-14 17:30:05 -05:00
Matthew Chen	534b0da732	Merge branch 'charlesmchen/messageFetchACK' into release/2.31.0	2018-11-14 17:29:50 -05:00
Matthew Chen	210da50868	Rework ACK of messages fetched via REST.	2018-11-14 17:26:39 -05:00
Matthew Chen	f6df3b01e8	"Bump build to 2.31.0.35."	2018-11-14 16:43:17 -05:00
Matthew Chen	c2cc74f387	Fix build break.	2018-11-14 16:43:05 -05:00
Matthew Chen	71aa420315	"Bump build to 2.31.0.34."	2018-11-14 16:35:39 -05:00
Matthew Chen	2296d2256e	Merge branch 'charlesmchen/udVsPersistentConnection' into release/2.31.0	2018-11-14 16:35:31 -05:00
Matthew Chen	949225d525	Respond to CR.	2018-11-14 16:35:11 -05:00
Michael Kirk	8eff8966b4	Merge branch 'mkirk/pager-rail' into release/2.32.0	2018-11-14 14:50:49 -06:00
Michael Kirk	84879b991d	Album rail in Gallery	2018-11-14 14:50:33 -06:00
Matthew Chen	bbdeeffc76	Use persistent HTTP connection for UD requests.	2018-11-14 14:54:37 -05:00
Matthew Chen	c0e57bb35b	Use persistent HTTP connection for UD requests.	2018-11-14 14:48:47 -05:00
Matthew Chen	11f8fcc80f	Use persistent HTTP connection for UD requests.	2018-11-14 14:45:11 -05:00
Matthew Chen	2eff3cb550	"Bump build to 2.31.0.33."	2018-11-14 08:36:56 -05:00
Matthew Chen	2b33c2a153	Merge branch 'charlesmchen/udVsWebsocket' into release/2.31.0	2018-11-14 08:36:49 -05:00
Matthew Chen	b865b91147	Use REST for UD requests.	2018-11-14 08:30:25 -05:00
Matthew Chen	16aec33e24	Merge branch 'charlesmchen/clearMayHaveLinkedDevices' into release/2.31.0	2018-11-14 08:25:15 -05:00
Matthew Chen	b583e96a04	Tweak clearMayHaveLinkedDevices.	2018-11-13 16:40:34 -05:00
Matthew Chen	d71a4c6ff3	Revert "Randomly fail half of all websocket requests." ... This reverts commit cae430bac9.	2018-11-13 16:40:16 -05:00
Matthew Chen	fd424f3892	Revert accidental schema changes.	2018-11-13 14:36:38 -05:00
Matthew Chen	3ccf0a3c98	Merge branch 'charlesmchen/multiSendSAE'	2018-11-13 13:59:28 -05:00
Matthew Chen	19d4834e74	Update Cocoapods.	2018-11-13 13:58:34 -05:00
Matthew Chen	3135e6f6f7	Respond to CR.	2018-11-13 13:57:46 -05:00
Matthew Chen	aeadea67e2	Send multiple attachments from the share extension.	2018-11-13 13:15:54 -05:00
Matthew Chen	2bad0c20b6	Only fetch profiles in the main app.	2018-11-13 13:15:11 -05:00
Matthew Chen	7f89c90f16	Fix bug when sending non-body attachments (e.g. group avatars).	2018-11-13 13:15:11 -05:00
Matthew Chen	901f58c7e3	Fix bug when sending non-body attachments (e.g. group avatars).	2018-11-13 13:15:11 -05:00
Matthew Chen	f7e7477f54	Add sharing scenarios to Debug UI.	2018-11-13 13:15:11 -05:00
Matthew Chen	860eb44edc	Fix breakage in share extension.	2018-11-13 13:15:11 -05:00
Matthew Chen	b120995dcf	Merge branch 'charlesmchen/mediaViewGlitches' into release/2.32.0	2018-11-13 13:14:43 -05:00
Matthew Chen	2e50cc1f2d	Respond to CR.	2018-11-13 13:14:24 -05:00
Matthew Chen	84d6f61d53	Fix glitches in conversation media view.	2018-11-13 11:57:16 -05:00
Michael Kirk	24745570dc	Merge tag '2.32.0.8'	2018-11-13 10:43:06 -06:00