9603 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Chen	15c42642e0	Apply invalid and rety assets.	2018-11-09 13:49:32 -05:00
Matthew Chen	934164cd12	Merge branch 'charlesmchen/newCaptionAsset'	2018-11-09 13:48:51 -05:00
Matthew Chen	9d1579a480	Update caption indicator asset.	2018-11-08 15:49:49 -05:00
Matthew Chen	b7e6f1d420	Merge branch 'charlesmchen/allMediaAreAlbums'	2018-11-08 15:47:36 -05:00
Matthew Chen	cd224a1590	Render single media as albums.	2018-11-08 15:44:22 -05:00
Matthew Chen	1b49fa294f	Merge branch 'charlesmchen/albumProgress'	2018-11-08 15:40:55 -05:00
Matthew Chen	82fb766c27	Respond to CR.	2018-11-08 15:40:43 -05:00
Matthew Chen	c7582b6bd7	Update Cocoapods.	2018-11-08 15:36:05 -05:00
Matthew Chen	654325c6dc	Add download progress indicators.	2018-11-08 15:35:14 -05:00
Matthew Chen	a26086b303	Show attachment upload progress indicators.	2018-11-08 15:34:03 -05:00
Matthew Chen	c1a5e1e258	Rename to media album.	2018-11-08 15:33:57 -05:00
Matthew Chen	6a3ecb3d07	Merge branch 'charlesmchen/attachmentDownloads'	2018-11-08 15:33:01 -05:00
Matthew Chen	04e627cdc3	Update Cocoapods.	2018-11-08 15:31:46 -05:00
Matthew Chen	3daf7d4744	Add OWSAttachmentDownloads.	2018-11-08 15:31:00 -05:00
Michael Kirk	b25f17a27c	Merge branch 'mkirk/album-gallery-view'	2018-11-08 13:11:34 -06:00
Michael Kirk	03aba93985	CR: use id for hashvalue, make clearer that we don't expect to use incrementing ID's for uniqueId	2018-11-08 13:11:30 -06:00
Michael Kirk	7cf53293da	restore Share/Delete functionality to gallery items in the post multi-attachment world	2018-11-08 12:52:09 -06:00
Michael Kirk	42bf267607	fixup plumbing for incoming messages/synced transcripts	2018-11-08 12:52:09 -06:00
Michael Kirk	e096406e56	migrate existing attachments to album-compatible gallery schema	2018-11-08 12:52:09 -06:00
Michael Kirk	57681bd6f3	Gallery supports album messages	2018-11-08 12:52:09 -06:00
Michael Kirk	27cb91e9c8	Plumb through messageAlbumId so an Attachment knows what album (if any) it ... belongs to.	2018-11-08 12:52:08 -06:00
Matthew Chen	6b796579dd	Merge branch 'charlesmchen/typingIndicatorsFooter'	2018-11-08 13:49:53 -05:00
Matthew Chen	f37c4f71ad	Add footer to 'typing indicators' setting.	2018-11-08 13:49:39 -05:00
Matthew Chen	fade523443	Merge branch 'charlesmchen/typingIndicatorTiming'	2018-11-08 13:49:14 -05:00
Matthew Chen	8b5a993694	Tweak timing of typing indicators.	2018-11-08 13:49:04 -05:00
Matthew Chen	2f8b25b4b3	Merge branch 'charlesmchen/albumStrokes'	2018-11-08 13:46:09 -05:00
Matthew Chen	02a9cc9181	Remove stroke on album items.	2018-11-08 13:46:02 -05:00
Matthew Chen	00adefa518	"Bump build to 2.32.0.3."	2018-11-08 13:45:36 -05:00
Matthew Chen	272678ca9a	Merge branch 'charlesmchen/reduceTypingIndicators'	2018-11-08 13:42:50 -05:00
Matthew Chen	9a44f24bc1	Reduce typing indicators.	2018-11-07 14:31:47 -05:00
Matthew Chen	f382cd770e	Fix build break.	2018-11-07 12:32:30 -05:00
Matthew Chen	2c50e34606	Merge branch 'charlesmchen/mediaAlbumRename'	2018-11-07 12:29:41 -05:00
Matthew Chen	777e2b9251	Rename to media album.	2018-11-07 12:26:57 -05:00
Matthew Chen	2dfd4b2c0d	Rename to media album.	2018-11-07 12:24:53 -05:00
Matthew Chen	dd0f642ff2	Fix build break.	2018-11-07 11:53:24 -05:00
Michael Kirk	3ff3779f17	CR: remove unnecessary assert	2018-11-07 10:12:50 -06:00
Matthew Chen	195c42b9c4	Merge branch 'charlesmchen/captionIndicators'	2018-11-07 11:12:20 -05:00
Matthew Chen	c7c02f03d1	Display caption indicators for media albums in conversation view.	2018-11-07 11:12:13 -05:00
Michael Kirk	db3e5f6084	Merge branch 'mkirk/multi-image-approval'	2018-11-07 10:09:49 -06:00
Michael Kirk	7cef41f8e2	Multi-approval	2018-11-07 10:09:21 -06:00
Matthew Chen	b519baf37d	Merge branch 'charlesmchen/typingIndicatorsVsSelf'	2018-11-07 11:08:31 -05:00
Matthew Chen	b7fd48ec40	Respond to CR.	2018-11-07 10:56:40 -05:00
Matthew Chen	9cdf8d06fd	Ignore typing indicators from self.	2018-11-07 10:56:19 -05:00
Matthew Chen	af85c09602	Merge branch 'charlesmchen/mediaGalleryCells4'	2018-11-07 10:54:31 -05:00
Matthew Chen	57de089118	Add support for album captions to models.	2018-11-07 10:54:17 -05:00
Matthew Chen	3816cb4bf4	Update proto schema to reflect album captions.	2018-11-07 10:54:17 -05:00
Matthew Chen	268c456d5d	Merge branch 'charlesmchen/mediaGalleryCellsDebug'	2018-11-07 09:56:56 -05:00
Matthew Chen	60c5a84dd2	Fix issues in media gallery cells; Improve debug galleries.	2018-11-07 09:56:49 -05:00
Matthew Chen	88a1186e4e	Restore XCode 9 compatability.	2018-11-07 09:56:17 -05:00
Matthew Chen	ada4bf5956	Merge branch 'charlesmchen/typingIndicatorFixes'	2018-11-07 08:51:50 -05:00