osem-fcy/app
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
..
assets Merge branch 'master' into master 2021-04-15 20:29:54 -07:00
controllers Merge branch 'master' into 177717903-move-constants-to-configuration-file 2021-04-13 12:06:59 +08:00
datatables HACK! Show confirmed status in the all users export 2021-03-08 19:24:34 -08:00
helpers [feat]Config read from environment variables 2021-04-13 11:03:37 +08:00
jobs Move Mailbluster business logic to services/ instead of helpers/ 2021-04-07 14:50:28 -07:00
mailers [feat]Config read from environment variables 2021-04-13 11:03:37 +08:00
models merge master 2021-04-15 21:56:18 -07:00
pdfs Using new accessor for city, country_name, venue name & street 2021-03-06 19:06:36 +01:00
serializers merge master 2021-04-15 21:56:18 -07:00
services Get destroy job working properly and prevent misfires on updated users 2021-04-09 10:55:46 -07:00
uploaders Merge OSEM updates 2021-03-08 02:50:27 -08:00
views Merge branch 'master' into submission-reviewer-comments 2021-04-15 22:22:52 -07:00