Commit grafiek

143 Commits

Auteur SHA1 Bericht Datum
Sarah Jamie Lewis e5bce02c7c Merge branch 'buildbot' of dan/cwtch into master 2018-07-02 17:25:08 +00:00
Dan Ballard 57f9d68747 drone notify gogs via buildbot 2018-07-02 12:17:21 -05:00
Dan Ballard 5a64ae8e27 drone use drone@openprivacy.ca email 2018-07-02 10:36:05 -05:00
Sarah Jamie Lewis 014c09fa0d Merge branch 'drone' of dan/cwtch into master 2018-07-02 15:25:06 +00:00
Dan Ballard 0c0760f6f0 getting tor support into drone and running integ test 2018-07-02 08:08:43 -05:00
Sarah Jamie Lewis f1405680f6 Testing Gogs API 2018-07-02 08:06:57 -05:00
Sarah Jamie Lewis 7cf6bbcecc Merge branch 'tor' of cwtch.im/cwtch into master 2018-07-02 03:26:24 +00:00
Sarah Jamie Lewis f435de4b71 Testing Tor Manager + Some bug fixes 2018-07-01 20:23:30 -07:00
Sarah Jamie Lewis 44384d1cec Merge branch 'tor' of cwtch.im/cwtch into master 2018-07-01 18:18:09 +00:00
Sarah Jamie Lewis 078cca7a3c Merge branch 'drone' of cwtch.im/cwtch into master 2018-06-30 05:53:33 +00:00
Sarah Jamie Lewis 0d7f51dd86 Removing notify for now to commit valid drone step 2018-06-30 05:53:22 +00:00
Dan Ballard 8bd9da974d drone build configuration 2018-06-29 23:51:51 -05:00
Sarah Jamie Lewis 2ba0b349e6 Merge branch 'contributing' of dan/cwtch into master 2018-06-29 22:22:31 +00:00
Dan Ballard aaeb81521d CONTRIBUTING.md 2018-06-29 17:18:19 -05:00
Dan Ballard 05221de72b Merge branch 'formatting' of cwtch.im/cwtch into tor 2018-06-29 21:34:15 +00:00
Sarah Jamie Lewis 2981cb4dac Formatting & Adding to Quality 2018-06-29 12:20:07 -07:00
Sarah Jamie Lewis 8d2a1aaf32 Merge branch 'metrics-total' of dan/cwtch into master 2018-06-29 19:15:16 +00:00
Dan Ballard f416a3756e ability for metrics to total or average; monitorHistory test will have to be integ test; uptime instead of starttime 2018-06-29 14:13:20 -05:00
Sarah Jamie Lewis b4c1ac37c4 Adding Tor autostart 2018-06-29 12:11:40 -07:00
Sarah Jamie Lewis bdd8f9a5fd Merge branch 'metrics-clean' of dan/cwtch into master 2018-06-28 17:33:27 +00:00
Dan Ballard addd5a7b00 remove config sample; now generate config and populate defaults; add config to control logging 2018-06-28 10:28:39 -07:00
Sarah Jamie Lewis d68e4bc48d Merge branch 'cli-error-empty-new-group' of dan/cwtch into master 2018-06-28 16:20:10 +00:00
Dan Ballard d1035fd925 disallow cli creating new group for empty server 2018-06-28 09:15:21 -07:00
Sarah Jamie Lewis 8a1fb3ccc2 Merge branch 'fix-lint' of dan/cwtch into master 2018-06-27 16:53:02 +00:00
Sarah Jamie Lewis 9ab582750f Merge branch 'server-metics-fix' of dan/cwtch into master 2018-06-27 16:46:00 +00:00
Dan Ballard b70fdf1af2 fix server metrics, wiring in it, server now generates a metrics file
while running
2018-06-27 09:42:30 -07:00
Dan Ballard f16cd86e20 fixing linting errors 2018-06-27 09:19:38 -07:00
Angus Champion de Crespigny 21817f936d modified: ../../peer/cwtch_peer.go
Corrected documentation
Changed 'password' to 'key' where appropriate
Reloaded the salt into the LoadCwtchPeer function
2018-06-27 01:15:03 +00:00
Angus Champion de Crespigny 2b039b2e9f Changed capitalization of cwtchPeer (again) and updated LoadCwtchPeer to use the interface 2018-06-27 01:15:03 +00:00
Angus Champion de Crespigny 67adc0fbce Updated capitalization of cwtchPeer in comments 2018-06-27 01:15:03 +00:00
Angus Champion de Crespigny 8e55a77173 Cwtch_peer.go
Added missing imports and corrected NewCwtchPeer to implement the CwtchPeerInterface
Corrected formatting

