11031 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Chen	65ee1dbd75	Hide the current text item while the text item editor is open.	2019-03-01 09:36:18 -05:00
Matthew Chen	d15f5b581f	Tweak how image editor overlays are presented.	2019-03-01 09:36:12 -05:00
Matthew Chen	7ee38f808d	Show "add attachment caption" button for non-media attachments; only show if more than one attachment.	2019-03-01 09:36:05 -05:00
Matthew Chen	0813ebe16d	Merge branch 'charlesmchen/imageEditorCaptions'	2019-03-01 09:28:55 -05:00
Matthew Chen	82f18d8e4e	Respond to CR.	2019-03-01 09:28:40 -05:00
Matthew Chen	63637af240	Clean up ahead of PR.	2019-03-01 09:07:03 -05:00
Matthew Chen	dc4e174e86	Clean up ahead of PR.	2019-03-01 09:07:03 -05:00
Matthew Chen	7c486d9093	Clean up image editor.	2019-03-01 09:07:03 -05:00
Matthew Chen	fa08b18fd7	Clean up image editor.	2019-03-01 09:07:03 -05:00
Matthew Chen	b64be3aa73	Clean up image editor.	2019-03-01 09:07:03 -05:00
Matthew Chen	97660e0a11	Clean up image editor.	2019-03-01 09:07:03 -05:00
Matthew Chen	bc31c8fcf4	Add brush view controller.	2019-03-01 09:07:03 -05:00
Matthew Chen	00aa5be55d	Use navigation bar for image editor buttons.	2019-03-01 09:06:36 -05:00
Matthew Chen	e47ceab41c	Use navigation bar for image editor buttons.	2019-03-01 09:06:36 -05:00
Matthew Chen	a630974e76	Use navigation bar for image editor buttons.	2019-03-01 09:06:36 -05:00
Matthew Chen	87646b1798	Replace old caption view with new caption view.	2019-03-01 09:06:36 -05:00
Michael Kirk	504416f79e	Merge branch 'mkirk/conversation-search'	2019-02-28 16:19:18 -07:00
Michael Kirk	71dd4eb151	in-conversation search ... - use MediaTime for computing benchmarks	2019-02-28 16:19:16 -07:00
Matthew Chen	6095500f80	Merge branch 'charlesmchen/imageEditorDesign1'	2019-02-28 16:25:38 -05:00
Matthew Chen	be26c135e1	Rework image editor buttons, modes, etc.	2019-02-28 16:20:44 -05:00
Matthew Chen	d08445969d	Generate gradient for color picker.	2019-02-28 16:20:44 -05:00
Matthew Chen	fac123eeb2	Add "crop lock" button and feature.	2019-02-28 16:20:43 -05:00
Matthew Chen	e01f39e8e1	Apply image editor design.	2019-02-28 16:20:43 -05:00
Matthew Chen	0e806ea630	Merge branch 'charlesmchen/imageEditorPalette'	2019-02-28 16:20:09 -05:00
Matthew Chen	d419709ebd	Respond to CR.	2019-02-28 16:19:54 -05:00
Matthew Chen	de27ed8728	Add color palette to image editor.	2019-02-28 15:53:12 -05:00
Michael Kirk	530a07f8ca	sync translations	2019-02-26 17:43:30 -07:00
Carola Nitz	117411009b	Add public keyword to fix compilation for framework integration	2019-02-26 17:42:28 -07:00
Michael Kirk	c48679abfd	"Bump build to 2.37.0.5."	2019-02-26 17:40:49 -07:00
Michael Kirk	ee168e9a06	Merge branch 'mkirk/longtext-dismiss'	2019-02-26 17:21:33 -07:00
Michael Kirk	b11308b2f8	Return to conversation after deleting long text	2019-02-26 17:19:18 -07:00
Matthew Chen	05cc3c00f2	Merge branch 'charlesmchen/imageEditorFlip'	2019-02-26 17:43:26 -05:00
Matthew Chen	dd2b47bd76	Add "flip horizontal" feature.	2019-02-26 17:43:16 -05:00
Matthew Chen	7caa29e471	Merge branch 'charlesmchen/imageEditorCrop3'	2019-02-26 17:42:45 -05:00
Matthew Chen	0ce84b7929	Respond to CR.	2019-02-26 17:42:27 -05:00
Matthew Chen	69635fafac	Update crop view to reflect design.	2019-02-26 13:28:44 -05:00
Matthew Chen	4db09b45b6	Update crop view to reflect design.	2019-02-26 13:28:44 -05:00
Matthew Chen	c07a74d029	Update crop view to reflect design.	2019-02-26 13:28:44 -05:00
Matthew Chen	42a92bd032	Merge branch 'charlesmchen/imageEditorNormalizeTranslation'	2019-02-26 13:28:15 -05:00
Matthew Chen	ac1e89ce1d	Respond to CR.	2019-02-26 13:27:54 -05:00
Matthew Chen	cc20182ec0	Normalize translation in image editor.	2019-02-26 13:19:40 -05:00
Matthew Chen	0d26caced7	Normalize translation in image editor.	2019-02-26 13:19:40 -05:00
Matthew Chen	f01fe8e563	Normalize translation in image editor.	2019-02-26 13:19:40 -05:00
Michael Kirk	5361720b19	log token in debug	2019-02-26 10:09:29 -07:00
Michael Kirk	5bd3cec6dc	Merge tag '2.36.1.0'	2019-02-26 10:07:54 -07:00
Michael Kirk	e6ad6c85bf	Merge branch 'mkirk/long-text-nondurable'	2019-02-26 10:06:59 -07:00
Michael Kirk	870caaa84a	simplify completion checking - make nonnull	2019-02-26 10:06:52 -07:00
Michael Kirk	13154fb828	allow long text with non-durable sends (SAE)	2019-02-26 10:06:52 -07:00
Matthew Chen	bb8dd05614	Merge branch 'charlesmchen/conversationSnapshot2'	2019-02-26 11:35:41 -05:00
Matthew Chen	7711ee92a7	Revert "Conversation view always observes view model." ... This reverts commit 9d39e829a44f28f324f79e0b74a6c8692678d788.	2019-02-26 10:56:23 -05:00