Commit Graph

228 Commits

Author SHA1 Message Date
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
Sarah Jamie Lewis d37447f320 Fixing #118 - Adding an initial message to group setup 2018-09-21 11:07:23 -07:00
Sarah Jamie Lewis 2197134758 Implementing #117 - Profile Custom Attribute Map 2018-09-21 10:45:25 -07:00
Sarah Jamie Lewis 291f717e7e Merge branch 'server-log-rotate' of dan/cwtch into master 2018-09-21 17:07:15 +00:00
Sarah Jamie Lewis c1474cbb94 Merge branch 'rb' of dan/cwtch into master 2018-09-21 01:37:17 +00:00
Dan Ballard 68556bb4fc Adding review board info to CONTRIBUTING.md 2018-09-20 14:45:28 -07:00
Dan Ballard 4e95427f44 messageStore now uses log like rotation on files 2018-09-20 14:08:56 -07:00
Dan Ballard f217533044 Merge branch 'clifix' of cwtch.im/cwtch into master 2018-08-05 17:23:19 +00:00
Dan Ballard 298a996b7d drone notify-gogs even on failure 2018-08-05 12:05:40 -05:00
Sarah Jamie Lewis 7ae8e8d8ee Fixing #107 2018-08-05 09:01:00 -07:00
Sarah Jamie Lewis a459758070 Merge branch 'load-fix' of dan/cwtch into master 2018-08-05 03:45:12 +00:00
Dan Ballard da37046658 app add app directory path to filename to load 2018-08-04 18:34:34 -05:00
Dan Ballard 195278325b Merge branch 'clifix' of cwtch.im/cwtch into master 2018-08-04 22:09:33 +00:00
Sarah Jamie Lewis 437c12db75 Bugfixes for #99 2018-08-04 14:20:45 -07:00
Sarah Jamie Lewis 8764417b0e Merge branch 'export-group' of dan/cwtch into master 2018-08-02 16:31:18 +00:00
Dan Ballard 0f6c0edc46 app/cli export-group properly plugged into autocomplete; autocomplete doesnt seg fault when peer isn't initialized 2018-08-01 19:59:40 -05:00
Sarah Jamie Lewis 16d21f582e Merge branch 'bugfix-1' 2018-07-28 10:18:35 -07:00
Dan Ballard cded8755ca Merge branch 'bugfix' of cwtch.im/cwtch into master 2018-07-28 17:10:48 +00:00
Sarah Jamie Lewis 90ff4bcba6 Adding Fatal if cannot launch tor in app 2018-07-28 09:48:10 -07:00
Sarah Jamie Lewis 8b64ba19fd Fixing potential timing conflict 2018-07-28 09:05:38 -07:00
Sarah Jamie Lewis 96b6cf6bb8 Merge branch 'android' of dan/cwtch into master 2018-07-25 17:23:43 +00:00
Dan Ballard c289052aae Android use changes: dedup peer start code; peer and app track write directory and files, do not use supplied filenames for Save(); rework tormanager to take a path to tor binary 2018-07-24 16:51:46 -05:00
Sarah Jamie Lewis bcaa85fd5b Merge branch 'drone-gogs' of dan/cwtch into master 2018-07-08 14:30:58 +00:00
Dan Ballard 6103287542 drone: move to drone-gogs 2018-07-07 20:19:57 -05:00
Sarah Jamie Lewis 7974bf4a4d Merge branch 'peer-test-coverage' of gpestana/cwtch into master 2018-07-05 16:50:42 +00:00
gpestana bea9ac01f4 Improves test coverage of cwtch_peer.go [#53] 2018-07-04 14:11:12 -07:00
Sarah Jamie Lewis 3497dbe8e1 drone fix 2018-07-04 13:01:02 -07:00
Sarah Jamie Lewis a8dbadccf0 drone fix
g# Please enter the commit message for your changes. Lines starting
2018-07-04 12:26:14 -07:00
Dan Ballard 5c3bce50d7 drone.yml revert 2018-07-04 13:13:47 -05:00
Dan Ballard 6592b37eda drone.yml pass buildbot secret to script 2018-07-04 12:47:12 -05:00
Dan Ballard fece08e87c drone notify-gogs event fix when pull_reqyest 2018-07-04 11:40:28 -05:00
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