gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into submission-reviewer-comments

Browse source 
* 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
  ...
This commit is contained in:
Michael Ball 2021-04-15 22:22:52 -07:00
commit 6ce36c0fca
60 changed files with 878 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

5
db/migrate/20210401050437_add_include_happening_now_to_splashpages.rb Normal file
View file

@ -0,0 +1,5 @@
class AddIncludeHappeningNowToSplashpages < ActiveRecord::Migration[5.2]
def change
add_column :splashpages, :include_happening_now, :boolean
end
end