Commit Graph

423 Commits

Author SHA1 Message Date
erinn 8cf26956e6 Merge branch 'contact-level-attributes' of cwtch.im/cwtch into storagerefactor 2018-11-01 01:46:59 +00:00
erinn 0baaba348b Merge branch 'storagerefactor' of cwtch.im/cwtch into master 2018-11-01 01:45:49 +00:00
Sarah Jamie Lewis 1531885bcd Adding Custom Attributes to Contacts, Removing ClientIdentity Processing 2018-10-31 17:19:40 -07:00
Sarah Jamie Lewis f4c45e863e Storage Refactor 2018-10-31 15:31:52 -07:00
Dan Ballard 971f780881 Merge branch 'handlers' of cwtch.im/cwtch into master 2018-10-29 19:32:02 +00:00
erinn ce7d57a1a5 fix tests 2018-10-29 12:19:30 -07:00
erinn 912894b55f support arbitrary channel type handlers in cwtch peer 2018-10-27 02:04:43 -07:00
Sarah Jamie Lewis 22c8941282 Merge branch 'safe-shutdown' of dan/cwtch into master 2018-10-24 04:03:26 +00:00
Dan Ballard d368ee1609 safe shutdown 2018-10-23 20:49:00 -07:00
erinn 6fda5d223a Merge branch 'bugfix' of cwtch.im/cwtch into master 2018-10-22 23:16:31 +00:00
erinn 9eeefae88d fix a bug preventing sending more than once over a peer data channel 2018-10-22 16:11:39 -07:00
Gareth @ BrassHornComms 011866c1bc Update README with docker instructions 2018-10-17 23:18:28 +00:00
Gareth @ BrassHornComms 24a2fcc44d Remove extraneous content from torrc 2018-10-17 23:18:28 +00:00
Gareth @ BrassHornComms 77bac24202 Removed K8S section from gitlab-ci 2018-10-17 23:18:28 +00:00
Gareth @ BrassHornComms 48fa6f386c Removed / Adjusted Brass Horn Comms specific build stuff 2018-10-17 23:18:28 +00:00
Gareth @ BrassHornComms d641c83735 Fixed linking 2018-10-17 23:18:28 +00:00
Gareth @ BrassHornComms 0ee32540f8 Remove extraneous ln -s 2018-10-17 23:18:28 +00:00
Gareth @ BrassHornComms 1001dbb3fe Closes #21
Proof of Concept for dockerising the server component including work
to integrate with kubernetes, gitlab and docker hub.
2018-10-17 23:18:28 +00:00
Sarah Jamie Lewis b58512693d Merge branch 'cwtchutil' of cwtch.im/cwtch into master 2018-10-15 16:48:44 +00:00
erinn 2df386f6f6 in which erinn learns to hate the linter 2018-10-14 18:26:46 -07:00
erinn b06c54bb36 update drone golint import 2018-10-14 18:16:37 -07:00
erinn 66459b3d37 adding some convenience functions 2018-10-14 17:59:53 -07:00
erinn d3d8cd165f Merge branch 'master' of https://git.openprivacy.ca/cwtch.im/cwtch into cwtchutil 2018-10-14 17:57:34 -07:00
Dan Ballard 1569effa5b update drone to use new buildfiles/tor location 2018-10-10 15:42:12 -07:00
erinn f271638422 reduce waituntilauthenticated delay and add one for psc 2018-10-10 14:59:38 -07:00
Sarah Jamie Lewis 51b6b9a0df Merge branch 'nit' of cwtch.im/cwtch into master 2018-10-10 05:11:08 +00:00
erinn 6b98b32156 nit: remove annoyingly long ciphertext from log 2018-10-09 19:34:58 -07:00
erinn c7f19fc677 Merge branch 'detports2' of cwtch.im/cwtch into master 2018-10-10 00:14:39 +00:00
erinn 5e580df127 same but for cwtchpeer 2018-10-09 17:12:08 -07:00
erinn 66880628a4 Merge branch 'detports2' of cwtch.im/cwtch into master 2018-10-10 00:07:36 +00:00
erinn 475fea02d2 fix setuponionv3 call for initial asaur update 2018-10-09 17:06:36 -07:00
erinn ebf846e003 Revert "update setuponionv3 call to match an update to libricochet"
This reverts commit 80339483f0.
2018-10-09 17:04:06 -07:00
erinn 80339483f0 update setuponionv3 call to match an update to libricochet 2018-10-09 17:01:18 -07:00
Sarah Jamie Lewis 007c72c43c Merge branch 'tor-status' of dan/cwtch into master 2018-10-05 23:32:18 +00:00
Dan Ballard 4544535ad5 expose tor control port bootstrap info 2018-10-05 16:27:57 -07:00
Dan Ballard e2b5e5db91 cli /list-serers print server status string 2018-10-05 15:44:05 -07:00
Dan Ballard 9a62468915 tm status work 2018-10-05 14:43:04 -07:00
Dan Ballard be290d021d Merge branch 'thefuture' of cwtch.im/cwtch into master 2018-10-05 20:49:33 +00:00
Sarah Jamie Lewis 1e04b1161e Adding V3 Onions to Cwtch! 2018-10-05 13:38:23 -07:00
Sarah Jamie Lewis 6818dd5602 Merge branch 'peerdata' of cwtch.im/cwtch into master 2018-10-05 20:12:15 +00:00
Sarah Jamie Lewis 8ab4752b44 Adding Cwtch Peer Data Channel 2018-10-04 17:03:57 -07:00
Sarah Jamie Lewis 6620875b61 Shortcut for Primary Identity 2018-10-03 22:58:02 -07:00
Dan Ballard dba22f3989 Merge branch 'export-fix' of cwtch.im/cwtch into master 2018-10-03 18:09:34 +00:00
Sarah Jamie Lewis b8a3904c37 Minor fix to export 2018-10-02 22:46:00 -07:00
Sarah Jamie Lewis 85885f183b Merge branch 'bugfix' of dan/cwtch into master 2018-09-28 20:50:32 +00:00
Dan Ballard a5ad2a6644 removing panics and reorder invite-to-group args 2018-09-26 19:00:40 -07:00
Sarah Jamie Lewis aef41ed4fa Merge branch 'cli-profiles' of dan/cwtch into master 2018-09-22 16:48:34 +00:00
Dan Ballard 5f046e6d53 app suports multiple peers; cli supports multiple peers; massive cli command change (irc /style) and live follow groups 2018-09-21 16:52:39 -07:00
Dan Ballard 0351de1ff1 Merge branch 'initial_message' of cwtch.im/cwtch into master 2018-09-21 18:29:14 +00:00
Dan Ballard beb9bc559c Merge branch 'configmap' of cwtch.im/cwtch into master 2018-09-21 18:19:49 +00:00