~singpolyma/sgx-jmp

ref: 51a219e284d955657782967b2bbe3b979ff40edd sgx-jmp/lib d---------
Merge branch 'no-more-catapult'

* no-more-catapult:
  Remove catapult import code
Remove catapult import code
Allow lowercase state/province abbreviations

Seems like it won't overlap with other things we allow.
Merge branch 'whitelist'

* whitelist:
  Allow whitelisting domains
  Use FormTemplate for activation form
Allow whitelisting domains

Some domains credit new users to the admin, some to no one.  We still have to
show a form to get them to pick a plan, but otherwise skip most of the process,
activate them with 1 month and go to Finish.
Use FormTemplate for activation form
No low balance if not registered

If cancelled or expired or not-yet-registered, don't auto top up or notify about
low balance.
Make tel present or not more machine readable
Merge branch 'ban-bad-tel-fwd'

* ban-bad-tel-fwd:
  Don't allow bad tel format
Merge branch 'rack-trampoline'

* rack-trampoline:
  Wrap rack requests in an EMPromise fiber trampoline, and not just a Fiber
Wrap rack requests in an EMPromise fiber trampoline, and not just a Fiber
Merge branch 'more-tel-selection-coverage'

* more-tel-selection-coverage:
  Patch bandwidth-iris to raise useful exceptions
  More city maps
Patch bandwidth-iris to raise useful exceptions
NotLoaded should not use default to_s, etc
Actually, we want that nil

Without it, the item ends up being NotLoaded, which is wrong.
Show CNAM in customer info
Better CNAM fail error message
Don't allow bad tel format

Otherwise people can specify things that won't (or shouldn't) work.
Next