11471 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Chen	f3d0cd99fc	Handle notifications for open conversations.	2019-03-28 16:58:02 -04:00
Michael Kirk	0a43d6c6e6	Merge branch 'mkirk/maintain-body-context'	2019-03-28 13:25:24 -06:00
Michael Kirk	a8caae73cf	remove redundant state	2019-03-28 13:13:43 -06:00
Michael Kirk	fa2d5b422b	maintain body text navigating to/from approval view	2019-03-28 11:58:43 -06:00
Michael Kirk	3c5510438f	Merge branch 'mkirk/media-send-flow'	2019-03-28 10:32:36 -06:00
Michael Kirk	0a32448470	cancel flow per design	2019-03-28 10:30:47 -06:00
Michael Kirk	1a4062dd89	Nav buttons: batch, camera/library switch, done	2019-03-28 10:30:47 -06:00
Michael Kirk	7dbb9517af	Centralize attachment state in nav controller	2019-03-28 10:30:47 -06:00
Michael Kirk	6502d7d4a5	remove isMultiSendEnabled feature flag	2019-03-28 10:30:47 -06:00
Michael Kirk	1357449dcc	Make OrderedDictionary keys generic	2019-03-28 10:30:47 -06:00
Matthew Chen	4e8e41c327	Merge branch 'charlesmchen/tempFiles'	2019-03-27 13:18:47 -04:00
Matthew Chen	dd54b40bed	Respond to CR.	2019-03-27 13:15:26 -04:00
Matthew Chen	987726df6c	Temp files.	2019-03-27 12:37:22 -04:00
Matthew Chen	7358ab676d	Merge branch 'charlesmchen/linkPreviewCleanup'	2019-03-27 12:36:52 -04:00
Matthew Chen	81e3dfc3cf	Respond to CR.	2019-03-27 12:36:39 -04:00
Matthew Chen	bb1921afe6	Simplify link preview cache.	2019-03-27 12:35:47 -04:00
Matthew Chen	04b60677a6	Simplify link preview cache.	2019-03-27 12:35:47 -04:00
Matthew Chen	ae5cee2167	Clean up the link preview cache.	2019-03-27 12:35:47 -04:00
Matthew Chen	f6ca66f9c6	Merge branch 'charlesmchen/removeScrollUpButton'	2019-03-27 10:49:39 -04:00
Matthew Chen	0d9b780f75	Remove scroll up button.	2019-03-27 10:41:48 -04:00
Michael Kirk	3ed2e76eb4	"Bump build to 2.38.0.9."	2019-03-26 21:45:03 -06:00
Michael Kirk	d02152cf14	fix release build	2019-03-26 21:44:59 -06:00
Michael Kirk	dc87ae821d	"Bump build to 2.38.0.8."	2019-03-26 21:27:06 -06:00
Michael Kirk	ab91fedc3e	sync translations	2019-03-26 21:26:59 -06:00
Michael Kirk	4068496644	Merge branch 'charlesmchen/imageEditorVsCaptions'	2019-03-26 21:24:28 -06:00
Matthew Chen	db958f4a01	Preserve caption text of edited images.	2019-03-26 21:24:25 -06:00
Michael Kirk	04ec6b9ddb	Merge branch 'charlesmchen/imageEditorRenderingLayerOrder'	2019-03-26 21:22:42 -06:00
Matthew Chen	d9760b6bbc	Fix bug around layer ordering when rendering image editor output.	2019-03-26 21:22:35 -06:00
Michael Kirk	9835c68ec4	Merge branch 'charlesmchen/ensureTextItemOnCanvas'	2019-03-26 21:21:55 -06:00
Matthew Chen	5973c326de	Ensure new text items are on the canvas.	2019-03-26 21:21:52 -06:00
Michael Kirk	675c60bf4e	Merge branch 'mkirk/fix-ios9-sae-crash'	2019-03-26 17:08:53 -06:00
Michael Kirk	f8244eeefe	Fix SAE crash for iOS9	2019-03-26 17:08:36 -06:00
Michael Kirk	840c811b95	Merge branch 'mkirk/ios9-deprecation'	2019-03-26 17:07:35 -06:00
Michael Kirk	58d99a480f	Notify iOS9 users occasionally that iOS10 will soon be required	2019-03-26 11:21:30 -06:00
Matthew Chen	53299c139f	Merge branch 'charlesmchen/cdsFeedbackErrors'	2019-03-25 15:58:42 -04:00
Matthew Chen	9b34e4ac61	Respond to CR.	2019-03-25 15:58:27 -04:00
Matthew Chen	c5a87c4d20	Add asserts around CDS feedback errors.	2019-03-25 15:58:27 -04:00
Michael Kirk	5cc6fc0632	Merge branch 'mkirk/ri_checks'	2019-03-25 08:55:42 -07:00
Michael Kirk	62ce0339a5	Update tags to ignore, introduce scheme for ignoring internal tags	2019-03-25 08:55:24 -07:00
Matthew Chen	c3ddb4b912	Merge branch 'charlesmchen/accessibilityIdentifiers3'	2019-03-25 09:33:58 -04:00
Matthew Chen	3ce3f9faaa	Add accessibilityIdentifiers to conversation settings view.	2019-03-25 09:31:55 -04:00
Matthew Chen	f073dd9a52	Add accessibilityIdentifiers to conversation settings view.	2019-03-25 09:31:55 -04:00
Matthew Chen	d253c5aa91	Add accessibilityIdentifiers to conversation view.	2019-03-25 09:31:19 -04:00
Matthew Chen	50888b20d2	Add accessibilityIdentifiers to 'new group thread' view.	2019-03-25 09:31:19 -04:00
Matthew Chen	4188993fc5	Add accessibilityIdentifiers to 'new contact thread' view.	2019-03-25 09:31:19 -04:00
Matthew Chen	95e125d55e	Simplify usage of accessibilityIdentifiers.	2019-03-25 09:31:19 -04:00
Matthew Chen	2d854406a1	Add accessibilityIdentifiers to home view.	2019-03-25 09:31:19 -04:00
Michael Kirk	2464fe230d	sync translations	2019-03-22 18:35:51 -07:00
Michael Kirk	0e6647626d	Merge branch 'mkirk/search-icon'	2019-03-22 18:21:08 -07:00
Michael Kirk	ed6b461662	search icon	2019-03-22 18:18:56 -07:00