526 Commits

All Branches

Search

Author	SHA1	Message	Date
Sarah Jamie Lewis	07e8c49d7b	Merge branch 'trunk' into assetsDir	2021-06-14 17:41:26 -07:00
Sarah Jamie Lewis	38c59c5f82	Merge pull request 'l10n updates' (#190) from l10nupdates into trunk ... Reviewed-on: #190	2021-06-14 17:28:08 -07:00
erinn	5681a43d69	l10n updates	2021-06-14 17:25:24 -07:00
erinn	c3e3c4f91e	l10n updates	2021-06-14 17:11:43 -07:00
Dan Ballard	43bf1c19ae	Merge pull request 'Remove debug button in release builds' (#189) from beta_fixes into trunk ... Reviewed-on: #189	2021-06-14 14:56:47 -07:00
Sarah Jamie Lewis	28603b6fed	Remove debug button in release builds	2021-06-14 14:41:05 -07:00
Dan Ballard	0a9583e54e	linux: be able to use different install configurations	2021-06-14 08:45:00 -07:00
Sarah Jamie Lewis	c606002541	Merge pull request 'android service and notifications' (#167) from androidservice into trunk ... Reviewed-on: #167	2021-06-11 15:25:53 -07:00
erinn	2abdcdeae0	updatemessageflags got mismerged oops	2021-06-11 15:15:42 -07:00
erinn	5c8d448a37	update lcg version	2021-06-11 15:05:38 -07:00
erinn	2a97616382	merge trunk	2021-06-11 15:00:13 -07:00
erinn	97f1e43009	remove debugging cruft	2021-06-11 14:51:35 -07:00
Sarah Jamie Lewis	9dd9fa98fc	Merge pull request 'Persist rejection action' (#166) from rejection_persist into trunk ... Reviewed-on: #166	2021-06-11 14:42:34 -07:00
erinn	37996b5d96	merge	2021-06-11 14:29:18 -07:00
erinn	9c69275fe6	android service and notification support take one. ACTION	2021-06-11 14:28:20 -07:00
Sarah Jamie Lewis	421d34e1a7	Merge branch 'trunk' into rejection_persist	2021-06-10 14:20:55 -07:00
Sarah Jamie Lewis	0d56c5a3bd	Erinns Comments	2021-06-10 14:19:48 -07:00
Sarah Jamie Lewis	b3dd5e2fee	Persist rejection action	2021-06-10 11:48:13 -07:00
Dan Ballard	2df34a0192	Merge branch 'trunk' of git.openprivacy.ca:flutter/flutter_app into trunk	2021-06-08 22:27:53 -07:00
Dan Ballard	0e8efc0b6b	drone linux dont dup icudtl.dat; windows add recuire VC Redist dlls	2021-06-08 22:27:35 -07:00
Dan Ballard	27f8dd289e	Merge pull request 'Fix invitation wrapping' (#157) from ui_fixes into trunk ... Reviewed-on: #157	2021-06-07 15:34:52 -07:00
Sarah Jamie Lewis	aa0a1d9a26	Flutter Upgrade + Translations	2021-06-07 15:12:50 -07:00
Sarah Jamie Lewis	a4c7fe6ebf	Fix Self-Invitations	2021-06-07 15:12:50 -07:00
Sarah Jamie Lewis	b0f4a085b8	Fix invitation wrapping	2021-06-07 15:12:50 -07:00
Dan Ballard	332fad4108	android versioncode bump	2021-06-04 22:38:58 -07:00
Dan Ballard	403eb04124	linux hack my_application.cc so that it does directory exist checks on assets folder and can override to alt paths on the system	2021-06-04 22:38:34 -07:00
Dan Ballard	22eb994c52	Merge pull request 'Update Icons' (#155) from ui_fixes into trunk ... Reviewed-on: #155	2021-06-04 16:31:21 -07:00
Sarah Jamie Lewis	2c4e65e348	Update Icons	2021-06-04 16:09:03 -07:00
Dan Ballard	f04404386c	Merge pull request 'Clean up message warning logic' (#154) from ui_fixes into trunk ... Reviewed-on: #154	2021-06-04 15:22:03 -07:00
Sarah Jamie Lewis	1bf7438a26	Merge branch 'trunk' into ui_fixes	2021-06-04 15:02:43 -07:00
Sarah Jamie Lewis	3f4c313d73	Fix heart color	2021-06-04 15:00:09 -07:00
Sarah Jamie Lewis	d27d9b6741	Remove print	2021-06-04 14:39:03 -07:00
Sarah Jamie Lewis	b2cee259cb	Clean conversation warning logic	2021-06-04 14:38:29 -07:00
Dan Ballard	edb6ca4e94	Merge pull request 'Disconnected and Ephemeral Warnings' (#153) from ui_fixes into trunk ... Reviewed-on: #153	2021-06-04 13:25:59 -07:00
Sarah Jamie Lewis	dcefa30580	Disconnected and Ephemeral Warnings	2021-06-04 13:18:30 -07:00
Dan Ballard	a41e6f12b0	Merge pull request 'New experiment checking method.' (#152) from ui_fixes into trunk ... Reviewed-on: #152	2021-06-04 12:18:57 -07:00
Sarah Jamie Lewis	f4f885fcea	New experiment checking method.	2021-06-04 11:16:09 -07:00
Sarah Jamie Lewis	7351bd322a	Merge pull request 'case insensitive search + onion search only from start' (#151) from searchFix into trunk ... Reviewed-on: #151	2021-06-03 21:22:04 -07:00
Dan Ballard	0858e4fd2b	case insensitive search + onion search only from start	2021-06-03 21:16:54 -07:00
Sarah Jamie Lewis	d45dedc76b	Merge pull request 'windows: .ico and app name and menu name' (#148) from winnameicon into trunk ... Reviewed-on: #148	2021-06-03 15:44:19 -07:00
Sarah Jamie Lewis	70a049e6fe	Merge branch 'trunk' into winnameicon	2021-06-03 15:44:11 -07:00
Dan Ballard	dbdb62b8e2	windows icon sizing and WNDCLASSEX for small icon	2021-06-03 14:34:21 -07:00
Dan Ballard	c6c9899a78	windows: .ico and app name and menu name	2021-06-03 12:37:17 -07:00
Dan Ballard	c37bca5f34	Merge pull request 'Custom Icons + Small Fixes' (#147) from ui_fixes into trunk ... Reviewed-on: #147	2021-06-03 12:21:51 -07:00
Sarah Jamie Lewis	1eaec8b00a	Custom Icons + Small Fixes	2021-06-03 12:06:18 -07:00
erinn	89507a8aa6	Merge branch 'trunk' of git.openprivacy.ca:flutter/flutter_app into androidservice	2021-06-02 13:21:27 -07:00
erinn	6972028ecf	WIP: partial android service migration	2021-06-02 13:21:23 -07:00
erinn	8a69ae9c1c	Merge pull request 'Bump version' (#142) from ui_fixes into trunk ... Reviewed-on: #142	2021-06-02 13:10:52 -07:00
Sarah Jamie Lewis	01819067f3	Bump version	2021-06-02 13:08:54 -07:00
erinn	9261119009	Merge pull request 'A few small fixes from user feedback.' (#141) from ui_fixes into trunk ... Reviewed-on: #141	2021-06-02 13:04:20 -07:00