* 'master' of github.com:snap-cloud/snapcon:
Fix registrations csv
Tweak Materials to allow anything
A bit of a hack to accept any webpage...
Add the ability for Rooms to have a URL.
Add import rake task
config that works without docker
Add some links to navbar
More login info
Custom login help info
Run migration; add apple pay verification
fix tickets bug with no description
data-provide="markdown-editable" is intended for inline editing of page
content à la contenteditable. When this is applied to a textarea, the
editor is loaded only after the user clicks on the field. This behavior
breaks focus and is incompatible with keyboard navigation.
* 'master' of github.com:snap-cloud/snapcon: (22 commits)
Cleanup some Auth specs and weird haml syntax
add sentry puma hooks
fix user model spec
Tweak Tickets Text
fix missing ]
Fix specs for omniauth providers?
Update stripe mock gem
remove airbrake
Add sentry logging
Update stripe gem
Cleanup stripe stuff
Fix the docker init script
Cleanup specs
Cleanup config file, ensure providers are set if present
Fix format spec with new markdown options
Try to update spec file with image in navbar
Delint
Delint helpers
Lint: Sort gems
Update user model spec
...
* master: (61 commits)
Replace more Commercials with Materials
Rename more commericals to materials
UI -- Repalce "Commerials" with "Materials".
Re-order Conference Associations
Cleanup CSS add Snap! style block attachments
hide venue link if there is no venue link
No dropshadow
Text with drop shadow for now
Tidy up the look of lodging panels
Show reg status for tickets.
Tweak CSS, fix loding order
Move the venue description to below the map.
Update lodging styling. Add description for venu when map is shown.
CSS tweaks...
Make the edit form not so wide.
Support markdown in more fields
Cleanup CSS ordering, fix coloring for navdropdowns
dumb...fix order of link_to args
ARRRGHHH, another typo...same line...
fix typo
...
