9547 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Chen	34e85dd90e	Fix media gallery cell edge cases.	2018-11-06 15:23:09 -05:00
Matthew Chen	ee3bdca336	Fix media gallery cell edge cases.	2018-11-06 15:23:09 -05:00
Matthew Chen	cfcb6cb15b	Clean up ahead of PR.	2018-11-06 15:23:09 -05:00
Matthew Chen	0c76e1c02d	Use ConversationMediaView to simplify media rendering in conversation view cells.	2018-11-06 15:23:09 -05:00
Matthew Chen	f2c0a6f7dd	Clean up ahead of PR.	2018-11-06 15:23:09 -05:00
Matthew Chen	c89bdd2a15	Modify MediaGalleryCellView to handle animated images and videos.	2018-11-06 15:23:09 -05:00
Matthew Chen	2c9a556786	Remove overzealous assert in ConversationViewModel.	2018-11-06 15:23:09 -05:00
Matthew Chen	cf057e3af3	Modify MediaGalleryCellView to handle still images.	2018-11-06 15:23:09 -05:00
Matthew Chen	ec6de40bd9	Modify MessageBubbleView to support media galleries.	2018-11-06 15:23:09 -05:00
Matthew Chen	0341f5dc2b	Modify ConversationViewItem to support media galleries.	2018-11-06 15:23:09 -05:00
Matthew Chen	f2c0985907	Add 'is valid media?' method.	2018-11-06 15:23:09 -05:00
Michael Kirk	a5c4d1b9ed	Merge branch 'mkirk/multi-image-send'	2018-11-05 22:24:15 -06:00
Michael Kirk	4c5d46e8f8	Custom photo picker, respects theme/call banner ... - share GridViewCell - Multiple image selection, with feature flag, cant currently approve multiple	2018-11-05 22:23:40 -06:00
Matthew Chen	c8ac66ff8f	"Bump build to 2.32.0.2."	2018-11-05 16:54:21 -05:00
Matthew Chen	dfc7b032b9	Merge branch 'charlesmchen/incrementalDiffOrdering'	2018-11-05 16:53:57 -05:00
Matthew Chen	2ca32fddcc	Preserve ordering in incremental diffs.	2018-11-05 16:53:39 -05:00
Matthew Chen	aa5e6b456e	Preserve ordering in incremental diffs.	2018-11-05 16:53:39 -05:00
Matthew Chen	5d6ff608c1	"Bump build to 2.32.0.1."	2018-11-05 16:28:38 -05:00
Matthew Chen	43eda866e2	Merge branch 'charlesmchen/appWillBecomeReady_'	2018-11-05 09:16:30 -05:00
Matthew Chen	1c7add2b8f	Respond to CR.	2018-11-05 09:16:17 -05:00
Matthew Chen	39c820b866	Distinguish 'app will/did become ready' events.	2018-11-05 09:04:57 -05:00
Matthew Chen	eb2e16872e	Distinguish 'app will/did become ready' events.	2018-11-05 09:04:57 -05:00
Matthew Chen	d338e00b1a	Merge branch 'charlesmchen/conversationViewModelStartupRace'	2018-11-05 09:02:40 -05:00
Matthew Chen	af249de681	Fix race in CVM startup.	2018-11-05 09:02:05 -05:00
Michael Kirk	269fae21a4	Merge branch 'mkirk/bundle-update'	2018-11-02 11:41:08 -06:00
Michael Kirk	e9ac38b906	bundle update	2018-11-02 11:38:03 -06:00
Matthew Chen	65776cdaef	"Bump build to 2.32.0.0."	2018-11-02 13:19:55 -04:00
Matthew Chen	1e31e6aec5	Merge branch 'charlesmchen/debugUIMultiImageSends'	2018-11-02 13:17:53 -04:00
Matthew Chen	c7d427029b	Respond to CR.	2018-11-02 13:17:36 -04:00
Matthew Chen	47fda2e377	Add debug UI for multi-image sends.	2018-11-02 13:04:05 -04:00
Matthew Chen	ecba67b511	Add debug UI for multi-image sends.	2018-11-02 13:04:05 -04:00
Matthew Chen	f6591fac25	Add debug UI for multi-image sends.	2018-11-02 13:04:05 -04:00
Matthew Chen	d04f1e6e36	Add debug UI for multi-image sends.	2018-11-02 13:04:05 -04:00
Matthew Chen	078503ff2e	Merge branch 'charlesmchen/unregisteredGroup'	2018-11-02 12:59:28 -04:00
Matthew Chen	f893980468	Add debug UI function to make group with unregistered users.	2018-11-02 12:59:16 -04:00
Matthew Chen	b0bf8ed29c	Merge branch 'charlesmchen/infoPlistOrdering'	2018-11-02 12:57:48 -04:00
Matthew Chen	58856748d8	Update info plist to reflect PlistBuddy ordering.	2018-11-01 17:18:01 -04:00
Matthew Chen	7c65a98069	Fix breakage from typing indicators.	2018-11-01 17:11:59 -04:00
Matthew Chen	b90fee08bd	Merge remote-tracking branch 'origin/release/2.31.0'	2018-11-01 16:59:54 -04:00
Matthew Chen	78987445ec	"Bump build to 2.31.0.26."	2018-11-01 16:53:41 -04:00
Matthew Chen	5b0962c016	Merge branch 'charlesmchen/typingIndicators7'	2018-11-01 16:52:39 -04:00
Matthew Chen	58f36fba47	Disable typing indicators by default for legacy users.	2018-11-01 16:52:31 -04:00
Matthew Chen	cc63c5307c	Merge branch 'charlesmchen/typingIndicators5_'	2018-11-01 16:45:16 -04:00
Michael Kirk	9940810935	typing indicator upgrade screen	2018-11-01 16:45:12 -04:00
Matthew Chen	b8e9cd6b58	Respond to CR.	2018-11-01 16:44:48 -04:00
Matthew Chen	22c922bf5b	Respond to CR.	2018-11-01 16:44:47 -04:00
Matthew Chen	650469c6a7	Respond to CR.	2018-11-01 16:44:47 -04:00
Matthew Chen	4088bebe05	Clean up ahead of PR.	2018-11-01 16:44:47 -04:00
Matthew Chen	94eaed0024	Fix rebase breakage.	2018-11-01 16:44:47 -04:00
Matthew Chen	f8a5a41415	Apply dark theme to typing indicator.	2018-11-01 16:44:47 -04:00