415 Commits

Author	SHA1	Message	Date
Dan Ballard	c3bc961a47	add window_manager plug in to get desktop active state to gate windows notifications; also add spam prevention to windows notifications	2022-01-26 08:31:07 -08:00
Dan Ballard	c838176e3b	add desktoasts windows notifications	2022-01-25 04:03:05 -08:00
Sarah Jamie Lewis	def222a8ab	upgrade flutter file picker	2022-01-21 13:40:23 -08:00
Sarah Jamie Lewis	748326e13f	Fix #330 - Multiple file browser windows are opened.	2022-01-21 13:19:00 -08:00
Sarah Jamie Lewis	d27cc0e64e	More notify listeners	2022-01-21 12:09:58 -08:00
Sarah Jamie Lewis	e359afbdab	notify listeners	2022-01-21 12:08:23 -08:00
Sarah Jamie Lewis	92374ad112	Only override path for Sender, not any other attributes. ... For auto-downloads both the sender and receiver set the path before the UI can set download state. As such we need to be careful about how we let the sender know about the filekey/path.	2022-01-21 10:16:30 -08:00
Sarah Jamie Lewis	9931521910	Clean up sender side image preview	2022-01-20 14:52:31 -08:00
Sarah Jamie Lewis	13c1a52442	Only allow path override for senders	2022-01-20 14:42:45 -08:00
Sarah Jamie Lewis	d095971cb3	Sender side previews - fixing up PR comments	2022-01-20 14:19:06 -08:00
Sarah Jamie Lewis	797279d6d7	Enable Sender Side Image Previews	2022-01-20 14:00:15 -08:00
Dan Ballard	ccdd7d0e27	remove byType bools and replace with interface and structs for type safety	2022-01-20 15:58:14 -05:00
Dan Ballard	889d398343	add notifyListen to newMessage in contact; format	2022-01-20 13:37:09 -05:00
Dan Ballard	589bc4c36c	new lcg; cleanup	2022-01-20 13:05:11 -05:00
Dan Ballard	793b6e2e1a	message cache expansion: stores all messages fetched, indexed by hash and id where possible	2022-01-20 09:24:06 -05:00
Dan Ballard	d5cb37ed9c	stub of new cache	2022-01-20 09:24:06 -05:00
Dan Ballard	e7b9f5bb96	move all classes in model.dart to their own models/X.dart	2022-01-20 09:24:06 -05:00
Sarah Jamie Lewis	2495814869	Fixup Widths on Small Screens	2022-01-19 14:09:19 -08:00
Sarah Jamie Lewis	19f73eb075	Formatting	2022-01-19 13:59:04 -08:00
Dan Ballard	706c1fb354	move all classes in model.dart to their own models/X.dart	2022-01-18 18:32:00 -05:00
Sarah Jamie Lewis	ca44fd798c	Show tooltip for links	2022-01-18 15:03:54 -08:00
Sarah Jamie Lewis	1700306c78	Link to specific commit hashes	2022-01-18 14:48:18 -08:00
Sarah Jamie Lewis	da3234e3e4	Formatting	2022-01-18 14:44:19 -08:00
Sarah Jamie Lewis	303b70d751	Fixup displayed link + add linkify to licenses.dart	2022-01-18 14:43:49 -08:00
Sarah Jamie Lewis	cd1bf07fba	Responding to @errorinn PR Comments	2022-01-18 14:32:45 -08:00
Sarah Jamie Lewis	c6e64a3a5f	Allow Tor Caching + Our Own Linkify	2022-01-18 13:17:52 -08:00
Sarah Jamie Lewis	5494cb5de0	Upgrade LibCwtch-Go	2022-01-17 14:52:15 -08:00
Sarah Jamie Lewis	d6ecf87255	PR Fixups	2022-01-17 12:29:13 -08:00
Sarah Jamie Lewis	ae6f0dd456	Update Translations + notifylisteners	2022-01-17 12:24:48 -08:00
Sarah Jamie Lewis	ed671d32bc	Padding / Margin Changes + Tor Circuit Info	2022-01-14 14:24:41 -08:00
Sarah Jamie Lewis	daa89bf6e7	Add Circuit Info To Peer Settings	2022-01-14 14:24:41 -08:00
Sarah Jamie Lewis	bee3ae6e7b	Fix Debug Layout Issue in AddContact	2022-01-12 15:28:51 -08:00
Sarah Jamie Lewis	26f32a0790	Update Translations + Error Reporting	2022-01-12 15:15:58 -08:00
Sarah Jamie Lewis	958be3e8f7	Upgade lcg	2022-01-12 14:43:26 -08:00
Sarah Jamie Lewis	4cdbb04243	Update Translations	2022-01-12 14:43:26 -08:00
Sarah Jamie Lewis	92422de98e	Support Custom Tor Configuration ... Fixes: #19	2022-01-12 14:43:26 -08:00
Sarah Jamie Lewis	659e89d626	Formatting PR	2022-01-10 12:28:12 -08:00
Sarah Jamie Lewis	306a9c4de5	Fix #295 - Clicking on an Avatar in P2P Chat should not result in an action	2022-01-10 12:27:56 -08:00
Dan Ballard	afdeeae423	fix save history option saving in peer settings	2022-01-07 09:53:39 -05:00
Dan Ballard	1ea285de51	add required provider to groupsettingsview so leave action can trigger	2022-01-06 22:26:51 -05:00
Dan Ballard	ce7e7df3ae	fix gomobile/FlwtchWorker calls incorrectly casting Long for SetContactAttribute and sendInvite	2022-01-06 18:46:49 -05:00
Dan Ballard	5e485b6327	Rework accept/block data flow to map to new storage; fix add group server list falls back to onion when no description	2022-01-06 18:06:06 -05:00
Dan Ballard	c12f6b54dc	theme android appbar color	2022-01-04 15:52:43 -05:00
Sarah Jamie Lewis	3af3142c67	Merge branch 'trunk' into fileCPU	2021-12-21 19:56:05 +00:00
Dan Ballard	37700e1a78	move the CheckDownloadStatus to filemessage model and only do to init	2021-12-21 13:29:20 -05:00
Dan Ballard	adc6c0491b	comment out CheckDownloadStatus loop in filebubble	2021-12-21 10:13:43 -05:00
Dan Ballard	7434cf0934	don't pop nav stack to profileMgr when change password errors	2021-12-21 09:18:21 -05:00
Dan Ballard	da9d093a13	theme fixes; scroollbar for addContact; messageRow space optimization for android	2021-12-21 00:07:16 -05:00
Dan Ballard	5f21ebc2b2	lokalise translation updates	2021-12-20 19:04:11 -05:00
Dan Ballard	513035789d	add mouse icon over file previews to trigger dialog; add exit button to image preview dialoge; spacing	2021-12-20 16:34:51 -05:00
Dan Ballard	936fca943a	don't show server metrics when not running (undefined anyway); properly define hilight border around empty message pane in dual pane mode	2021-12-20 14:33:34 -05:00
Sarah Jamie Lewis	a6743af103	IndexFailure + Android Change Password Fixups	2021-12-19 12:45:13 -08:00
Sarah Jamie Lewis	b0cf3d2021	Merge branch 'trunk' into ipreview	2021-12-19 20:04:30 +00:00
Dan Ballard	d4b614f2c4	remove RightShiftFixer for winodws, flutter should be better now; rm tri[lecolview, unused half a year	2021-12-19 14:04:58 -05:00
erinn	09496713d9	merge trunk	2021-12-18 18:39:07 -08:00
erinn	6390cb55a4	l10n	2021-12-18 18:09:18 -08:00
erinn	81d43554b5	Merge branch 'ipreview' of git.openprivacy.ca:cwtch.im/cwtch-ui into ipreview	2021-12-18 18:03:10 -08:00
erinn	26c84472d8	l10n	2021-12-18 18:02:44 -08:00
erinn	a36a55c53f	Merge branch 'ipreview' of git.openprivacy.ca:cwtch.im/cwtch-ui into ipreview	2021-12-18 17:43:39 -08:00
erinn	d329e7cc06	image previews - dan comments - wip	2021-12-18 17:43:32 -08:00
Sarah Jamie Lewis	e0a28b4dc1	Merge branch 'trunk' into migrateMsg	2021-12-18 21:28:37 +00:00
Dan Ballard	8e489131fa	fix bg color of servers pane	2021-12-18 13:51:52 -05:00
Sarah Jamie Lewis	78265b7f85	Merge branch 'ipreview' of git.openprivacy.ca:cwtch.im/cwtch-ui into ipreview	2021-12-17 17:05:59 -08:00
Sarah Jamie Lewis	845ce3b546	Scaling + Android ChangePassword	2021-12-17 17:02:24 -08:00
Sarah Jamie Lewis	6f3d5b65cd	preview	2021-12-17 16:54:30 -08:00
erinn	c78dbf0ac3	fileshare confirmations and contact-add-gating	2021-12-17 16:32:22 -08:00
Dan Ballard	6adea075e7	Make splash scren stateful; add translations; add message and progress bar for storage migration	2021-12-17 18:23:18 -05:00
Dan Ballard	75acfe8dd0	contact list sort more often and float unauthed contacts to top	2021-12-17 17:34:56 -05:00
Dan Ballard	6ba447f941	appState support modal message	2021-12-17 17:13:09 -05:00
erinn	9cb6eb857d	Merge branch 'ipreview' of git.openprivacy.ca:cwtch.im/cwtch-ui into ipreview	2021-12-16 17:04:35 -08:00
erinn	6e9fb6810e	message previews	2021-12-16 17:04:29 -08:00
Sarah Jamie Lewis	df3617c5a1	Fixup Preview Dialog	2021-12-16 16:54:53 -08:00
Dan Ballard	aff7a5f4b2	deleting removed event event handlers	2021-12-16 19:50:43 -05:00
Sarah Jamie Lewis	8a8c5fc3e2	Update Langs	2021-12-16 12:52:25 -08:00
Dan Ballard	cde6962b8e	group functionality fixes from storage engine; tor status include percent; crate group enhancement	2021-12-16 13:36:14 -05:00
Dan Ballard	abf4d79e80	flutter format	2021-12-15 17:29:27 -05:00
Sarah Jamie Lewis	a4cb5051b5	Fixing Duplicate Key Issues + FileBubble SetState Builder Issues	2021-12-15 13:45:33 -08:00
Dan Ballard	b29bb1e4dc	clean up comments, delete old code, pr comments	2021-12-15 15:28:49 -05:00
Dan Ballard	124694447b	i10n theme names	2021-12-15 15:22:17 -05:00
Dan Ballard	8af4deaf95	the rest of the themes	2021-12-15 15:22:17 -05:00
Dan Ballard	e599768643	update with new PRs rebase, update goldens for slight variance	2021-12-15 15:22:17 -05:00
Dan Ballard	dc550daaa1	migrate to new libcwtch changes; add vampire and witch; tweak switch button coloring	2021-12-15 15:22:17 -05:00
Dan Ballard	089fee4c41	updates	2021-12-15 15:22:17 -05:00
Dan Ballard	53e79f5b9d	refactor themes from methods to get fields; add theme selector; add neon1	2021-12-15 15:22:17 -05:00
Dan Ballard	194ade9aa6	refactor light and dark onto existing new color scheme; fix message editor top strip color; tweak color field semantics	2021-12-15 15:22:17 -05:00
Dan Ballard	f6a4d5c3fa	removing unused theme definitions	2021-12-15 15:22:17 -05:00
Dan Ballard	3b893d4f15	gate profile servers on groups or servers experiment	2021-12-15 15:20:07 -05:00
erinn	51fae2e7ef	wip image previews	2021-12-14 17:25:05 -08:00
erinn	fc488bdb2e	Merge branch 'ipreview' of git.openprivacy.ca:cwtch.im/cwtch-ui into ipreview	2021-12-14 17:19:40 -08:00
erinn	e026b2d542	l10n image previews	2021-12-14 17:19:13 -08:00
erinn	a0fc096f6f	Merge branch 'ipreview' of git.openprivacy.ca:cwtch.im/cwtch-ui into ipreview	2021-12-14 17:13:19 -08:00
erinn	b994c42803	wip image previews	2021-12-14 17:13:13 -08:00
erinn	c16800bc0c	image previews merge	2021-12-14 17:13:04 -08:00
erinn	56e9e36074	l10n image previews	2021-12-14 17:12:16 -08:00
erinn	8c4a5aee90	wip image previews	2021-12-14 15:50:08 -08:00
Sarah Jamie Lewis	8be0fa3957	File Bubble Design	2021-12-14 15:37:27 -08:00
erinn	63fc1fe772	Merge branch 'trunk' of git.openprivacy.ca:cwtch.im/cwtch-ui into ipreview	2021-12-14 13:37:48 -08:00
erinn	33a8a30170	wip image previews	2021-12-14 13:33:30 -08:00
Dan Ballard	2d66e42624	support for server metrics	2021-12-14 10:29:19 -06:00
Sarah Jamie Lewis	816425cd4d	Fix #255 - clicking Open now causes popup to close. ... Also importing new translatable strings + a few nicer URL options	2021-12-13 15:42:42 -08:00
Dan Ballard	63ed835880	remove commented out code	2021-12-10 23:26:47 -08:00
Dan Ballard	6180b88172	port to new cwtch storage API	2021-12-10 15:37:08 -08:00
Dan Ballard	3f5428eff8	complete profile level server managment	2021-12-10 14:49:38 -08:00
Dan Ballard	0c797faf05	profile level server list and editor start	2021-12-10 14:45:13 -08:00
Dan Ballard	1d5359e645	start of profile server manager	2021-12-10 14:41:48 -08:00
Sarah Jamie Lewis	405c4aeb4c	Merge branch 'trunk' into russian	2021-12-10 21:02:46 +00:00
Sarah Jamie Lewis	066b4d4dec	Erinn Comment Fixups	2021-12-10 11:51:19 -08:00
Sarah Jamie Lewis	c5c0f21829	Fix New Marker. Add Placeholder for Import Handling	2021-12-08 16:41:01 -08:00
Sarah Jamie Lewis	30fa788b84	Combine update cache and total messages increase. Remove CachedMessage	2021-12-08 14:39:14 -08:00
Sarah Jamie Lewis	995282fa04	Fixup Acks / Message Keys	2021-12-06 13:42:40 -08:00
Sarah Jamie Lewis	c9319d32d0	Much improved message caching	2021-12-06 12:26:02 -08:00
Sarah Jamie Lewis	c42be6224d	Porting Android over to new API	2021-12-03 11:28:10 -08:00
Sarah Jamie Lewis	d6839c62e3	Move Attribute Updates / File Downloading / Contact Requests / Invites to new API	2021-12-01 04:17:48 -08:00
Sarah Jamie Lewis	b0f74ffb6d	Fixup Conversation Attribute Flow	2021-11-26 15:07:37 -08:00
Sarah Jamie Lewis	c00bfbb48b	Quoted Message Fixes / New Message Label Offet Fixes	2021-11-26 14:25:21 -08:00
Sarah Jamie Lewis	880c1c107b	UI Updates to new Cwtch API	2021-11-25 15:59:54 -08:00
Sarah Jamie Lewis	1d6b533df3	New Cwtch Library Integration	2021-11-18 15:44:54 -08:00
Sarah Jamie Lewis	fec22538d2	Merge branch 'trunk' into russian	2021-11-11 01:17:46 +00:00
Sarah Jamie Lewis	4dea1e1dd4	Merge branch 'trunk' into nima/clickable-links	2021-11-11 00:22:53 +00:00
erinn	6d261c999b	use l10n str	2021-11-10 16:19:18 -08:00
erinn	00ce310cbc	l10n update	2021-11-10 16:04:51 -08:00
erinn	946d7accb2	Merge branch 'trunk' of git.openprivacy.ca:cwtch.im/cwtch-ui into scrollfixes	2021-11-10 15:52:42 -08:00
erinn	996cad4ece	autoscroll fixes	2021-11-10 15:52:34 -08:00
RuLang	51d98b5171	Update Russian Localization	2021-11-10 19:30:31 +00:00
Sarah Jamie Lewis	b9549e6885	Merge branch 'trunk' into nima/clickable-links	2021-11-10 18:13:15 +00:00
Sarah Jamie Lewis	d0770b4bd8	Russian Localization	2021-11-10 09:58:46 -08:00
Nima Boscarino	1c03fdf1db	Add link styling, using main text colour	2021-11-08 12:57:55 -08:00
Nima Boscarino	35dcc24e66	Remove resolved TODO statements, and destroy modal ... after copying link	2021-11-06 10:53:42 -07:00
Nima Boscarino	b8d50f234a	Merge branch 'trunk' into nima/clickable-links	2021-11-05 22:39:51 -07:00
Nima Boscarino	ec1dd05ba1	WIP: add experimental clickable links with dialog ... (copy / open). Bug remaining for selectable text	2021-11-05 22:38:45 -07:00
Dan Ballard	44b77f0a90	libcwtch go bump (fix create server on mac), copy keys text fix	2021-11-05 13:45:50 -07:00
erinn	626aa386d0	update lcg version	2021-11-04 16:31:01 -07:00
erinn	8653a31482	Merge branch 'l10nup' of git.openprivacy.ca:cwtch.im/cwtch-ui into filefix2	2021-11-04 15:44:49 -07:00
erinn	10838ba67a	l10n updates for file resumption 2	2021-11-04 15:44:31 -07:00
erinn	d581718d36	Merge branch 'trunk' of git.openprivacy.ca:cwtch.im/cwtch-ui into filefix2	2021-11-04 15:31:56 -07:00
erinn	e55d9301e4	file resumption support	2021-11-04 15:31:50 -07:00
erinn	6331a6da95	l10n updates for file resumption	2021-11-04 15:02:26 -07:00
Dan Ballard	fb18a0e3b8	fix serverliststate add to handle readds (happens on saving global settings)	2021-11-04 11:49:03 -07:00
Dan Ballard	87f7c2c29b	server delete functionality and minor cleanups	2021-11-03 21:31:03 -07:00
Sarah Jamie Lewis	05433397d4	Merge branch 'trunk' into lcgVBump	2021-11-03 20:00:29 +00:00
Dan Ballard	fc59bd332b	restruct mobile from servers experiment and tab	2021-11-03 12:53:32 -07:00
Dan Ballard	2c57499478	Merge pull request 'group_message_fixes' (#227) from group_message_fixes into trunk ... Reviewed-on: #227	2021-11-03 19:33:09 +00:00
Dan Ballard	82294eb6af	proper tooltips	2021-11-02 15:19:16 -07:00
Dan Ballard	3e75c4d106	last cleanup	2021-11-02 15:10:36 -07:00
Dan Ballard	e9407ae426	fixing as per PR	2021-11-02 14:48:52 -07:00
Sarah Jamie Lewis	c5f154a25f	Fmt	2021-11-02 13:47:52 -07:00
Sarah Jamie Lewis	cae44cbd46	Ensure unique keys for messages	2021-11-02 13:47:52 -07:00
Dan Ballard	b65d16aa8a	translations	2021-11-02 13:36:59 -07:00
Dan Ballard	ed8292ece9	serverlist check password. also libcwtch-go version	2021-11-01 22:16:52 -07:00
Dan Ballard	562c05183b	server list, add edit	2021-11-01 19:45:27 -07:00
Dan Ballard	c304e2ec2a	server list, add edit	2021-11-01 19:45:27 -07:00
Dan Ballard	9789a42e94	server manager	2021-11-01 19:45:27 -07:00
Dan Ballard	d4b9f1dc55	lib/cwtch new servers api coverage and Set[Profile/Contact]Attribute	2021-11-01 19:45:26 -07:00
Sarah Jamie Lewis	73690e8bac	Combined if statements	2021-11-01 15:15:30 -07:00
Sarah Jamie Lewis	088cebcc6b	Merge branch 'trunk' into group_message_fixes	2021-11-01 22:08:12 +00:00
Sarah Jamie Lewis	fe156108b5	Rely on Index from NewGroupMessage to sync Timelines	2021-11-01 15:07:09 -07:00
erinn	74e25534c5	android file sending bugfix	2021-10-01 12:38:06 -07:00
Sarah Jamie Lewis	0cdf18df79	fmt	2021-10-01 07:57:29 -07:00
Sarah Jamie Lewis	222e2c6f36	Prevent Sharing Files on Android for Now	2021-10-01 07:52:49 -07:00
Sarah Jamie Lewis	9556150c05	Upgrade libCwtch-go + Fix Model merge issue	2021-09-30 13:29:52 -07:00
Sarah Jamie Lewis	efbf7f5bff	Small file sharing cleanup	2021-09-30 10:53:32 -07:00
Sarah Jamie Lewis	bf31a2b062	Filesharing UI Updates	2021-09-29 17:29:14 -07:00
erinn	d8453bc530	Merge branch 'trunk' into filesharing	2021-09-30 00:21:27 +00:00
erinn	01d816209b	flutter format	2021-09-29 17:20:35 -07:00
erinn	d4aa1cb397	android download notification, also fix updatemessageflags didnt work on android	2021-09-29 17:16:00 -07:00
erinn	8fe577afd4	moar fileshare plz	2021-09-29 13:31:01 -07:00
Dan Ballard	6d79c1dc17	add bunny streamer icon to settings	2021-09-28 16:44:50 -07:00
erinn	cb3c161277	wip: filesharing ui dev	2021-09-27 12:53:21 -07:00
erinn	4eed72ded3	Merge branch 'trunk' of git.openprivacy.ca:cwtch.im/cwtch-ui into filesharing	2021-09-21 14:57:48 -07:00
erinn	78ea12dff3	filesharing wip	2021-09-21 14:57:40 -07:00
erinn	4f614b69fd	l10n updates	2021-09-21 14:47:31 -07:00
erinn	e7c6bb145a	l10n updates	2021-09-21 14:45:31 -07:00
Sarah Jamie Lewis	539b93836a	Light Theme Fixes #162	2021-09-21 13:31:11 -07:00
Sarah Jamie Lewis	c1aee0d128	Fix #163 ... Also make quoted messages nicer	2021-09-17 13:38:10 -07:00
Dan Ballard	be2de14d65	make settings null safer, l10n	2021-09-14 14:38:38 -07:00
Dan Ballard	ac619cd514	make settings null safer	2021-09-14 13:48:25 -07:00
Dan Ballard	34da2bea35	streamer mode	2021-09-14 09:05:07 -07:00
Dan Ballard	7de7e36e99	macos: handle shutdown & first release run copy dev profile if none	2021-09-10 18:12:30 -07:00
fyne	be0c4f4d64	Leave the Cwtch.app local path in	2021-09-04 18:48:49 +01:00
fyne	b53f43d946	Allow the fallback to the Tor Browser tor.real	2021-09-04 14:41:01 +01:00
fyne	13f76d1861	Attempt to fix #166 ... Add better checks	2021-09-04 14:34:42 +01:00
Dan Ballard	99762c0b29	update README for mac build instructions to get libcwtch-go; translations update	2021-08-30 15:50:24 -07:00
Dan Ballard	a615f30eea	finish MacOS packaging work, app icons	2021-08-28 20:41:08 -04:00
Dan Ballard	851e391666	macos build support and packaging scripts	2021-08-28 13:53:35 -04:00
Dan Ballard	d461bf879c	turn off macos sandbox mode; ffi refactor to get library path so isolate polling appbus events always gets new platform updates	2021-08-28 13:53:35 -04:00
Dan Ballard	ca83033997	basic macos stuf support: builds but doesn't run, cant find libCwtch.dylib	2021-08-28 13:53:35 -04:00
erinn	d6b6069ef1	drag messagelist scrollbar fix	2021-08-27 14:58:12 -07:00
Sarah Jamie Lewis	31b3d48f44	Update API	2021-08-27 14:02:16 -07:00
Sarah Jamie Lewis	4e3bd696ed	Distinguish between Archive and Delete	2021-08-27 13:46:50 -07:00
Sarah Jamie Lewis	30ea12a9ce	Improve Button Feedback	2021-08-27 11:41:10 -07:00
Sarah Jamie Lewis	6210a64315	Format	2021-08-26 14:56:58 -07:00
Sarah Jamie Lewis	825fb23992	Block Unknown Connections Indicator	2021-08-26 14:53:48 -07:00
erinn	62a9402357	l10n updates	2021-08-26 14:48:14 -07:00
erinn	e487d0bd65	Merge branch 'trunk' into erinn45	2021-08-26 21:20:05 +00:00
erinn	76c6a5f069	merge trunk	2021-08-26 14:18:25 -07:00
Sarah Jamie Lewis	1a80b4b808	Add Physics to Message Row. Fixes: #132	2021-08-26 14:11:10 -07:00
erinn	61d1a60b0e	nicer compose bar	2021-08-26 13:52:17 -07:00
Sarah Jamie Lewis	3cf81e41d6	Memory Management Improvements ... Free Pointers Allocated by NativeUTF8 Also use new c_FreePointer from libCwtch to free returned strings after they have been processed.	2021-08-24 22:10:59 -07:00
Dan Ballard	aee861df90	Merge branch 'trunk' into disable-ime-learning	2021-08-17 20:49:02 +00:00
erinn	06075583ed	Merge branch 'trunk' into erinn48	2021-08-16 23:40:55 +00:00