Skip to content

Commit 4904d13

Browse files
codersquidcodersquid
committed
Merge pull request #132 from scipy-conference/schedule_changes
Schedule changes
2 parents 400a7fc + 9cc936e commit 4904d13

6 files changed

+198
-2
lines changed

‎Vagrantfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
3838
# the path on the host to the actual folder. The second argument is
3939
# the path on the guest to mount the folder. And the optional third
4040
# argument is a set of non-required options.
41-
# config.vm.synced_folder "../data", "/vagrant_data"
41+
config.vm.synced_folder "../symposion", "/symposion"
4242

4343
# Provider-specific configuration so you can fine-tune various
4444
# backing providers for Vagrant. These expose provider-specific options.

‎data/rooms.csv

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
section_slug,name,order
2+
talks-posters,Grand Ballroom,0
3+
talks-posters,Room 203,1
4+
talks-posters,Room 204,2
5+
tutorials,Room 101,0
6+
tutorials,Room 102,1
7+
tutorials,Room 105,2
8+
tutorials,Room 106,3
9+
bofs,Grand Ballroom,0
10+
bofs,Room 203,1
11+
bofs,Room 204,2
12+
bofs,Room 110,3
13+
bofs,Room 111,4
14+
bofs,Room 112,5
15+
sprints,Room 103,0
16+
sprints,Room 104,1
17+
sprints,Room 107,2
18+
sprints,Room 108,3
19+
sprints,Room 202,4

‎data/slotkinds.csv

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
section_slug,slot_kind,presentation_menu
2+
talks-posters,Astronomy and Astrophysics Symposium,TRUE
3+
talks-posters,Bioinformatics Symposium,TRUE
4+
talks-posters,Break,FALSE
5+
talks-posters,Breakfast,FALSE
6+
talks-posters,Digital Social Sciences Symposium,TRUE
7+
talks-posters,Engineering Symposium,TRUE
8+
talks-posters,General,TRUE
9+
talks-posters,Geophysics Symposium,TRUE
10+
talks-posters,Geospatial Data in Science,TRUE
11+
talks-posters,Imaging and Vision Symposium,TRUE
12+
talks-posters,Job Fair,FALSE
13+
talks-posters,Keynote,FALSE
14+
talks-posters,Lightning Talks,FALSE
15+
talks-posters,Lunch,FALSE
16+
talks-posters,Posters,FALSE
17+
talks-posters,Scientific Computing in Education,TRUE
18+
talks-posters,Setup,FALSE
19+
talks-posters,Welcome,FALSE
20+
talks-posters,BOFs,FALSE

‎data/talksposters.csv

