Michael Ball 4306fbe636 Merge branch 'master' into admin-ticketing ... * 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 ...		2020-02-06 01:37:38 -08:00
..
environments	Disable X-Sendfile default	2019-03-22 11:29:25 +01:00
initializers	Do not need to specify callback url	2019-12-20 12:45:31 -08:00
locales	add booth in alias	2019-08-10 21:40:25 +05:30
application.rb	Set application timezone in ENV	2018-09-25 22:13:22 +02:00
boot.rb	Upgrade to Rails 5	2017-12-11 20:58:04 +02:00
cable.yml	Use environment variable for the redis url in cable.yml	2017-12-11 20:58:04 +02:00
cloudinary.yml.example	Add cloudinary gem, fix some Gemfile comments	2016-04-27 11:48:12 +02:00
database.yml	Put database.yml into the code base	2018-09-20 11:33:57 -07:00
deploy.rb	Add the files we use for production deployments	2019-02-16 00:40:47 +01:00
environment.rb	Mention the data:migrate:config2dotenv during boot	2016-04-29 17:07:50 +02:00
piwik.yml	Configure MATOMO from the environment	2018-09-24 10:59:42 -07:00
puma.rb	Change how we start puma	2019-05-04 21:36:34 +02:00
routes.rb	Merge master	2020-02-06 01:20:11 -08:00
schedule.rb	[Bugfix] Confirmed / Unconfirmed events over time for conference dashboard	2014-07-18 15:22:15 +02:00
secrets.yml.example	spec/feature: add stripe integration tests	2016-08-16 00:46:11 +05:30
spring.rb	Upgrade to Rails 5	2017-12-11 20:58:04 +02:00