Michael McMahon [Thu, 21 Mar 2019 18:53:48 +0000 (14:53 -0400)]
Merge branch 'master' into stable
TechnologyClassroom [Thu, 21 Mar 2019 18:48:13 +0000 (14:48 -0400)]
Move headers serverside
ValessioBrito [Thu, 21 Mar 2019 17:03:17 +0000 (13:03 -0400)]
Merge branch 'master' into stable
ValessioBrito [Thu, 21 Mar 2019 17:02:56 +0000 (13:02 -0400)]
Merge branch 'master' of vcs.fsf.org:libreplanet-static
TechnologyClassroom [Thu, 21 Mar 2019 17:02:20 +0000 (13:02 -0400)]
.htaccess add header lines
ValessioBrito [Thu, 21 Mar 2019 17:02:13 +0000 (13:02 -0400)]
Merge branch 'lp2019'
ValessioBrito [Thu, 21 Mar 2019 16:57:07 +0000 (12:57 -0400)]
fix TimeZone UTC -4
ValessioBrito [Thu, 21 Mar 2019 16:55:35 +0000 (12:55 -0400)]
Fix time zone UTC -4
TechnologyClassroom [Thu, 21 Mar 2019 16:49:01 +0000 (12:49 -0400)]
UTC time
ValessioBrito [Thu, 21 Mar 2019 16:41:59 +0000 (12:41 -0400)]
Change sponsors logos
ValessioBrito [Thu, 21 Mar 2019 16:18:44 +0000 (12:18 -0400)]
Merge branch 'lp2019'
ValessioBrito [Thu, 21 Mar 2019 16:18:06 +0000 (12:18 -0400)]
mv updates tv.html to tv/index.html
ValessioBrito [Thu, 21 Mar 2019 16:14:17 +0000 (12:14 -0400)]
Merge branch 'lp2019'
ValessioBrito [Thu, 21 Mar 2019 16:13:09 +0000 (12:13 -0400)]
Fix time and no cache page
TechnologyClassroom [Thu, 21 Mar 2019 16:08:19 +0000 (12:08 -0400)]
Add colon to htaccess
TechnologyClassroom [Thu, 21 Mar 2019 16:04:58 +0000 (12:04 -0400)]
Add cors to htaccess
TechnologyClassroom [Thu, 21 Mar 2019 15:32:54 +0000 (11:32 -0400)]
Rename tv.html to tv/index.html
TechnologyClassroom [Thu, 21 Mar 2019 15:20:26 +0000 (11:20 -0400)]
Move tv.html to tv/index.html
Andrew Engelbrecht [Wed, 20 Mar 2019 22:22:55 +0000 (18:22 -0400)]
updated video urls on static streaming pages
Andrew Engelbrecht [Wed, 20 Mar 2019 22:09:16 +0000 (18:09 -0400)]
disable the video reloading for now
this needs more hacking before it will work. i left some comments in the
stream.js file about issues that need to be addressed.
Andrew Engelbrecht [Wed, 20 Mar 2019 21:22:16 +0000 (17:22 -0400)]
try reloading video 3 seconds after the video ends
this allows streams on the live page to continue even if they are
interrupted
Molly de Blanc [Wed, 20 Mar 2019 21:07:27 +0000 (17:07 -0400)]
updated sponsor logos.
TechnologyClassroom [Wed, 20 Mar 2019 19:55:35 +0000 (15:55 -0400)]
Add execute to tv.html
ValessioBrito [Wed, 20 Mar 2019 19:42:49 +0000 (15:42 -0400)]
add magic css to day and time
ValessioBrito [Wed, 20 Mar 2019 19:39:25 +0000 (15:39 -0400)]
include program generator
ValessioBrito [Wed, 20 Mar 2019 19:35:49 +0000 (15:35 -0400)]
Merge branch 'master' into lp2019
TechnologyClassroom [Wed, 20 Mar 2019 19:11:10 +0000 (15:11 -0400)]
Fixed whited picture
Molly de Blanc [Wed, 20 Mar 2019 17:10:56 +0000 (13:10 -0400)]
updated raffle page to include prizes and sponsor page to include raffle sponsors.
Dana Morgenstein [Wed, 20 Mar 2019 16:26:42 +0000 (12:26 -0400)]
fixed closing time
Dana Morgenstein [Wed, 20 Mar 2019 16:23:48 +0000 (12:23 -0400)]
added closing to day one
Dana Morgenstein [Wed, 20 Mar 2019 16:15:53 +0000 (12:15 -0400)]
added day one closing
Ian Kelling [Wed, 20 Mar 2019 01:15:26 +0000 (21:15 -0400)]
add ics schedule
Molly de Blanc [Tue, 19 Mar 2019 23:15:43 +0000 (19:15 -0400)]
Merge branch 'master' of vcs.fsf.org:libreplanet-static
Molly de Blanc [Tue, 19 Mar 2019 23:15:36 +0000 (19:15 -0400)]
updated awards time.
Dana Morgenstein [Tue, 19 Mar 2019 22:52:52 +0000 (18:52 -0400)]
fixed the rest of the raffle logos
Dana Morgenstein [Tue, 19 Mar 2019 22:49:20 +0000 (18:49 -0400)]
fixed aleph and technoethical
Dana Morgenstein [Tue, 19 Mar 2019 22:44:17 +0000 (18:44 -0400)]
updating vikings logo
Dana Morgenstein [Tue, 19 Mar 2019 22:37:32 +0000 (18:37 -0400)]
fixed vikings
Dana Morgenstein [Tue, 19 Mar 2019 22:31:02 +0000 (18:31 -0400)]
Merge branch 'master' of vcs.fsf.org:libreplanet-static
Dana Morgenstein [Tue, 19 Mar 2019 22:30:58 +0000 (18:30 -0400)]
added logos to raffle page
Molly de Blanc [Tue, 19 Mar 2019 20:04:50 +0000 (16:04 -0400)]
updated recent updates.
Andrew Engelbrecht [Tue, 19 Mar 2019 19:54:42 +0000 (15:54 -0400)]
added some padding above the irc help text
Andrew Engelbrecht [Tue, 19 Mar 2019 19:51:11 +0000 (15:51 -0400)]
Added help text after the IRC widget
Andrew Engelbrecht [Tue, 19 Mar 2019 19:00:56 +0000 (15:00 -0400)]
changed icecast stream from http to https
Andrew Engelbrecht [Tue, 19 Mar 2019 18:58:17 +0000 (14:58 -0400)]
changed "show/hide desktop stream" to "..slides.."
this should make more sense.
Ian Kelling [Tue, 19 Mar 2019 16:06:14 +0000 (12:06 -0400)]
Merge branch 'master' into stable
Ian Kelling [Tue, 19 Mar 2019 16:06:06 +0000 (12:06 -0400)]
fix spacing issue
Ian Kelling [Tue, 19 Mar 2019 16:05:28 +0000 (12:05 -0400)]
Merge branch 'master' into stable
Ian Kelling [Tue, 19 Mar 2019 16:04:28 +0000 (12:04 -0400)]
add livestream link
Dana Morgenstein [Tue, 19 Mar 2019 16:03:26 +0000 (12:03 -0400)]
Merge branch 'master' into stable
Dana Morgenstein [Tue, 19 Mar 2019 16:03:08 +0000 (12:03 -0400)]
added deb nicholson to speakers
Dana Morgenstein [Tue, 19 Mar 2019 15:53:22 +0000 (11:53 -0400)]
Merge branch 'master' into stable
Dana Morgenstein [Tue, 19 Mar 2019 15:52:30 +0000 (11:52 -0400)]
Merge branch 'master' of vcs.fsf.org:libreplanet-static
Dana Morgenstein [Tue, 19 Mar 2019 15:52:25 +0000 (11:52 -0400)]
switched Micky and Bdale times
Molly de Blanc [Tue, 19 Mar 2019 15:16:12 +0000 (11:16 -0400)]
Merge branch 'master' into stable
Molly de Blanc [Tue, 19 Mar 2019 15:16:01 +0000 (11:16 -0400)]
updated sessions page to remove Gay Gordon Byrne.
ValessioBrito [Mon, 18 Mar 2019 18:20:28 +0000 (14:20 -0400)]
Merge branch 'stable' into lp2019
ValessioBrito [Mon, 18 Mar 2019 18:19:44 +0000 (14:19 -0400)]
change feed url
Molly de Blanc [Mon, 18 Mar 2019 15:41:41 +0000 (11:41 -0400)]
Merge branch 'master' into stable
Molly de Blanc [Mon, 18 Mar 2019 15:41:19 +0000 (11:41 -0400)]
updated grid schedule.
Molly de Blanc [Sun, 17 Mar 2019 12:03:11 +0000 (08:03 -0400)]
Merge branch 'master' into stable
Molly de Blanc [Sun, 17 Mar 2019 12:02:51 +0000 (08:02 -0400)]
added link to raffle.
TechnologyClassroom [Sat, 16 Mar 2019 20:27:04 +0000 (16:27 -0400)]
chmod 775 2019/raffle/index.html
Molly de Blanc [Fri, 15 Mar 2019 21:59:30 +0000 (17:59 -0400)]
updated nav bar to exclue raffle pending fixing the page.
Molly de Blanc [Fri, 15 Mar 2019 21:56:25 +0000 (17:56 -0400)]
Merge branch 'master' of vcs.fsf.org:libreplanet-static
Molly de Blanc [Fri, 15 Mar 2019 21:56:19 +0000 (17:56 -0400)]
updated index
Dana Morgenstein [Fri, 15 Mar 2019 21:52:34 +0000 (17:52 -0400)]
fixed times
Molly de Blanc [Fri, 15 Mar 2019 21:51:39 +0000 (17:51 -0400)]
Merge branch 'master' of vcs.fsf.org:libreplanet-static
Molly de Blanc [Fri, 15 Mar 2019 21:51:31 +0000 (17:51 -0400)]
updated raffle page, added to nav bar.
Andrew Engelbrecht [Fri, 15 Mar 2019 20:19:08 +0000 (16:19 -0400)]
Merge branch 'stable'
Andrew Engelbrecht [Fri, 15 Mar 2019 20:18:10 +0000 (16:18 -0400)]
remove "Partner" section from live page
so far, we don't have such a partner this year
Andrew Engelbrecht [Fri, 15 Mar 2019 20:10:07 +0000 (16:10 -0400)]
Merge branch 'stable'
Andrew Engelbrecht [Fri, 15 Mar 2019 19:53:00 +0000 (15:53 -0400)]
don't pause speaker video if desktop stream stops
if the slide stream is interrupted, we don't want to stop the speaker
video.
either way, the page likely has to be reloaded, or to switch room
streams if the viewer wants the slides to resume after an interrupt.
with this change, at least the speaker video won't pause at the end of
each loop of the incomplete slide stream.
Andrew Engelbrecht [Fri, 15 Mar 2019 19:44:53 +0000 (15:44 -0400)]
Merge branch 'stable'
Andrew Engelbrecht [Fri, 15 Mar 2019 19:43:38 +0000 (15:43 -0400)]
move IRC header lower on the live page
the "join the discussion online" section has info for mircoblogging and
mumble, so the IRC header should be below that section, like it is on
the static streaming pages.
Andrew Engelbrecht [Fri, 15 Mar 2019 19:39:38 +0000 (15:39 -0400)]
Merge branch 'stable'
Andrew Engelbrecht [Fri, 15 Mar 2019 19:38:07 +0000 (15:38 -0400)]
added /join command to irc chan names on live page
this makes it easier for people to figure out how to join those channels
Molly de Blanc [Fri, 15 Mar 2019 18:27:22 +0000 (14:27 -0400)]
added raffle folder.
Andrew Engelbrecht [Fri, 15 Mar 2019 17:57:12 +0000 (13:57 -0400)]
removed port number from Mumble server address
mumble suggests the default port when adding a server, and
https://mumble.fsf.org lists the port.
Andrew Engelbrecht [Fri, 15 Mar 2019 17:50:28 +0000 (13:50 -0400)]
added mumble server info to live page
Dana Morgenstein [Fri, 15 Mar 2019 16:20:15 +0000 (12:20 -0400)]
changed fain, switched garbee and metts
Molly de Blanc [Thu, 14 Mar 2019 20:00:27 +0000 (16:00 -0400)]
git Merge branch 'master' of vcs.fsf.org:libreplanet-static
Molly de Blanc [Thu, 14 Mar 2019 20:00:15 +0000 (16:00 -0400)]
added tshirt to carousel.
Andrew Engelbrecht [Thu, 14 Mar 2019 19:58:26 +0000 (15:58 -0400)]
LibreJS: match version of Lodash we're using
Molly de Blanc [Thu, 14 Mar 2019 17:49:15 +0000 (13:49 -0400)]
Merge branch 'master' into stable
Molly de Blanc [Thu, 14 Mar 2019 17:48:56 +0000 (13:48 -0400)]
added logistics page.
ValessioBrito [Thu, 14 Mar 2019 17:46:01 +0000 (13:46 -0400)]
Merge branch 'tv-schedule' into lp2019
ValessioBrito [Thu, 14 Mar 2019 17:45:10 +0000 (13:45 -0400)]
add content program
Ian Kelling [Thu, 14 Mar 2019 00:49:55 +0000 (20:49 -0400)]
Merge branch 'master' into stable
Ian Kelling [Thu, 14 Mar 2019 00:49:44 +0000 (20:49 -0400)]
fix typo
TechnologyClassroom [Wed, 13 Mar 2019 19:05:01 +0000 (15:05 -0400)]
Merge Valessio's branch 'lp2019' into stable
TechnologyClassroom [Wed, 13 Mar 2019 19:04:22 +0000 (15:04 -0400)]
Merge Valessio's branch 'lp2019'
Dana Morgenstein [Wed, 13 Mar 2019 17:06:30 +0000 (13:06 -0400)]
removed laurin weissinger
Dana Morgenstein [Wed, 13 Mar 2019 17:01:51 +0000 (13:01 -0400)]
added alex claffey bio
Dana Morgenstein [Wed, 13 Mar 2019 16:49:19 +0000 (12:49 -0400)]
added welcome dinner tba details
Valessio Brito [Wed, 13 Mar 2019 04:43:12 +0000 (00:43 -0400)]
update tv style
Valessio Brito [Wed, 13 Mar 2019 04:23:30 +0000 (00:23 -0400)]
Merge branch 'lp2019' into tv-schedule
Valessio Brito [Wed, 13 Mar 2019 04:21:11 +0000 (00:21 -0400)]
recent updates align list
Valessio Brito [Wed, 13 Mar 2019 04:15:13 +0000 (00:15 -0400)]
fix grid header
Valessio Brito [Wed, 13 Mar 2019 03:56:52 +0000 (23:56 -0400)]
fix style css on program
projects / libreplanet-static.git / log