Molly de Blanc [Sat, 23 Mar 2019 17:04:25 +0000 (13:04 -0400)]
Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable
Molly de Blanc [Sat, 23 Mar 2019 17:04:20 +0000 (13:04 -0400)]
updated recent news on web site.
Andrew Engelbrecht [Sat, 23 Mar 2019 14:06:35 +0000 (10:06 -0400)]
Revert "Revert "Switch from quitter to status""
This reverts commit
60c8dc145102d8dd2502289316e21c314ce91d07.
Quitter.im address not working. Michael says that status.fsf.org works.
Andrew Engelbrecht [Sat, 23 Mar 2019 14:01:08 +0000 (10:01 -0400)]
Revert "Switch from quitter to status"
This reverts commit
d1e13c74a8ea5a7972411b010b34534264693c18.
the other address wasn't working
Molly de Blanc [Sat, 23 Mar 2019 13:10:04 +0000 (09:10 -0400)]
Merge branch 'master' into stable
Molly de Blanc [Sat, 23 Mar 2019 13:09:48 +0000 (09:09 -0400)]
Merge branch 'master' of vcs.fsf.org:libreplanet-static
Molly de Blanc [Sat, 23 Mar 2019 13:09:42 +0000 (09:09 -0400)]
updated info to include associate members' meeting.
Ian Kelling [Sat, 23 Mar 2019 02:33:34 +0000 (22:33 -0400)]
update ics
Ian Kelling [Sat, 23 Mar 2019 02:02:29 +0000 (22:02 -0400)]
fix typo
Ian Kelling [Sat, 23 Mar 2019 01:53:44 +0000 (21:53 -0400)]
update ics and mention giggity
Molly de Blanc [Fri, 22 Mar 2019 21:38:14 +0000 (17:38 -0400)]
updated schedule to include link to .ics.
Molly de Blanc [Fri, 22 Mar 2019 21:14:32 +0000 (17:14 -0400)]
Merge branch 'master' of vcs.fsf.org:libreplanet-static
Molly de Blanc [Fri, 22 Mar 2019 21:14:28 +0000 (17:14 -0400)]
added feedback to nav bar.
Michael McMahon [Fri, 22 Mar 2019 21:12:09 +0000 (17:12 -0400)]
Remove .htaccess line
Michael McMahon [Fri, 22 Mar 2019 21:03:36 +0000 (17:03 -0400)]
Add redirect for feedback page
Molly de Blanc [Fri, 22 Mar 2019 20:42:50 +0000 (16:42 -0400)]
created folder for feedback survey.
ValessioBrito [Fri, 22 Mar 2019 15:47:11 +0000 (11:47 -0400)]
Merge branch 'master' into stable
ValessioBrito [Fri, 22 Mar 2019 15:46:07 +0000 (11:46 -0400)]
add creatures the end day
ValessioBrito [Fri, 22 Mar 2019 15:33:49 +0000 (11:33 -0400)]
change margin to position move
ValessioBrito [Thu, 21 Mar 2019 20:30:36 +0000 (16:30 -0400)]
Merge branch 'master' into stable
ValessioBrito [Thu, 21 Mar 2019 20:29:15 +0000 (16:29 -0400)]
Merge branch 'master' into lp2019
ValessioBrito [Thu, 21 Mar 2019 20:27:57 +0000 (16:27 -0400)]
align the time content
Michael McMahon [Thu, 21 Mar 2019 19:29:51 +0000 (15:29 -0400)]
Merge branch 'master' into stable
Michael McMahon [Thu, 21 Mar 2019 19:28:56 +0000 (15:28 -0400)]
Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable
Michael McMahon [Thu, 21 Mar 2019 19:28:41 +0000 (15:28 -0400)]
Switch from quitter to status
ValessioBrito [Thu, 21 Mar 2019 19:08:01 +0000 (15:08 -0400)]
Merge branch 'lp2019'
ValessioBrito [Thu, 21 Mar 2019 19:07:12 +0000 (15:07 -0400)]
fix show all content
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.
projects / libreplanet-static.git / log