mvaneerde
/
cwtch-ui
forked from cwtch.im/cwtch-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge changes from the main fork #1

Merged
mvaneerde merged 15 commits from cwtch.im/cwtch-ui:trunk into trunk 2021-08-27 03:07:13 +00:00
Conversation 0 Commits 15 Files Changed 10 +237 -149

15 Commits

Author SHA1 Message Date
erinn 397971a181 Merge pull request 'Block Unknown Connections Indicator' (#154) from blockunknown into trunk 
Reviewed-on: cwtch.im/cwtch-ui#154
Reviewed-by: erinn <erinn@openprivacy.ca>
 2021-08-26 21:58:49 +00: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
Sarah Jamie Lewis a06815fa08 Merge pull request 'l10n updates' (#153) from l10nupdates into trunk 
Reviewed-on: cwtch.im/cwtch-ui#153
 2021-08-26 21:51:25 +00:00
erinn 62a9402357 l10n updates 2021-08-26 14:48:14 -07:00
Sarah Jamie Lewis 67ed282394 Merge pull request 'clean up compose bar' (#152) from erinn45 into trunk 
Reviewed-on: cwtch.im/cwtch-ui#152
Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>
 2021-08-26 21:22:52 +00: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
erinn 004e211d0b Merge pull request 'Add Physics to Message Row. Fixes: #132' (#151) from animate into trunk 
Reviewed-on: cwtch.im/cwtch-ui#151
Reviewed-by: erinn <erinn@openprivacy.ca>
 2021-08-26 21:16:50 +00:00
Sarah Jamie Lewis afe2457062 Merge branch 'trunk' into animate 2021-08-26 21:12:39 +00:00
Dan Ballard 42ed710fc9 Merge pull request 'Bandaid fix - update the Tor tarball to fetch for Windows builds to a more recent version' (#149) from mvaneerde/cwtch-ui:windows-tor-ball into trunk 
Reviewed-on: cwtch.im/cwtch-ui#149
 2021-08-26 21:12:32 +00: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
Matthew van Eerde (^_^) 7d15c41aed Pull the old version from the Cwtch archive rather than the new version from Tor directly 2021-08-26 10:41:06 -07:00
Matthew van Eerde (^_^) f09c40d7dd Bandaid fix - update the Tor tarball to fetch for Windows builds to a more recent version 2021-08-26 09:51:03 -07:00