Commit Graph

461 Commits

Author SHA1 Message Date
Sarah Jamie Lewis 55c5343b2b Merge branch 'tor-retry' of dan/cwtch into master 2018-11-26 22:15:43 +00:00
Sarah Jamie Lewis 1b8700c677 Merge branch 'movelisten' of cwtch.im/cwtch into master 2018-11-26 22:00:40 +00:00
erinn 30d37da4e9 app/app.go 2018-11-26 13:51:48 -08:00
Dan Ballard 563597907c server should retry on tor loss 2018-11-26 13:47:03 -08:00
erinn e3eddb0d93 Merge branch 'merging' of cwtch.im/cwtch into master 2018-11-24 01:44:44 +00:00
erinn 9734540aca merging 2018-11-23 17:30:18 -08:00
Sarah Jamie Lewis b418eab92f Merge branch 'acn2' of dan/cwtch into master 2018-11-23 03:17:50 +00:00
Sarah Jamie Lewis 319c724c05 Merge branch 'test-channels' of dan/cwtch into master 2018-11-22 23:59:04 +00:00
Dan Ballard 6f6fa90946 add channels to tests using Listen in a thread to sync; add some cleanup to other tests; fix a potential NPE 2018-11-22 14:29:05 -08:00
Dan Ballard 8a0d9c54fd local var rename 2018-11-22 13:47:35 -08:00
Sarah Jamie Lewis 9421e471f6 Merge branch 'metrics-revert' of dan/cwtch into master 2018-11-22 18:54:10 +00:00
Dan Ballard 4814e0b409 undo use of personal fork, pr got merged 2018-11-22 10:08:21 -08:00
Sarah Jamie Lewis 60fb12054a Merge branch 'bigmerge' of cwtch.im/cwtch into master 2018-11-22 01:05:23 +00:00
erinn ddbf96e668 little fixes 2018-11-21 16:56:08 -08:00
erinn 12206ce23c Merge branch 'master' of https://git.openprivacy.ca/cwtch.im/cwtch 2018-11-21 16:44:19 -08:00
erinn d06b68d001 Merge branch 'acn' of dan/cwtch into master 2018-11-22 00:26:26 +00:00
erinn 7ae9954c7d Merge branch 'p2ptimeline' of cwtch.im/cwtch into master 2018-11-22 00:25:32 +00:00
erinn 3b932bedc0 little fixes 2018-11-21 16:08:47 -08:00
Dan Ballard b5992d9f85 drone only email on fail 2018-11-21 15:54:03 -08:00
Dan Ballard ff54059111 update name 2018-11-21 15:10:02 -08:00
Dan Ballard b087d3667e Merge branch 'servercheck' of cwtch.im/cwtch into p2ptimeline 2018-11-21 22:39:47 +00:00
Sarah Jamie Lewis dc489398ea Checking if a group is setup on a v3 onion server 2018-11-21 14:29:38 -08:00
Sarah Jamie Lewis fd70341dff Merge branch 'pidusage' of dan/cwtch into master 2018-11-21 22:21:51 +00:00
Dan Ballard 655afb1aa0 migrate to personal fork of struCoder/pidusage with threadsafe patch applied 2018-11-21 13:59:27 -08:00
Sarah Jamie Lewis 8083e6fa5c Adding Method to Save Messages in p2p Transcript 2018-11-21 13:31:22 -08:00
Sarah Jamie Lewis 8ca6589de0 Merge branch 'bine' of dan/cwtch into master 2018-11-21 04:07:38 +00:00
Dan Ballard 85a2c44891 Following libricochetgo's migration to bine and a generic Mixnet
interface.
2018-11-20 12:51:37 -08:00
Dan Ballard 07ffd780b0 Merge branch 'master' of git.openprivacy.ca:cwtch.im/cwtch 2018-11-02 17:17:26 -07:00
Dan Ballard 09fdb05168 make docker-entrypoint actually pass env var -_-;; and update README about docker 2018-11-02 17:17:16 -07:00
erinn 6cce18120d Merge branch 'group-attributes' of cwtch.im/cwtch into master 2018-11-03 00:04:18 +00:00
Sarah Jamie Lewis ae84893d78 Adding Attributes to Groups 2018-11-02 16:45:12 -07:00
Dan Ballard b145420f21 Merge branch 'master' of git.openprivacy.ca:cwtch.im/cwtch 2018-11-02 14:01:04 -07:00
erinn 3b9058c4ed Merge branch 'docker2' of dan/cwtch into master 2018-11-02 20:54:25 +00:00
Dan Ballard 9be69bda99 all server files now go in configDir, cwtch docker entrypoint sets it by default to where it's expected 2018-11-01 15:42:10 -07:00
Dan Ballard 78fe3ca96e all server files now go in configDir, cwtch docker entrypoint sets it by default to where it's expected 2018-11-01 13:22:29 -07:00
Dan Ballard bcc94c46e7 Merge branch 'docker-volume-config-dir' of GBHC/cwtch into master
+ go list ./... | xargs go vet
# cwtch.im/cwtch/server
server/serverConfig.go:34: Println call has possible formatting directive %s
2018-11-01 17:39:03 +00:00
Gareth @ BrassHornComms 04b2191238 Changes to resolve ticket #152 2018-11-01 17:32:26 +00:00
Sarah Jamie Lewis a94ed9eaff Merge branch 'storagerefactor' of cwtch.im/cwtch into master 2018-11-01 01:47:49 +00:00
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