+156
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
date,time_start,time_end,kind,room,proposal_id,description
2+
7/8/2014,7:30,8:30,Breakfast,Grand Ballroom,,Sponsor Breakfast (Room 301)
3+
7/8/2014,7:30,8:30,Breakfast,Room 203,,
4+
7/8/2014,7:30,8:30,Breakfast,Room 204,,
5+
7/8/2014,8:30,9:00,Break,Grand Ballroom,,Morning Break (GB Hallway)
6+
7/8/2014,8:30,9:00,Break,Room 203,,Morning Break (GB Hallway)
7+
7/8/2014,8:30,9:00,Break,Room 204,,Morning Break (GB Hallway)
8+
7/8/2014,10:00,10:15,Break,Grand Ballroom,,Break (GB Hallway)
9+
7/8/2014,10:00,10:15,Break,Room 203,,
10+
7/8/2014,10:00,10:15,Break,Room 204,,
11+
7/8/2014,15:15,15:30,Break,Grand Ballroom,,Break (GB Hallway)
12+
7/8/2014,15:15,15:30,Break,Room 203,,
13+
7/8/2014,15:15,15:30,Break,Room 204,,
14+
7/8/2014,7:00,7:30,Setup,Grand Ballroom,,Set-up
15+
7/8/2014,7:00,7:30,Setup,Room 203,,Set-up
16+
7/8/2014,7:00,7:30,Setup,Room 204,,Set-up
17+
7/8/2014,9:00,9:15,Welcome,Grand Ballroom,,Welcome
18+
7/8/2014,9:00,9:15,Welcome,Room 203,,Welcome
19+
7/8/2014,9:00,9:15,Welcome,Room 204,,Welcome
20+
7/8/2014,9:15,10:00,Keynote,Grand Ballroom,,Keynote
21+
7/8/2014,9:15,10:00,Keynote,Room 203,,Keynote
22+
7/8/2014,9:15,10:00,Keynote,Room 204,,Keynote
23+
7/8/2014,12:15,13:30,Lunch,Grand Ballroom,,Lunch
24+
7/8/2014,12:15,13:30,Lunch,Room 203,,
25+
7/8/2014,12:15,13:30,Lunch,Room 204,,
26+
7/8/2014,15:00,15:15,Setup,Grand Ballroom,,Poster Set-Up (Ballroom)
27+
7/8/2014,15:00,15:15,Setup,Room 203,,Poster Set-Up (Ballroom)
28+
7/8/2014,15:00,15:15,Setup,Room 204,,Poster Set-Up (Ballroom)
29+
7/8/2014,16:30,19:00,Lightning Talks,Grand Ballroom,,Lightning Talks
30+
7/8/2014,16:30,19:00,Lightning Talks,Room 203,,Lightning Talks
31+
7/8/2014,16:30,19:00,Lightning Talks,Room 204,,Lightning Talks
32+
7/8/2014,19:00,21:00,Job Fair,Grand Ballroom,,
33+
7/8/2014,19:00,21:00,Job Fair,Room 203,,
34+
7/8/2014,19:00,21:00,Job Fair,Room 204,,
35+
7/9/2014,7:00,8:00,Setup,Grand Ballroom,,Set-up
36+
7/9/2014,7:00,8:00,Setup,Room 203,,Set-up
37+
7/9/2014,7:00,8:00,Setup,Room 204,,Set-up
38+
7/9/2014,8:00,9:00,Break,Grand Ballroom,,Morning Break (GB Hallway)
39+
7/9/2014,8:00,9:00,Break,Room 203,,Morning Break (GB Hallway)
40+
7/9/2014,8:00,9:00,Break,Room 204,,Morning Break (GB Hallway)
41+
7/9/2014,9:00,9:15,Welcome,Grand Ballroom,,Welcome
42+
7/9/2014,9:00,9:15,Welcome,Room 203,,Welcome
43+
7/9/2014,9:00,9:15,Welcome,Room 204,,Welcome
44+
7/9/2014,9:15,10:00,Keynote,Grand Ballroom,,Keynote
45+
7/9/2014,9:15,10:00,Keynote,Room 203,,Keynote
46+
7/9/2014,9:15,10:00,Keynote,Room 204,,Keynote
47+
7/9/2014,10:00,10:15,Break,Grand Ballroom,,Break (GB Hallway)
48+
7/9/2014,10:00,10:15,Break,Room 203,,
49+
7/9/2014,10:00,10:15,Break,Room 204,,
50+
7/9/2014,12:15,13:30,Lunch,Grand Ballroom,,Lunch
51+
7/9/2014,12:15,13:30,Lunch,Room 203,,Lunch
52+
7/9/2014,12:15,13:30,Lunch,Room 204,,Lunch
53+
7/9/2014,14:30,15:30,Posters,Grand Ballroom,,
54+
7/9/2014,14:30,15:30,Posters,Room 203,,
55+
7/9/2014,14:30,15:30,Posters,Room 204,,
56+
7/9/2014,16:30,19:00,Lightning Talks,Grand Ballroom,,Lightning Talks
57+
7/9/2014,16:30,19:00,Lightning Talks,Room 203,,Lightning Talks
58+
7/9/2014,16:30,19:00,Lightning Talks,Room 204,,Lightning Talks
59+
7/10/2014,9:00,9:15,Welcome,Grand Ballroom,,Welcome
60+
7/10/2014,9:00,9:15,Welcome,Room 203,,Welcome
61+
7/10/2014,9:00,9:15,Welcome,Room 204,,Welcome
62+
7/10/2014,9:15,10:00,Keynote,Grand Ballroom,,Keynote
63+
7/10/2014,9:15,10:00,Keynote,Room 203,,Keynote
64+
7/10/2014,9:15,10:00,Keynote,Room 204,,Keynote
65+
7/10/2014,12:00,12:15,Break,Grand Ballroom,,
66+
7/10/2014,12:00,12:15,Break,Room 203,,
67+
7/10/2014,12:00,12:15,Break,Room 204,,
68+
7/10/2014,12:15,13:30,Lunch,Grand Ballroom,,
69+
7/10/2014,12:15,13:30,Lunch,Room 203,,
70+
7/10/2014,12:15,13:30,Lunch,Room 204,,
71+
7/10/2014,13:30,14:15,BOFs,Grand Ballroom,,
72+
7/10/2014,13:30,14:15,BOFs,Room 203,,
73+
7/10/2014,13:30,14:15,BOFs,Room 204,,
74+
7/10/2014,15:00,15:30,Break,Grand Ballroom,,
75+
7/10/2014,15:00,15:30,Break,Room 203,,
76+
7/10/2014,15:15,15:30,Break,Room 203,,
77+
7/10/2014,16:30,19:00,Lightning Talks,Grand Ballroom,,
78+
7/10/2014,16:30,19:00,Lightning Talks,Room 203,,
79+
7/10/2014,16:30,19:00,Lightning Talks,Room 204,,
80+
7/8/2014,10:15,10:45,Scientific Computing in Education,Grand Ballroom,88,
81+
7/8/2014,10:15,10:45,Geospatial Data in Science,Room 203,176,
82+
7/8/2014,10:15,10:45,General,Room 204,128,
83+
7/8/2014,10:45,11:15,Scientific Computing in Education,Grand Ballroom,177,
84+
7/8/2014,10:45,11:15,Geospatial Data in Science,Room 203,106,
85+
7/8/2014,10:45,11:15,General,Room 204,130,
86+
7/8/2014,11:15,11:45,Scientific Computing in Education,Grand Ballroom,98,
87+
7/8/2014,11:15,11:45,Geospatial Data in Science,Room 203,104,
88+
7/8/2014,11:15,11:45,General,Room 204,14,
89+
7/8/2014,11:45,12:00,Scientific Computing in Education,Grand Ballroom,37,
90+
7/8/2014,11:45,12:00,Geospatial Data in Science,Room 203,135,
91+
7/8/2014,11:45,12:00,General,Room 204,33,
92+
7/8/2014,14:15,14:45,Scientific Computing in Education,Grand Ballroom,149,
93+
7/8/2014,14:15,14:45,Geospatial Data in Science,Room 203,160,
94+
7/8/2014,14:15,14:45,General,Room 204,110,
95+
7/8/2014,14:45,15:00,Scientific Computing in Education,Grand Ballroom,185,
96+
7/8/2014,14:45,15:00,Geospatial Data in Science,Room 203,57,
97+
7/8/2014,14:45,15:00,General,Room 204,116,
98+
7/8/2014,15:30,16:00,Scientific Computing in Education,Grand Ballroom,15,
99+
7/8/2014,15:30,16:00,Geospatial Data in Science,Room 203,80,
100+
7/8/2014,15:30,16:00,General,Room 204,7,
101+
7/8/2014,16:00,16:15,Scientific Computing in Education,Grand Ballroom,13,
102+
7/8/2014,16:00,16:15,Geospatial Data in Science,Room 203,103,
103+
7/8/2014,16:00,16:30,General,Room 204,153,
104+
7/9/2014,10:15,10:45,Scientific Computing in Education,Grand Ballroom,156,
105+
7/9/2014,10:15,10:45,Geospatial Data in Science,Room 203,131,
106+
7/9/2014,10:15,10:45,General,Room 204,141,
107+
7/9/2014,10:45,11:15,Scientific Computing in Education,Grand Ballroom,169,
108+
7/9/2014,10:45,11:15,Geospatial Data in Science,Room 203,28,
109+
7/9/2014,10:45,11:15,General,Room 204,67,
110+
7/9/2014,11:15,11:45,Scientific Computing in Education,Grand Ballroom,82,
111+
7/9/2014,11:15,11:45,Geospatial Data in Science,Room 203,179,
112+
7/9/2014,11:15,11:45,General,Room 204,38,
113+
7/9/2014,11:45,12:00,Scientific Computing in Education,Grand Ballroom,114,
114+
7/9/2014,11:45,12:00,Geospatial Data in Science,Room 203,184,
115+
7/9/2014,11:45,12:00,General,Room 204,108,
116+
7/10/2014,10:15,10:45,Scientific Computing in Education,Grand Ballroom,,
117+
7/10/2014,10:15,10:45,Geospatial Data in Science,Room 203,,
118+
7/10/2014,10:15,10:45,General,Room 204,,
119+
7/10/2014,10:45,11:15,Scientific Computing in Education,Grand Ballroom,,
120+
7/10/2014,10:45,11:15,Geospatial Data in Science,Room 203,,
121+
7/10/2014,10:45,11:15,General,Room 204,,
122+
7/10/2014,11:15,11:45,Scientific Computing in Education,Grand Ballroom,,
123+
7/10/2014,11:15,11:45,Geospatial Data in Science,Room 203,,
124+
7/10/2014,11:15,11:45,General,Room 204,,
125+
7/10/2014,11:45,12:00,Scientific Computing in Education,Grand Ballroom,,
126+
7/10/2014,11:45,12:00,Geospatial Data in Science,Room 203,,
127+
7/10/2014,11:45,12:00,General,Room 204,,
128+
7/9/2014,13:30,14:00,Bioinformatics Symposium,Grand Ballroom,175,
129+
7/9/2014,14:00,14:15,Bioinformatics Symposium,Grand Ballroom,24,
130+
7/9/2014,15:30,16:00,Bioinformatics Symposium,Grand Ballroom,94,
131+
7/9/2014,16:00,16:30,Bioinformatics Symposium,Grand Ballroom,36,
132+
7/9/2014,13:30,13:50,Astronomy and Astrophysics Symposium,Room 203,101,
133+
7/9/2014,13:50,14:10,Astronomy and Astrophysics Symposium,Room 203,26,
134+
7/9/2014,14:10,14:30,Astronomy and Astrophysics Symposium,Room 203,66,
135+
7/9/2014,15:30,15:50,Astronomy and Astrophysics Symposium,Room 203,39,
136+
7/9/2014,15:50,16:10,Astronomy and Astrophysics Symposium,Room 203,81,
137+
7/9/2014,16:10,16:30,Astronomy and Astrophysics Symposium,Room 203,161,
138+
7/9/2014,13:30,14:00,Geophysics Symposium,Room 204,86,
139+
7/9/2014,14:00,14:30,Geophysics Symposium,Room 204,122,
140+
7/9/2014,15:30,16:00,Geophysics Symposium,Room 204,60,
141+
7/9/2014,16:00,16:30,Geophysics Symposium,Room 204,27,
142+
7/10/2014,14:15,14:30,Imaging and Vision Symposium,Room 204,85,
143+
7/10/2014,14:30,14:45,Imaging and Vision Symposium,Room 204,183,
144+
7/10/2014,14:45,15:00,Imaging and Vision Symposium,Room 204,84,
145+
7/10/2014,15:00,15:15,Imaging and Vision Symposium,Room 204,50,
146+
7/10/2014,15:30,15:45,Imaging and Vision Symposium,Room 204,166,
147+
7/10/2014,15:45,16:00,Imaging and Vision Symposium,Room 204,45,
148+
7/10/2014,16:00,16:15,Imaging and Vision Symposium,Room 204,46,
149+
7/10/2014,14:15,14:45,Engineering Symposium,Grand Ballroom,11,
150+
7/10/2014,14:45,15:00,Engineering Symposium,Grand Ballroom,42,
151+
7/10/2014,15:30,16:00,Engineering Symposium,Grand Ballroom,74,
152+
7/10/2014,16:00,16:30,Engineering Symposium,Grand Ballroom,157,
153+
7/10/2014,14:15,14:45,Digital Social Sciences Symposium,Room 203,189,
154+
7/10/2014,14:45,15:00,Digital Social Sciences Symposium,Room 203,182,
155+
7/10/2014,15:30,16:00,Digital Social Sciences Symposium,Room 203,145,
156+
7/10/2014,16:00,16:30,Digital Social Sciences Symposium,Room 203,190,

‎fabfile.py

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ def vagrant():
6767
env.update({
6868
'site': 'localhost',
6969
'upstream': 'localhost',
70+
'rewrite_name': 'citationsneeded.org',
7071
'available': 'conference',
7172
'ssl_cert': '/etc/ssl/localcerts/conference.scipy.org.crt',
7273
'ssl_key': '/etc/ssl/private/conference.scipy.org.key',

‎requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Django==1.4.12
1111
django-user-accounts==1.0b7
1212
#symposion==1.0b1.dev54
13-
-e git+https://github.com/scipy-conference/[email protected].4-reviewadmin#egg=symposion
13+
-e git+https://github.com/scipy-conference/[email protected].5-scipy2014#egg=symposion
1414
pinax-theme-bootstrap==3.0a4
1515
django-forms-bootstrap==2.0.3.post1
1616
metron==1.3

0 commit comments

Comments
 (0)