osem-fcy/db
Michael Ball 6ce36c0fca Merge branch 'master' into submission-reviewer-comments
* master: (246 commits)
  merge master
  Skip datatable spec because github actions is weird.
  Add devise view files for email messages
  Make the _mailbot_* files not depend on @conference
  Tweak devise text for confirm emails
  Run database migrations on release
  [fix]Add mailbot.css to assets.rb
  [fix]Fix empty string check
  [fix]Fix program#any_event_for_this_date?
  Add newline at end of show.js.erb file
  [feat]Display happening now only if program is also displayed
  [feat]Add brief version of event partial; fix style
  [feat]Description / happening now takes the entire row if the other is empty
  [feat]Use Ajax for paginating happening_now
  [style]Fix style
  [refactor]Delete unused javascript; Move about-and-happening-now to partial
  [feat]Add bootstrap style to pagination navbar
  [fix]Fix style; Re-enable checking happening now
  items per page
  pagination
  ...
2021-04-15 22:22:52 -07:00
..
migrate Merge branch 'master' into submission-reviewer-comments 2021-04-15 22:22:52 -07:00
schema.rb merge master 2021-04-15 21:56:18 -07:00
seeds.rb Add frozen_string_literal magic comment 2018-05-09 06:54:26 -07:00