 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 |
|
erinn
|
5bdfc856a0
|
Merge branch 'textfix' of cwtch.im/ui into master
|
2019-02-13 20:18:23 +00:00 |
|
Sarah Jamie Lewis
|
1a800a44bc
|
Deleting Contacts, Alerting, Click to Talk
|
2019-02-13 00:09:04 -08:00 |
|
Sarah Jamie Lewis
|
1c614a9e66
|
Fixing HTML in ComboBox
|
2019-02-12 21:08:43 -08:00 |
|
erinn
|
c7b7912ef6
|
Merge branch 'textfix' of cwtch.im/ui into master
|
2019-02-13 04:38:42 +00:00 |
|
Sarah Jamie Lewis
|
71f87c5f70
|
Clear text box
|
2019-02-12 20:35:23 -08:00 |
|
erinn
|
1cdc858d00
|
Merge branch 'textfix' of cwtch.im/ui into master
|
2019-02-13 04:28:49 +00:00 |
|
Sarah Jamie Lewis
|
eaa68d1221
|
Removing skip one update log
|
2019-02-12 20:27:04 -08:00 |
|
erinn
|
c11450e6d8
|
Merge branch 'textfix' of cwtch.im/ui into master
|
2019-02-13 04:26:35 +00:00 |
|
Sarah Jamie Lewis
|
98b83cf51a
|
Fixing back buttons
|
2019-02-12 20:25:20 -08:00 |
|
erinn
|
68572a8cc0
|
Merge branch 'textfix' of cwtch.im/ui into master
|
2019-02-13 04:23:50 +00:00 |
|
Sarah Jamie Lewis
|
da41f0c515
|
Cleanup
|
2019-02-12 20:10:46 -08:00 |
|
erinn
|
01a473175b
|
Merge branch 'textfix' of cwtch.im/ui into master
|
2019-02-13 03:13:48 +00:00 |
|
Sarah Jamie Lewis
|
17f49370bf
|
Delete all the things
|
2019-02-12 19:08:23 -08:00 |
|
erinn
|
b4dc118198
|
Merge branch 'textfix' of cwtch.im/ui into master
|
2019-02-13 02:49:26 +00:00 |
|
Sarah Jamie Lewis
|
73aef09e93
|
Update default server
|
2019-02-12 16:23:35 -08:00 |
|
erinn
|
79fdc94598
|
Merge branch 'textfix' of cwtch.im/ui into master
|
2019-02-13 00:16:43 +00:00 |
|
Sarah Jamie Lewis
|
788a623b01
|
Window
|
2019-02-12 16:07:03 -08:00 |
|
Sarah Jamie Lewis
|
cbdd329161
|
Merge branch 'ebf201902051208' of cwtch.im/ui into master
|
2019-02-12 23:20:42 +00:00 |
|
erinn
|
ecb182197b
|
layout improvements
|
2019-02-12 14:47:23 -08:00 |
|
erinn
|
e86686f2f7
|
Merge branch 'textfix' of cwtch.im/ui into master
|
2019-02-12 21:24:14 +00:00 |
|
Sarah Jamie Lewis
|
014520c26f
|
Art
|
2019-02-12 13:22:14 -08:00 |
|
erinn
|
b9211272dd
|
Merge branch 'textfix' of cwtch.im/ui into master
|
2019-02-11 23:26:18 +00:00 |
|
Sarah Jamie Lewis
|
7b6d6c7ada
|
TODO List
|
2019-02-11 15:23:17 -08:00 |