Commit graph

10357 commits

Author SHA1 Message Date
Matthew Chen
fe02575b62 Revert "Revert "Revert "Debug scaffolding."""
This reverts commit da6a74bff794151ad7ba2bd6eea2e6316b4d829d.
2018-12-19 14:45:20 -05:00
Matthew Chen
2f95413bcf Use narrow change events in image editor. 2018-12-19 14:45:20 -05:00
Matthew Chen
f224c2130a Suppress undo during strokes. 2018-12-19 14:45:20 -05:00
Matthew Chen
cf1763e79d Suppress undo during strokes. 2018-12-19 14:45:20 -05:00
Matthew Chen
3d67c6574d Suppress undo during strokes. 2018-12-19 14:45:20 -05:00
Matthew Chen
9378ab2192 Add undo/redo buttons to image editor. 2018-12-19 14:45:20 -05:00
Matthew Chen
967da78f29 Revert "Revert "Debug scaffolding.""
This reverts commit a5e71e6eaa71b4ccc7f45bc574b7a1e1c3ebb772.
2018-12-19 14:45:20 -05:00
Michael Kirk
dfb985f46c Merge tag '2.33.0.10' 2018-12-19 10:32:46 -07:00
Michael Kirk
21a910d93f "Bump build to 2.33.0.10." 2018-12-19 09:48:54 -07:00
Michael Kirk
c4e21c641c Sync translations 2018-12-19 09:48:47 -07:00
Matthew Chen
6fe33ab806 Merge branch 'charlesmchen/typingIndicatorsVsBlockAndLeftGroup' into release/2.33.0 2018-12-18 16:24:15 -05:00
Matthew Chen
4e0cfac911 Respond to CR. 2018-12-18 16:24:06 -05:00
Matthew Chen
07fef16155 Discard typing indicators for blocked and left groups. 2018-12-18 16:24:06 -05:00
Matthew Chen
1f6b184136 Merge branch 'charlesmchen/mpgVideo' into release/2.33.0 2018-12-18 16:21:24 -05:00
Matthew Chen
fa9af6c923 Try to play .mpg videos. 2018-12-18 14:54:05 -05:00
Matthew Chen
8b6386b64f Merge branch 'charlesmchen/alwaysMessageActions' 2018-12-18 13:36:00 -05:00
Matthew Chen
039755c0df Respond to CR. 2018-12-18 13:35:49 -05:00
Matthew Chen
dd836ef589 Respond to CR. 2018-12-18 13:34:08 -05:00
Matthew Chen
f2d585f439 Always allow long-press for message actions. 2018-12-18 13:34:08 -05:00
Matthew Chen
f4dbc22d0b Merge remote-tracking branch 'release/2.33.0' 2018-12-18 11:50:08 -05:00
Matthew Chen
3489668ad2 Merge branch 'charlesmchen/purgeDynamicInteractions' 2018-12-18 11:01:37 -05:00
Matthew Chen
bd40aacd53 Purge dynamic interactions from database. 2018-12-18 10:55:54 -05:00
Matthew Chen
98137e9ddf Merge branch 'charlesmchen/imageEditor' 2018-12-18 10:53:59 -05:00
Matthew Chen
d1cf942f7e Respond to CR. 2018-12-18 10:53:41 -05:00
Matthew Chen
825826aa05 Reduce jitter with smoothing. 2018-12-18 10:53:41 -05:00
Matthew Chen
b8775006bb Clean up ahead of PR. 2018-12-18 10:53:41 -05:00
Matthew Chen
794241963e Clean up ahead of PR. 2018-12-18 10:53:41 -05:00
Matthew Chen
e3d4523bc6 Revert "Debug scaffolding."
This reverts commit 55b725a2a29b84d5e5871ac257b4c2f5ce923812.
2018-12-18 10:53:41 -05:00
Matthew Chen
da13dc1d2e Clean up ahead of PR. 2018-12-18 10:53:41 -05:00
Matthew Chen
bf734d5959 Clean up ahead of PR. 2018-12-18 10:53:41 -05:00
Matthew Chen
04cd6c3495 Clean up ahead of PR. 2018-12-18 10:53:41 -05:00
Matthew Chen
639dac4e26 Add stroke drawing to the image editor. 2018-12-18 10:53:41 -05:00
Matthew Chen
b0e0c6e8c2 Replace edited attachments when sending. 2018-12-18 10:53:41 -05:00
Matthew Chen
2f7e99de46 Smooth stroke rendering. 2018-12-18 10:53:41 -05:00
Matthew Chen
e2afe27f5e Add trivial test interaction to image editor. 2018-12-18 10:53:41 -05:00
Matthew Chen
0d81139be5 Debug scaffolding. 2018-12-18 10:53:41 -05:00
Matthew Chen
4752cb94f5 Add ImageEditorView. 2018-12-18 10:53:41 -05:00
Matthew Chen
04440ed1e6 Add ImageEditorStrokeItem. 2018-12-18 10:53:41 -05:00
Matthew Chen
8704ffe93c Sketch out image editor undo/redo. 2018-12-18 10:53:41 -05:00
Matthew Chen
57232683fc Sketch out image editor undo/redo. 2018-12-18 10:53:41 -05:00
Matthew Chen
f95526bff7 Start sketching out image editor. 2018-12-18 10:53:41 -05:00
Matthew Chen
26a25f861b Start sketching out image editor. 2018-12-18 10:53:41 -05:00
Michael Kirk
7245307c92 Merge branch 'mkirk/perf-tweaks' 2018-12-17 14:44:56 -07:00
Michael Kirk
fd6a56b3af format bench in ms 2018-12-17 14:44:49 -07:00
Michael Kirk
f51416b2d2 save a few ms on send, hoist async dispatch to caller, and use it for clearing draft 2018-12-17 14:44:34 -07:00
Michael Kirk
6764d3e754 Merge branch 'mkirk/send-perf' 2018-12-17 14:44:00 -07:00
Michael Kirk
6232b1ef67 CR: add debug asserts 2018-12-17 14:43:50 -07:00
Michael Kirk
81bc357bbb more robust handling of unsaved outgoing messages 2018-12-17 14:43:50 -07:00
Michael Kirk
62cf05cd8b assert only trivial unsaved messages are appended to the view model 2018-12-17 14:43:50 -07:00
Michael Kirk
087e320036 Track 'persisted' viewItems separately 2018-12-17 14:43:50 -07:00