10287 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Chen	d59e2bb613	Add decryption to DeviceNames.	2018-12-19 18:26:15 -05:00
Matthew Chen	0d20ebc62b	Add encryption to DeviceNames.	2018-12-19 18:26:15 -05:00
Matthew Chen	79375e20b2	Update proto schema.	2018-12-19 18:26:15 -05:00
Michael Kirk	4a26952f51	Merge branch 'mkirk/orm-perf'	2018-12-19 15:31:58 -07:00
Michael Kirk	d8fda8a7aa	Update pods with perf improvements	2018-12-19 15:31:19 -07:00
Michael Kirk	7bc5357397	[PERF] optimize search normalization saves 2.5% on large migration	2018-12-19 15:19:02 -07:00
Michael Kirk	0cb702b37f	[PERF] save 2% on large migrations	2018-12-19 15:19:02 -07:00
Michael Kirk	a0770c14c5	baseline perf test for migration	2018-12-19 15:19:02 -07:00
Michael Kirk	ca5b3c8ec9	make factory methods public	2018-12-19 15:19:02 -07:00
Michael Kirk	40470ec424	fixup test fixes	2018-12-19 15:19:02 -07:00
Michael Kirk	3be8563898	fixup broken tests	2018-12-19 15:19:02 -07:00
Michael Kirk	686d6e4988	Merge branch 'mkirk/fix-sort-id-rebased'	2018-12-19 15:16:48 -07:00
Michael Kirk	fc7a713619	CR: use existing transaction rather than open sneaky one	2018-12-19 15:16:36 -07:00
Michael Kirk	e0c9b590c0	CR: fix comment typo	2018-12-19 15:16:36 -07:00
Michael Kirk	af7ee5e1d1	address compiler breakage after rebase	2018-12-19 15:16:36 -07:00
Michael Kirk	0db3f240dd	keep legacy properties around just in case...	2018-12-19 15:16:36 -07:00
Michael Kirk	45e572e82f	assert monotonic order for migration	2018-12-19 15:16:36 -07:00
Michael Kirk	9d5753bd81	fix sortId comparison	2018-12-19 15:16:36 -07:00
Michael Kirk	5671fd2520	Revert "Revert 'new sort id'." ... This reverts commit ebae75af00.	2018-12-19 15:16:36 -07:00
Matthew Chen	11b8819274	Merge branch 'charlesmchen/l10nVoiceCodes'	2018-12-19 15:09:53 -05:00
Matthew Chen	8949a49f6a	Localize voice verification codes.	2018-12-19 15:09:46 -05:00
Matthew Chen	2df70aba6b	Localize voice verification codes.	2018-12-19 15:09:46 -05:00
Matthew Chen	a1dbb2f04e	Merge branch 'charlesmchen/imageEditor3'	2018-12-19 15:08:39 -05:00
Matthew Chen	35b6f6cf12	Respond to CR.	2018-12-19 15:08:28 -05:00
Matthew Chen	18f07d12b5	Revert "Revert "Revert "Debug scaffolding.""" ... This reverts commit 075ea35bbee4815fb77ecf3024ef29a933cc0ec0.	2018-12-19 14:48:37 -05:00
Matthew Chen	db8bc58b6d	Implement crop.	2018-12-19 14:48:37 -05:00
Matthew Chen	57f888a447	Add crop gesture.	2018-12-19 14:48:37 -05:00
Matthew Chen	03cbeb5fee	Start working on crop.	2018-12-19 14:48:37 -05:00
Matthew Chen	ce6a40e7c8	Revert "Revert "Debug scaffolding."" ... This reverts commit a5e71e6eaa71b4ccc7f45bc574b7a1e1c3ebb772.	2018-12-19 14:48:37 -05:00
Matthew Chen	3c68e29834	Merge branch 'charlesmchen/imageEditor2'	2018-12-19 14:47:58 -05:00
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