Commit Graph

259 Commits

Author SHA1 Message Date
AJ ONeal 021629ea68 Merge branch 'master' into commercial 2018-06-29 20:06:08 +00:00
AJ ONeal 6b6ffd4647 name more clearly 2018-06-29 20:05:59 +00:00
AJ ONeal 57f1de5f2d regression fix: pass updated jwts with grant 2018-06-29 20:05:24 +00:00
AJ ONeal bbee698322 disable auto-https triggering for now 2018-06-29 12:07:25 +00:00
AJ ONeal cc58fcb98a Merge branch 'master' into commercial 2018-06-29 12:06:47 +00:00
AJ ONeal 5b90d5ef38 correct order of operations 2018-06-29 12:06:34 +00:00
AJ ONeal 8aecbb1f56 return to former glory 2018-06-29 12:05:29 +00:00
AJ ONeal 40d54bcdad Merge branch 'master' into commercial 2018-06-29 11:02:55 +00:00
AJ ONeal a3b8cd6799 better logging 2018-06-29 11:02:44 +00:00
AJ ONeal dc67bee735 passthru authn and await authz, better logging 2018-06-29 11:02:13 +00:00
AJ ONeal 7fd28d55a1 be more specific with your feedback, please (and fix missing email addr) 2018-06-27 20:26:45 +00:00
AJ ONeal 589e4af90b merge 2018-06-23 01:09:39 +00:00
AJ ONeal 6e60fc1750 Merge branch 'master' of ssh://git.coolaj86.com:22042/coolaj86/telebit-relay.js 2018-06-23 01:08:19 +00:00
AJ ONeal 6c2f039533 add subdomain config 2018-06-23 01:08:11 +00:00
AJ ONeal cc2823a56a Merge branch 'master' into commercial 2018-06-21 20:16:57 +00:00
AJ ONeal 06cc7bbaeb v0.13.1 2018-06-21 20:16:39 +00:00
AJ ONeal 82aeffd67c bugfix tcp disconnect 2018-06-21 20:16:08 +00:00
AJ ONeal cc5cbea486 Merge branch 'master' into commercial 2018-06-21 20:03:36 +00:00
AJ ONeal 1873cdea50 v0.13.0 2018-06-21 20:03:08 +00:00
AJ ONeal 9cd489f575 Merge branch 'master' into commercial 2018-06-21 20:00:11 +00:00
AJ ONeal af63322aca minor logging cleanup 2018-06-21 20:00:02 +00:00
AJ ONeal 5d065c8bd0 mark token as claimed if a socket already exists 2018-06-21 19:59:44 +00:00
AJ ONeal a9353a9a75 resolve promise on pair 2018-06-21 19:48:04 +00:00
AJ ONeal 06b894a99d remove excess logging 2018-06-21 19:38:03 +00:00
AJ ONeal d2fde5c38c better logging 2018-06-21 19:36:21 +00:00
AJ ONeal 4db9a8d53d clear error message 2018-06-21 11:19:10 +00:00
AJ ONeal 809c14f91f check status for complete and invalid 2018-06-21 11:02:53 +00:00
AJ ONeal 79648af88c check invalid and complete statuses 2018-06-21 06:23:16 +00:00
AJ ONeal 148cda8516 handle pairing request via API 2018-06-21 06:13:05 +00:00
AJ ONeal 179256a88e mo' betta' 2018-06-20 09:02:00 +00:00
AJ ONeal 95f9ca0844 Merge branch 'master' into c-accounts 2018-06-19 23:43:50 +00:00
AJ ONeal 8be76e1eb2 major refactor (only briefly tested) 2018-06-19 23:43:28 +00:00
AJ ONeal 33a565b19a add urequest 2018-06-19 23:41:41 +00:00
AJ ONeal 114cc53dd4 WIP api token for accounts 2018-06-19 23:40:58 +00:00
AJ ONeal cb8261fd31 add index.json 2018-06-15 22:53:30 +00:00
AJ ONeal 09b1d5939e so commercial 2018-06-15 22:50:32 +00:00
AJ ONeal 2603c322bd Merge branch 'commercial' of https://git.ppl.family/ppl/commercial.telebit-relay.js into commercial 2018-06-15 09:00:21 +00:00
AJ ONeal 96631d1369 nearly works again :) 2018-06-15 09:00:16 +00:00
AJ ONeal 8a1e2f14e0 Merge branch 'master' into commercial 2018-06-15 08:47:14 +00:00
AJ ONeal 92f37a515a Merge branch 'master' of ssh://git.coolaj86.com:22042/coolaj86/telebit-relay.js 2018-06-15 08:46:55 +00:00
AJ ONeal e619018276 show meaningful errors 2018-06-15 08:46:43 +00:00
AJ ONeal 0013930dbd updates 2018-06-15 08:45:47 +00:00
AJ ONeal 72986ccdc1 Merge branch 'master' into commercial 2018-06-15 06:13:43 +00:00
AJ ONeal c8c06d1b99 use sharedDomain from config 2018-06-15 06:13:26 +00:00
AJ ONeal ff52d1e4a8 Merge branch 'commercial' of https://git.ppl.family/ppl/commercial.telebit-relay.js into commercial 2018-06-15 06:10:15 +00:00
AJ ONeal c1c7dfba02 Merge branch 'master' into commercial 2018-06-15 06:10:06 +00:00
AJ ONeal 13a9e77998 Merge branch 'master' of ssh://git.coolaj86.com:22042/coolaj86/telebit-relay.js 2018-06-15 06:09:55 +00:00
AJ ONeal f94e01917e update example config 2018-06-15 06:09:46 +00:00
AJ ONeal d6f517ed2b Merge branch 'commercial' of https://git.ppl.family/ppl/commercial.telebit-relay.js into commercial 2018-06-15 05:17:11 +00:00
AJ ONeal f8ac7baa1a Merge branch 'master' into commercial 2018-06-15 05:16:58 +00:00