Skip to content

Commit

Permalink
Merge pull request #1118 from PlanoramaEvents/development
Browse files Browse the repository at this point in the history
v3.7.0-rc6
  • Loading branch information
balen authored Jul 6, 2024
2 parents cd51fdd + 656c31c commit acf6787
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 2 additions & 1 deletion app/javascript/components/plano_editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ export default {
},
config: function() {
let local_config = {
removeButtons: "Subscript, Superscript"
removeButtons: "Subscript, Superscript",
versionCheck: false
}
let toolbar = [
Expand Down
3 changes: 3 additions & 0 deletions lib/tasks/g24.rake
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ namespace :g24 do
"Meeting Academy M1",
"Meeting Academy M2/M3",
"Inspiration",
"Hall 2",
"Events with British Sign Language Interpretation"
]
session_rooms = [
"Blaven",
Expand Down Expand Up @@ -249,6 +251,7 @@ namespace :g24 do
candidates = [
{venue_id: sec.id, name: "Hall 1", purpose: "Programme during day (either Table Talks or Lecture Theatre style)", sort_order: 110},
{venue_id: sec.id, name: "Hall 2", purpose: "Events", sort_order: 112},
{venue_id: sec.id, name: "Events with British Sign Language Interpretation", purpose: "Events", sort_order: 113},
{venue_id: sec.id, name: "Hall 4 (Other)", purpose: "Table Talks (+ Stuff for other divisions)", sort_order: 115},
{venue_id: sec.id, name: "Hall 4 (Table Talks)", purpose: "Table Talks (+ Stuff for other divisions)", sort_order: 116},
{venue_id: sec.id, name: "Hall 4 (Autographs)", purpose: "Table Talks (+ Stuff for other divisions)", sort_order: 117},
Expand Down

0 comments on commit acf6787

Please sign in to comment.