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
  ...
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

View file

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

View file

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2021_03_06_185903) do
ActiveRecord::Schema.define(version: 2021_04_01_050437) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -269,6 +269,13 @@ ActiveRecord::Schema.define(version: 2021_03_06_185903) do
t.datetime "created_at"
end
create_table "events_users", id: false, force: :cascade do |t|
t.bigint "event_id"
t.bigint "user_id"
t.index ["event_id"], name: "index_events_users_on_event_id"
t.index ["user_id"], name: "index_events_users_on_user_id"
end
create_table "lodgings", force: :cascade do |t|
t.string "name"
t.text "description"
@ -443,6 +450,7 @@ ActiveRecord::Schema.define(version: 2021_03_06_185903) do
t.boolean "include_cfp", default: false
t.boolean "include_booths"
t.boolean "shuffle_highlights", default: false, null: false
t.boolean "include_happening_now"
end
create_table "sponsors", force: :cascade do |t|