195 Commits

All Branches

Search

Author	SHA1	Message	Date
Sarah Jamie Lewis	a19deb2b4d	Merge branch 'trunk' into disable-ime-learning	2021-08-09 15:37:07 +00:00
Sarah Jamie Lewis	505bceb887	Enable incognito keyboard on android	2021-08-09 08:35:45 -07:00
Dan Ballard	83c9adac5d	new buildfiles host	2021-08-06 14:50:58 -07:00
Sarah Jamie Lewis	a1e168a5f7	Merge pull request 'opening a chat with unread messages should go to last read. fixes #48' (#133) from erinn48 into trunk ... Reviewed-on: #133 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>	2021-07-23 14:56:30 -07:00
erinn	08fcbc6a10	opening a chat with unread messages should go to last read. fixes #48	2021-07-23 14:50:21 -07:00
Dan Ballard	8668211e1d	Merge pull request 'BUGFIX: Unblock Profile' (#128) from bugfix into trunk ... Reviewed-on: #128	2021-07-15 14:59:09 -07:00
Sarah Jamie Lewis	16bdcce25c	BUGFIX: Unblock Profile	2021-07-15 14:58:24 -07:00
Sarah Jamie Lewis	f9584d1301	Merge pull request '1.1 release finalization' (#125) from r1.1 into trunk ... Reviewed-on: #125 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>	2021-07-15 13:34:18 -07:00
Dan Ballard	13faa2c027	1.1 release finalization	2021-07-15 13:22:15 -07:00
Dan Ballard	a7536d30ea	Merge pull request 'Android Icons + Debug Fixes' (#124) from bugfix into trunk ... Reviewed-on: #124 Reviewed-by: Dan Ballard <dan@openprivacy.ca>	2021-07-15 13:14:46 -07:00
Sarah Jamie Lewis	0abc4caf95	Android Icons + Debug Fixes	2021-07-15 13:07:11 -07:00
Sarah Jamie Lewis	07ed216b0a	Merge pull request 'update icons to chibi bw icon. add script for icon generation' (#123) from iconUpdate into trunk ... Reviewed-on: #123	2021-07-15 11:24:34 -07:00
Sarah Jamie Lewis	f1594be932	Merge branch 'trunk' into iconUpdate	2021-07-15 11:24:27 -07:00
Dan Ballard	e7ecd28faf	Merge pull request 'Fixup Group Invite Accept Timestamp + Syncing Indicator' (#122) from bugfix into trunk ... Reviewed-on: #122	2021-07-15 11:23:55 -07:00
Dan Ballard	19269fce1c	update icons to chibi bw icon. add script for icon generation	2021-07-15 11:14:17 -07:00
Sarah Jamie Lewis	91c556dd14	Fixup Group Invite Accept Timestamp + Syncing Indicator	2021-07-15 10:57:40 -07:00
Dan Ballard	1726ea2f45	Merge pull request 'Fix Last Message Time for NewGroupMessages' (#121) from bugfix into trunk ... Reviewed-on: #121 Reviewed-by: Dan Ballard <dan@openprivacy.ca>	2021-07-15 10:30:07 -07:00
Sarah Jamie Lewis	6723949d17	Fix Last Message Time for NewGroupMessages	2021-07-15 10:03:19 -07:00
Sarah Jamie Lewis	43d0e51890	Merge pull request 'hilight unlock button on 0 profiles' (#120) from hilightUnlock into trunk ... Reviewed-on: #120 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>	2021-07-14 16:30:41 -07:00
Dan Ballard	51d2e89e9a	hilight unlock button on 0 profiles	2021-07-14 16:19:11 -07:00
Sarah Jamie Lewis	cac05cd4e6	Merge pull request 'lightFixes' (#119) from lightFixes into trunk ... Reviewed-on: #119 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>	2021-07-14 15:30:53 -07:00
Dan Ballard	03fd76c598	add quality.sh and run	2021-07-14 15:07:29 -07:00
Dan Ballard	cddf204695	quote message color fixes; disable swipe reply on desktop; message view alert color fix; card theme fix	2021-07-14 15:07:29 -07:00
Sarah Jamie Lewis	464edf9aed	Merge pull request 'Autohide messages from blocked contacts' (#117) from bugfix into trunk ... Reviewed-on: #117 Reviewed-by: erinn <erinn@openprivacy.ca>	2021-07-14 13:48:02 -07:00
Sarah Jamie Lewis	b9ce0176f9	Merge branch 'trunk' into bugfix	2021-07-14 13:39:18 -07:00
Sarah Jamie Lewis	79abd45a83	Merge pull request 'dont show placeholder when contact offline' (#118) from erinn23 into trunk ... Reviewed-on: #118	2021-07-14 13:39:10 -07:00
erinn	0126721979	Merge branch 'trunk' into erinn23	2021-07-14 13:38:34 -07:00
erinn	248167c15a	dont show placeholder when contact offline	2021-07-14 13:37:47 -07:00
Sarah Jamie Lewis	d126cc6ebb	Autohide messages from blocked contacts	2021-07-14 13:35:22 -07:00
Sarah Jamie Lewis	7a7b3f22b0	Merge pull request 'enter a message placeholder text' (#116) from erinn23 into trunk ... Reviewed-on: #116 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>	2021-07-14 13:26:14 -07:00
erinn	502abb8eb0	update l10n/pl	2021-07-14 13:13:42 -07:00
erinn	782c838fc8	merge trunk	2021-07-14 13:09:26 -07:00
erinn	e9d28e76ea	enter a message placeholder text	2021-07-14 13:03:59 -07:00
Sarah Jamie Lewis	c63a1ae489	Merge pull request 'Increase borders on White Knott svg' (#115) from bugfix into trunk ... Reviewed-on: #115 Reviewed-by: Dan Ballard <dan@openprivacy.ca>	2021-07-14 12:06:59 -07:00
Dan Ballard	c73d96e9ba	update linux icon pngs and windows icos from svg white knot update	2021-07-14 12:02:08 -07:00
Sarah Jamie Lewis	681b5aa42b	Increase borders on White Knott svg	2021-07-14 11:04:19 -07:00
Dan Ballard	166c1ca726	Merge pull request 'Formatting + Better Align Password Context on Small Screens' (#114) from bugfix into trunk ... Reviewed-on: #114	2021-07-14 10:46:29 -07:00
Sarah Jamie Lewis	6dd2ecb199	Formatting + Better Align Password Context on Small Screens	2021-07-14 10:29:46 -07:00
Dan Ballard	86357be367	Merge pull request 'Use ProfileInfoState instead of ContactListState in MessageRow Test' (#113) from bugfix into trunk ... Reviewed-on: #113	2021-07-14 09:35:01 -07:00
Sarah Jamie Lewis	4628b87c51	Use ProfileInfoState instead of ContactListState in MessageRow Test	2021-07-13 21:09:35 -07:00
Sarah Jamie Lewis	0688b37b26	Merge pull request 'make version text selectable; add profile password warning text; shorten buildver git hash' (#112) from copyVerPassWarn into trunk ... Reviewed-on: #112 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>	2021-07-13 21:02:33 -07:00
Sarah Jamie Lewis	e7c05343d6	Merge branch 'trunk' into copyVerPassWarn	2021-07-13 21:02:21 -07:00
Dan Ballard	17e15e5ae6	Merge pull request 'Fix exceptions when quoting with quotes + fix size of message row without toolbar' (#111) from bugfix into trunk ... Reviewed-on: #111 Reviewed-by: Dan Ballard <dan@openprivacy.ca>	2021-07-13 18:38:04 -07:00
Dan Ballard	2dd6886f22	upgrade windows tor to 0.4.6.5 (old version deleted from tor servers)	2021-07-13 18:35:46 -07:00
Dan Ballard	04d8abe4e1	make version text selectable; add profile password warning text; shorten buildver git hash	2021-07-13 18:16:55 -07:00
Sarah Jamie Lewis	70c5325351	Fix exceptions when quoting with quotes + fix size of message row without toolbar	2021-07-13 14:50:27 -07:00
Sarah Jamie Lewis	7b397ecfe2	Merge pull request 'disable message text entry and send button when contact offline' (#107) from noSendOffline into trunk ... Reviewed-on: #107 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>	2021-07-12 15:06:03 -07:00
Sarah Jamie Lewis	3b6638ce8a	Merge branch 'trunk' into noSendOffline	2021-07-12 14:52:51 -07:00
Sarah Jamie Lewis	6ea793875f	Merge pull request 'model contact uses authorization now; add tooltips to contact pics in chat; dual action: add or goto' (#105) from authTooltip into trunk ... Reviewed-on: #105 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>	2021-07-12 14:52:44 -07:00
Sarah Jamie Lewis	80f9ed6a6c	Merge branch 'trunk' into authTooltip	2021-07-12 14:44:07 -07:00