42a92bd032
Merge branch 'charlesmchen/imageEditorNormalizeTranslation'
2019-02-26 13:28:15 -05:00
ac1e89ce1d
Respond to CR.
2019-02-26 13:27:54 -05:00
cc20182ec0
Normalize translation in image editor.
2019-02-26 13:19:40 -05:00
0d26caced7
Normalize translation in image editor.
2019-02-26 13:19:40 -05:00
f01fe8e563
Normalize translation in image editor.
2019-02-26 13:19:40 -05:00
5361720b19
log token in debug
2019-02-26 10:09:29 -07:00
5bd3cec6dc
Merge tag '2.36.1.0'
2019-02-26 10:07:54 -07:00
e6ad6c85bf
Merge branch 'mkirk/long-text-nondurable'
2019-02-26 10:06:59 -07:00
870caaa84a
simplify completion checking - make nonnull
2019-02-26 10:06:52 -07:00
13154fb828
allow long text with non-durable sends (SAE)
2019-02-26 10:06:52 -07:00
bb8dd05614
Merge branch 'charlesmchen/conversationSnapshot2'
2019-02-26 11:35:41 -05:00
7711ee92a7
Revert "Conversation view always observes view model."
...
This reverts commit 9d39e829a44f28f324f79e0b74a6c8692678d788.
2019-02-26 10:56:23 -05:00
6ed4045fbe
Conversation view always observes view model.
2019-02-26 10:56:11 -05:00
56e5feca46
Introduce ConversationSnapshot.
2019-02-26 10:55:44 -05:00
586b362b89
Introduce ConversationSnapshot.
2019-02-26 10:55:44 -05:00
aaac445c51
Merge branch 'charlesmchen/proxiedContentChanges'
2019-02-26 10:54:44 -05:00
fff93f8bb2
Use content proxy to configure all proxied content requests.
2019-02-26 10:54:35 -05:00
ad90a8e0c4
Use content proxy to configure all proxied content requests.
2019-02-26 10:54:35 -05:00
5eaeeff838
Use content proxy to configure all proxied content requests.
2019-02-26 10:54:35 -05:00
a2d48aa020
Merge branch 'charlesmchen/imageEditorTranslation'
2019-02-26 10:51:30 -05:00
2bc5ac14ca
Respond to CR.
2019-02-26 10:51:16 -05:00
7130895e3f
Fix translation in all of editor view's gestures.
2019-02-26 10:06:06 -05:00
674cf2e01f
Render stroke and text items in image coordinates, not canvas coordinates.
2019-02-26 10:06:06 -05:00
7aa826748a
Fix translation in crop editor's pinch gesture.
2019-02-26 10:06:06 -05:00
4022ba1a16
Fix translation in crop editor's pan gesture.
2019-02-26 10:06:06 -05:00
91e83da440
reflect new build params in plist
2019-02-25 15:18:58 -07:00
2c961380c0
update translations
2019-02-25 15:17:48 -07:00
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
c15084c6f4
"Bump build to 2.36.1.0."
2019-02-25 15:11:56 -07:00
d1d99bc641
Merge branch 'mkirk/disappearing-menu-bar'
2019-02-25 14:10:20 -07:00
233bc3858b
dismiss menu actions when selected item is deleted
2019-02-25 14:10:12 -07:00
504d5f89b9
Merge branch 'mkirk/fix-tests-1'
2019-02-25 14:01:38 -07:00
a7e8f9713c
Try to account for variability in network backed tests
2019-02-25 13:44:03 -07:00
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
0bd113e5d7
Merge branch 'mkirk/long-text'
2019-02-25 13:40:02 -07:00
cc94d6946a
update pods
2019-02-25 13:39:55 -07:00
f1623b6037
missing nullability text
2019-02-25 13:27:49 -07:00
c6a3772a5e
clearer constant names
2019-02-25 13:27:49 -07:00
7e5256856c
render media+longText message
2019-02-25 13:27:49 -07:00
b7989e9384
feature flag approval sending
2019-02-25 13:27:49 -07:00
bc4260b444
Send long-text with other attachments
2019-02-25 13:27:49 -07:00
a218d6c465
Send first chars of longtext in protobuf
2019-02-25 13:27:49 -07:00
d0287b28b3
Merge branch 'charlesmchen/proxiedRequestPaddingHeader'
2019-02-25 09:48:34 -05:00
0f98d63365
Tweak name of proxied request padding header.
2019-02-25 09:48:23 -05:00
59cd140477
"Bump build to 2.37.0.4."
2019-02-22 18:12:28 -07:00
ce7ff58f95
Merge branch 'mkirk/input-bar-lanscape'
2019-02-22 18:12:13 -07:00
680b844f3c
Allow all windows to do landscape, fixes:
...
1. Remove undesirable animation from portrait->landscape when minimizizing in
landscape and relaunching in landscape.
2. This also seems to fix the intermittently misplaced toolbar when launching
in landscape. I believe this is a consequence of fix #1
2019-02-21 17:38:52 -07:00
4e3af534df
Merge branch 'mkirk/read-pool'
2019-02-21 16:21:00 -07:00
645a26cbdf
use connection pool for reads
2019-02-21 16:20:57 -07:00
2d86127324
Merge branch 'mkirk/slow-launch'
2019-02-21 16:20:06 -07:00
Matthew Chen
Michael Kirk