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
..
_ticket.html.haml	Show reg status for tickets.	2020-01-08 00:07:25 -08:00
index.html.haml	Merge branch 'master' into admin-ticketing	2020-02-06 01:37:38 -08:00