Commit Graph

166 Commits

Author SHA1 Message Date
Dan Ballard 0fc8fc342b Merge branch 'ebf201902221553' of cwtch.im/ui into master 2019-02-23 00:48:24 +00:00
erinn 644961d218 show contact name on new incoming group messages 2019-02-22 16:21:19 -08:00
Sarah Jamie Lewis d95760cdca Merge branch 'ebf201902221553' of cwtch.im/ui into master 2019-02-22 23:55:57 +00:00
erinn 6c57967d2f fix pastebox weirdness 2019-02-22 15:53:58 -08:00
Dan Ballard 9d9baa3fe2 drone: paths... 2019-02-22 13:49:59 -08:00
erinn 5c496e5d34 Merge branch 'winREADME2' of dan/ui into master 2019-02-22 21:19:16 +00:00
Dan Ballard 8879b1f855 updating windows instructions 2019-02-22 11:54:48 -08:00
Dan Ballard 74ab5f7179 alter env syntax, move expansion to commands 2019-02-21 16:59:07 -08:00
Dan Ballard 6d391b54d8 update PATH incase 2019-02-21 16:52:28 -08:00
Dan Ballard abceacd04b try increaseing mem limit 2019-02-21 16:25:59 -08:00
Dan Ballard 33cc253295 update GOPATHS 2019-02-21 15:18:07 -08:00
Dan Ballard ed10614759 testing drone paths 2019-02-21 11:52:43 -08:00
Dan Ballard 10df0d258f drone not overwrite therecipe's src 2019-02-20 13:54:50 -08:00
erinn 44067b20a0 Merge branch 'alpha-updates' of cwtch.im/ui into master 2019-02-20 21:49:40 +00:00
Sarah Jamie Lewis 4e3ca4853c Surfacing Group Send Errors in UI 2019-02-20 13:45:42 -08:00
Dan Ballard 2474e75ae6 drone fix env syntax 2019-02-20 13:42:37 -08:00
Dan Ballard 939e58b0e9 drone set qt env 2019-02-20 13:39:54 -08:00
Dan Ballard b11c96c2f4 drone one linux build step 2019-02-20 13:02:07 -08:00
Dan Ballard f368a27f2e dronetherecipe/qt get git 2019-02-20 12:59:37 -08:00
Dan Ballard 3c6350944c Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui 2019-02-20 12:51:46 -08:00
Dan Ballard 1cd86ba84e drone use therecipe path for gopath 2019-02-20 12:51:32 -08:00
erinn 81102a5ba9 Merge branch 'alpha-updates' of cwtch.im/ui into master 2019-02-20 20:41:50 +00:00
Dan Ballard 5ca3c88313 drone/therecipe/qt now with proper tags 2019-02-20 12:41:06 -08:00
Dan Ballard 5e3b4725fe drone build test 1 2019-02-20 12:36:16 -08:00
Sarah Jamie Lewis 6e50004402 Add Status Indicators for Group Messages 2019-02-20 12:07:12 -08:00
erinn 091fb1f296 Merge branch 'androiddir' of dan/ui into master 2019-02-19 21:35:50 +00:00
Dan Ballard 0653430164 use full path for android to cwtch dir 2019-02-19 13:32:52 -08:00
Dan Ballard d9623c6b3f Merge branch 'alpha-updates' of cwtch.im/ui into master 2019-02-19 20:21:02 +00:00
Sarah Jamie Lewis 1483492f61 Removing online indicator from chat window 2019-02-19 11:56:23 -08:00
Sarah Jamie Lewis 3a25e79916 Update 'README.md' 2019-02-15 00:39:01 +00:00
Sarah Jamie Lewis 4ee2afe009 Merge branch 'winreadme' of dan/ui into master 2019-02-15 00:38:33 +00:00
Dan Ballard 2de5142680 update readme with windows build instructions 2019-02-14 16:30:48 -08:00
Dan Ballard 4be9a49f7c Merge branch 'alpha-bug' of cwtch.im/ui into master 2019-02-14 19:35:41 +00:00
Sarah Jamie Lewis 611506633c Automatically Peer with Contacts 2019-02-14 11:30:31 -08:00
Sarah Jamie Lewis 469a36b1f6 Merge branch 'cwthdir' of dan/ui into master 2019-02-14 19:20:39 +00:00
Dan Ballard b3b7fb820e initialize cwtch dir before ACN tries to use 2019-02-14 11:17:48 -08:00
Sarah Jamie Lewis c6eb2189b0 Merge branch 'usebundledtor' of dan/ui into master 2019-02-14 19:03:44 +00:00
Dan Ballard 8ade3dcd72 use bundled tor code for desktop, updated bundled tor to 0.3.5.7. update android readme 2019-02-14 10:57:44 -08:00
Sarah Jamie Lewis 24de8c1c93 Merge branch 'alpha-bug' of cwtch.im/ui into master
(Shippped by Erinn - eyeball review)
2019-02-14 17:56:56 +00:00
Sarah Jamie Lewis 6cd19e4aa8 Unknown Peers now Appear in Contact List 2019-02-14 09:54:44 -08:00
Sarah Jamie Lewis 2332d8e437 Add 'LICENSE' 2019-02-14 07:08:02 +00:00
Sarah Jamie Lewis f14dac7dd6 Delete uneeded icons 2019-02-13 23:03:07 -08:00
Sarah Jamie Lewis 7b776bde57 Merge branch 'ebf201902131852' of cwtch.im/ui into master 2019-02-14 02:58:12 +00:00
erinn 21a905eb3b Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into ebf201902131852 2019-02-13 18:53:52 -08:00
erinn 454244934a merge 2019-02-13 18:53:36 -08:00
erinn 79b4713959 Merge branch 'textfix' of cwtch.im/ui into master 2019-02-14 02:49:20 +00:00
Sarah Jamie Lewis 25083878ab Accept/Reject Invitations and Remove Game 2 2019-02-13 18:42:13 -08:00
Sarah Jamie Lewis 0568c9744a Update 'README.md' 2019-02-13 20:40:50 +00:00
Sarah Jamie Lewis c8605a952d Update 'README.md' 2019-02-13 20:39:32 +00:00
Sarah Jamie Lewis 6c7926dbcf Update 'README.md' 2019-02-13 20:38:29 +00:00