11008 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Matthew Chen	6ed4045fbe	Conversation view always observes view model.	2019-02-26 10:56:11 -05:00
Matthew Chen	56e5feca46	Introduce ConversationSnapshot.	2019-02-26 10:55:44 -05:00
Matthew Chen	586b362b89	Introduce ConversationSnapshot.	2019-02-26 10:55:44 -05:00
Matthew Chen	aaac445c51	Merge branch 'charlesmchen/proxiedContentChanges'	2019-02-26 10:54:44 -05:00
Matthew Chen	fff93f8bb2	Use content proxy to configure all proxied content requests.	2019-02-26 10:54:35 -05:00
Matthew Chen	ad90a8e0c4	Use content proxy to configure all proxied content requests.	2019-02-26 10:54:35 -05:00
Matthew Chen	5eaeeff838	Use content proxy to configure all proxied content requests.	2019-02-26 10:54:35 -05:00
Matthew Chen	a2d48aa020	Merge branch 'charlesmchen/imageEditorTranslation'	2019-02-26 10:51:30 -05:00
Matthew Chen	2bc5ac14ca	Respond to CR.	2019-02-26 10:51:16 -05:00
Matthew Chen	7130895e3f	Fix translation in all of editor view's gestures.	2019-02-26 10:06:06 -05:00
Matthew Chen	674cf2e01f	Render stroke and text items in image coordinates, not canvas coordinates.	2019-02-26 10:06:06 -05:00
Matthew Chen	7aa826748a	Fix translation in crop editor's pinch gesture.	2019-02-26 10:06:06 -05:00
Matthew Chen	4022ba1a16	Fix translation in crop editor's pan gesture.	2019-02-26 10:06:06 -05:00
Michael Kirk	91e83da440	reflect new build params in plist	2019-02-25 15:18:58 -07:00
Michael Kirk	2c961380c0	update translations	2019-02-25 15:17:48 -07:00
Matthew Chen	72082edad8	Fix a visual bug that would sometimes occur while rendering settings switches. Thanks to Gunnar C. Pope for the bug report.	2019-02-25 15:13:16 -07:00
Michael Kirk	c15084c6f4	"Bump build to 2.36.1.0."	2019-02-25 15:11:56 -07:00
Michael Kirk	d1d99bc641	Merge branch 'mkirk/disappearing-menu-bar'	2019-02-25 14:10:20 -07:00
Michael Kirk	233bc3858b	dismiss menu actions when selected item is deleted	2019-02-25 14:10:12 -07:00
Michael Kirk	504d5f89b9	Merge branch 'mkirk/fix-tests-1'	2019-02-25 14:01:38 -07:00
Michael Kirk	a7e8f9713c	Try to account for variability in network backed tests	2019-02-25 13:44:03 -07:00
Michael Kirk	7b174e9b02	correct constants. ... This test appears to be testing real-world iPhone dimensions, but the expected results were all based on the previous test which tests convenient "round" numbers.	2019-02-25 13:44:03 -07:00
Michael Kirk	0bd113e5d7	Merge branch 'mkirk/long-text'	2019-02-25 13:40:02 -07:00