Main.go
Corrected formatting

App.go
Included missing arguments

Cwtch_peer_test.go
Included password arguments into tests

Cwtch_peer_server_intergration_test.go
Included password arguments into tests
2018-06-27 01:15:03 +00:00
Angus Champion de Crespigny 966642c957 Modified: app/cli/main.go
Updated queries

Modified:   peer/cwtch_peer.go

Changed capitalization
2018-06-27 01:15:03 +00:00
Angus Champion de Crespigny 13b5d17214 On branch profile-password
Changes to be committed:
modified:   app/app.go

Added password parameters to app.go functions

modified:   app/cli/main.go

Added password prompts to collect the password from user input
Modified Load and New conditions

modified:   peer/cwtch_peer.go
Created CreateKey, DecryptProfile, and EncryptProfile functions
Implemented these functions in the functions
CwtchNewProfile
CwtchLoadProfile
Save
2018-06-27 01:15:03 +00:00
Sarah Jamie Lewis 3215478757 Revert "adding Monitors; fixing metricsHistory rotation logic; wiring in Monitors; cleanup"
This reverts commit bacf733f52.
2018-06-26 11:24:50 -07:00
Sarah Jamie Lewis e2538e8891 Revert "metrics reporting to a file"
This reverts commit 73f8c98403.
2018-06-26 11:24:16 -07:00
Sarah Jamie Lewis 5daf14e868 Update README 2018-06-26 11:14:45 -07:00
Sarah Jamie Lewis e0396c6c8e Merge branch 'server-metrics' of dan/cwtch into master 2018-06-26 04:49:26 +00:00
Sarah Jamie Lewis ba196ecd0e Fixing err return bug 2018-06-25 21:47:21 -07:00
Dan Ballard 73f8c98403 metrics reporting to a file 2018-06-25 15:21:26 -07:00
Sarah Jamie Lewis ea2e7caf5c Merge branch 'server-metrics' of dan/cwtch into master 2018-06-23 18:00:14 +00:00
Dan Ballard bacf733f52 adding Monitors; fixing metricsHistory rotation logic; wiring in Monitors; cleanup 2018-06-23 10:54:33 -07:00
Dan Ballard 5e28c8d4b2 Merge branch 'signature' of cwtch.im/cwtch into master 2018-06-23 17:52:35 +00:00
Sarah Jamie Lewis 22aebae0e5 Actually implementing correct signature construction 2018-06-23 09:23:39 -07:00
Sarah Jamie Lewis 1ea1521fee Merge branch 'libricochet' of dan/cwtch into master 2018-06-23 16:18:38 +00:00
Dan Ballard cf80207f77 rename go-ricochet to libricochet-go 2018-06-23 09:15:36 -07:00
Sarah Jamie Lewis b4d984cf20 Merge branch 'server-metrics' of dan/cwtch into master 2018-06-21 19:27:07 +00:00
Dan Ballard 63128bae40 adding simple metrics package to server 2018-06-21 12:20:27 -07:00
Dan Ballard ee0936daaa Merge branch 'tor-manager' of cwtch.im/cwtch into master 2018-06-20 19:10:59 +00:00
Sarah Jamie Lewis 19bfd64ea8 First cut at TorManager (just does connectivity test) 2018-06-20 11:47:30 -07:00
Dan Ballard 6ce172524d Merge branch 'interface' of cwtch.im/cwtch into master 2018-06-20 05:53:56 +00:00