* 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
...
Raisl 5.1 removes support for non-keyword arguments in `#process`,
`#get`, `#post`, `#patch`, `#put`, `#delete`, and `#head` for the
`ActionDispatch::IntegrationTest` and `ActionController::TestCase`
classes. This means we have to add `params` everywhere in the controller
tests.
* Clean up legacy charting imports
* Update existing donut and line charts
* Create helpers for parsing out existing chart data
* Move chart partials to a more common path
* Survey period constraints
* Add abilities
* Enforce required questions
* Update survey_submssion updated_at
* Do a full match of possible answer and user reply
closes#1658
added test for openid
fixed robocup offences
written tests for email presence validation
minor changes
shifted omniauth callback tests to rspec controllers
fixed linting bug
minor changes
minor changes
When viewing a conference, the Instance Name in the header points to
/organizations. On the organizations index, there's a button to see
conferences, but it does nothing. This makes it easy for public users to
get lost.
This commit:
* Adds a function to the organizations controller to show child
conferences
* Adds a public permission to see conferences through an organization
* Represents a subset of conferences, reusing conferences/index view,
for the organization
Add roles as nested routes to track (for the track organizer role)
Allow transition from to_accept to to_reject and backwards
Split Track#valid_dates validation to many independent ones
Show all the confirmed tracks in the conference's splashpage
Add comment in admin/Tracks#toggle_cfp_inclusion
Rewrite admin/TracksController#accept spec
Add feature spec for track requests
Change 'In' to 'Room' in Tracks#index
Rewrite Track#overlapping
Refactor code in ProposalsController
Fix typos
Use load_and_authorize_resource in versions controlller
Add conference specifc route to revision history page
Users with role can view revision_history only for the versions they have access to
Handle versions where conference_id is not set (records before papertrail was introduced)
