306 Commits

All Branches

Search

Author	SHA1	Message	Date
Dan Ballard	1d024ac63e	fix mac run instructions and make clear when running debug or release builds	2021-11-16 15:08:09 -08:00
Dan Ballard	b34ffcd211	update README with windows run in place instructions	2021-11-16 15:03:18 -08:00
erinn	6a5309427f	Merge pull request 'scrolling fixes' (#244) from scrollfixes into trunk ... Reviewed-on: #244 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>	2021-11-11 00:20:01 +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
Dan Ballard	e01cea3238	Merge pull request 'Russian Localization' (#242) from russian into trunk ... Reviewed-on: #242	2021-11-10 18:09:28 +00:00
Sarah Jamie Lewis	d0770b4bd8	Russian Localization	2021-11-10 09:58:46 -08:00
Sarah Jamie Lewis	07b97fdb02	Merge pull request 'libcwtch version bump (fix windows servers crash)' (#241) from lcgVBump into trunk ... Reviewed-on: #241	2021-11-09 23:50:02 +00:00
Dan Ballard	ff28f37471	libcwtch version bump (fix windows servers crash)	2021-11-09 15:36:46 -08:00
Sarah Jamie Lewis	edfc070d9a	Merge pull request 'libcwtch go bump and server fixes' (#234) from macServerFix into trunk ... Reviewed-on: #234	2021-11-06 00:36:45 +00:00
Dan Ballard	d3da68272b	libcwtch go bump (fix join on add serverer); swap deploy folder name parts date/ver	2021-11-05 17:23: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
Sarah Jamie Lewis	10584984c3	Merge pull request 'Upgrade libCwtch to v1.4.0' (#233) from 1.4.0-release into trunk ... Reviewed-on: #233	2021-11-05 17:07:03 +00:00
Sarah Jamie Lewis	0d4c67923d	Upgrade libCwtch to v1.4.0	2021-11-04 22:34:06 -07:00
Dan Ballard	e9044daab3	Merge pull request 'macos drone build' (#232) from macosBuild into trunk ... Reviewed-on: #232 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>	2021-11-05 04:57:28 +00:00
Dan Ballard	659b8d5bf1	macos drone build	2021-11-04 20:27:03 -07:00
Sarah Jamie Lewis	0dc4849a5d	Merge pull request 'download resumption, hash verification' (#231) from filefix2 into trunk ... Reviewed-on: #231	2021-11-05 00:08:56 +00: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
Sarah Jamie Lewis	f7f2ca6621	Merge pull request 'l10n updates for file resumption' (#230) from l10nup into trunk ... Reviewed-on: #230 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>	2021-11-04 22:07:48 +00:00
erinn	6331a6da95	l10n updates for file resumption	2021-11-04 15:02:26 -07:00
Dan Ballard	9fe7ee4b56	Merge pull request 'server delete functionality and minor cleanups' (#229) from serverDelete into trunk ... Reviewed-on: #229 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>	2021-11-04 18:49:31 +00: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	07b00ee1d0	Merge pull request 'lcgVBump and restrict mobile on servers' (#228) from lcgVBump into trunk ... Reviewed-on: #228 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>	2021-11-03 20:17:29 +00: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	3ac8c32afe	libcwtch bump	2021-11-03 12:44:09 -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	a9bcf13c1f	Merge pull request 'Servers experiment and manager' (#214) from server into trunk ... Reviewed-on: #214 Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>	2021-11-02 22:26:09 +00:00
Dan Ballard	82294eb6af	proper tooltips	2021-11-02 15:19:16 -07:00
Dan Ballard	60a4775f4d	libcwtch bump	2021-11-02 15:13:12 -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
erinn	2b8f8e825f	Merge pull request 'Rely on Index from NewGroupMessage to sync Timelines' (#225) from group_message_fixes into trunk ... Reviewed-on: #225 Reviewed-by: erinn <erinn@openprivacy.ca>	2021-11-01 23:03:51 +00: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