From 82405d2d258d4f1efde978484f7f4973322a750b Mon Sep 17 00:00:00 2001 From: Pepi Zawodsky Date: Sun, 27 Nov 2016 16:20:05 +0100 Subject: [PATCH 1/9] Removed incorrct entry for Phone operation center --- CCCongress Info Channels.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CCCongress Info Channels.md b/CCCongress Info Channels.md index bb164e2..9ff920f 100644 --- a/CCCongress Info Channels.md +++ b/CCCongress Info Channels.md @@ -25,7 +25,6 @@ Many CCC Events record videos of the given lectures and some event offer live [s - @[c3lightning_tlk] C3 Lighting talks organisation - @[c3lingo] Translation and interpreter service - Volunteers welcome! - @[c3noc] Network operation center -- @[c3poc] Phone operation center (DECT and GSM) - @[c3seidenstrasse] C3 pneumatic tube transport system - @[c3sidechannel] C3 Field phone service - @[c3troc] Train operation center @@ -48,7 +47,6 @@ Many CCC Events record videos of the given lectures and some event offer live [s [c3lightning_tlk]:https://twitter.com/c3lightning_tlk "C3 lightning talks organisation" [c3lingo]:https://twitter.com/c3lingo "Translation and interpreter service" [c3noc]:https://twitter.com/c3noc "C3 network operation center" -[c3poc]:https://twitter.com/c3poc "C3 phone operation center" [c3seidenstrasse]:https://twitter.com/c3seidenstrasse "C3 pneumatic tube transport system" [c3sidechannel]:https://twitter.com/c3sidechannel "C3 field phone service" [c3troc]:https://twitter.com/c3troc "C3 Train operation center" From 824deca2d8a448543102b4c962e893e4059df524 Mon Sep 17 00:00:00 2001 From: Pepi Zawodsky Date: Sun, 27 Nov 2016 16:22:40 +0100 Subject: [PATCH 2/9] Added Congress-Everywhere Live streaming info --- CCCongress Info Channels.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CCCongress Info Channels.md b/CCCongress Info Channels.md index 9ff920f..7104ff6 100644 --- a/CCCongress Info Channels.md +++ b/CCCongress Info Channels.md @@ -16,7 +16,7 @@ Many CCC Events record videos of the given lectures and some event offer live [s - [CCC Live Streaming via C3VOC](https://streaming.media.ccc.de/) - [C3 Subtitles Team](https://c3subtitles.de/) Crowdsources subtiles and translations - +- [CongressEverywhere](https://events.ccc.de/congress/2016/wiki/Congress_Everywhere) Locations with public live-stream viewing ## Twitter - @[c3cert] Chaos Emergency Response Team From 451be7e7d24e37e0c9f7a8feea0688591d7973bc Mon Sep 17 00:00:00 2001 From: Pepi Zawodsky Date: Sun, 27 Nov 2016 19:03:38 +0100 Subject: [PATCH 3/9] Added C3VOC Releases Bot --- CCCongress Info Channels.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CCCongress Info Channels.md b/CCCongress Info Channels.md index 7104ff6..a73b463 100644 --- a/CCCongress Info Channels.md +++ b/CCCongress Info Channels.md @@ -29,6 +29,7 @@ Many CCC Events record videos of the given lectures and some event offer live [s - @[c3sidechannel] C3 Field phone service - @[c3troc] Train operation center - @[c3voc] Video operation center (Recordings and live streaming) +- @[c3voc_releases] Bot that posts releases of fresh recordings in many formats - @[ccc] Official Twitter Account of CCC events - @[chaospatinnen] Mentoring Operation Center - @[chaosupdates] CCC Updates @@ -51,6 +52,7 @@ Many CCC Events record videos of the given lectures and some event offer live [s [c3sidechannel]:https://twitter.com/c3sidechannel "C3 field phone service" [c3troc]:https://twitter.com/c3troc "C3 Train operation center" [c3voc]:https://twitter.com/c3voc "C3 video operation center" +[c3voc_releases]:https://twitter.com/c3voc_releases "C3 video operation center - New releases Bot" [ccc]:https://twitter.com/ccc "Official Twitter Account of CCC events" [chaospatinnen]:https://twitter.com/chaospatinnen "Mentoring Operation Center" [chaosupdates]:https://twitter.com/chaosupdates "CCC Updates" From 41ef8c0a338b86b07ab54c8cc2a74d828a622e17 Mon Sep 17 00:00:00 2001 From: Pepi Zawodsky Date: Sun, 27 Nov 2016 23:25:13 +0100 Subject: [PATCH 4/9] Added Link to Email Contact --- CCCongress Info Channels.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CCCongress Info Channels.md b/CCCongress Info Channels.md index a73b463..e00425d 100644 --- a/CCCongress Info Channels.md +++ b/CCCongress Info Channels.md @@ -42,6 +42,11 @@ Many CCC Events record videos of the given lectures and some event offer live [s [RSS]:https://en.wikipedia.org/wiki/Rss "Wikipedia: RSS" [Streaming]:https://streaming.media.ccc.de/ "C3VOC Streaming - LIVE!" +### Contact +[Email Contact](https://events.ccc.de/congress/2016/wiki/Static:Contact) + + + [c3cert]:https://twitter.com/c3cert "Chaos Emergency Response Team" [c3infodesk]:https://twitter.com/c3infodesk "Infodesk/Travelservice for CCC related events" [c3kidspace]:https://twitter.com/c3kidspace "C3 Kidspace" From 585461f6dbd568875c83586af76286729ae5030d Mon Sep 17 00:00:00 2001 From: Pepi Zawodsky Date: Tue, 29 Nov 2016 16:42:56 +0100 Subject: [PATCH 5/9] Added the Bar Operation Center --- CCCongress Info Channels.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CCCongress Info Channels.md b/CCCongress Info Channels.md index e00425d..566f51b 100644 --- a/CCCongress Info Channels.md +++ b/CCCongress Info Channels.md @@ -19,6 +19,7 @@ Many CCC Events record videos of the given lectures and some event offer live [s - [CongressEverywhere](https://events.ccc.de/congress/2016/wiki/Congress_Everywhere) Locations with public live-stream viewing ## Twitter +- @[c3bar] Bar Operation Center - Department of Tschunk Quality Assurance - @[c3cert] Chaos Emergency Response Team - @[c3infodesk] Infodesk/Travelservice for CCC related events - @[c3kidspace] Childcare at Chaos events @@ -46,7 +47,7 @@ Many CCC Events record videos of the given lectures and some event offer live [s [Email Contact](https://events.ccc.de/congress/2016/wiki/Static:Contact) - +[c3bar]:https://twitter.com/c3bar "Bar Operation Center - Department of Tschunk Quality Assurance" [c3cert]:https://twitter.com/c3cert "Chaos Emergency Response Team" [c3infodesk]:https://twitter.com/c3infodesk "Infodesk/Travelservice for CCC related events" [c3kidspace]:https://twitter.com/c3kidspace "C3 Kidspace" From 440497f010a83d2be4e833cb825660ed822e69e4 Mon Sep 17 00:00:00 2001 From: Pepi Zawodsky Date: Wed, 30 Nov 2016 01:25:57 +0100 Subject: [PATCH 6/9] Added Radio Operation Center --- CCCongress Info Channels.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CCCongress Info Channels.md b/CCCongress Info Channels.md index 566f51b..b6638c0 100644 --- a/CCCongress Info Channels.md +++ b/CCCongress Info Channels.md @@ -26,6 +26,7 @@ Many CCC Events record videos of the given lectures and some event offer live [s - @[c3lightning_tlk] C3 Lighting talks organisation - @[c3lingo] Translation and interpreter service - Volunteers welcome! - @[c3noc] Network operation center +- @[c3roc_] C3 Radio Operation Center - Frequency coordination for events - @[c3seidenstrasse] C3 pneumatic tube transport system - @[c3sidechannel] C3 Field phone service - @[c3troc] Train operation center @@ -54,6 +55,7 @@ Many CCC Events record videos of the given lectures and some event offer live [s [c3lightning_tlk]:https://twitter.com/c3lightning_tlk "C3 lightning talks organisation" [c3lingo]:https://twitter.com/c3lingo "Translation and interpreter service" [c3noc]:https://twitter.com/c3noc "C3 network operation center" +[c3orc_]:https://twitter.com/c3roc_ "Radio Operation Center - Frequency coordination for events" [c3seidenstrasse]:https://twitter.com/c3seidenstrasse "C3 pneumatic tube transport system" [c3sidechannel]:https://twitter.com/c3sidechannel "C3 field phone service" [c3troc]:https://twitter.com/c3troc "C3 Train operation center" From 1b2ece4c877378878fb0e61da89fdedc4e2c14dc Mon Sep 17 00:00:00 2001 From: MacLemon Date: Thu, 8 Dec 2016 15:10:26 +0100 Subject: [PATCH 7/9] Corrected Typo --- CCCongress Info Channels.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CCCongress Info Channels.md b/CCCongress Info Channels.md index b6638c0..22215af 100644 --- a/CCCongress Info Channels.md +++ b/CCCongress Info Channels.md @@ -55,7 +55,7 @@ Many CCC Events record videos of the given lectures and some event offer live [s [c3lightning_tlk]:https://twitter.com/c3lightning_tlk "C3 lightning talks organisation" [c3lingo]:https://twitter.com/c3lingo "Translation and interpreter service" [c3noc]:https://twitter.com/c3noc "C3 network operation center" -[c3orc_]:https://twitter.com/c3roc_ "Radio Operation Center - Frequency coordination for events" +[c3roc_]:https://twitter.com/c3roc_ "Radio Operation Center - Frequency coordination for events" [c3seidenstrasse]:https://twitter.com/c3seidenstrasse "C3 pneumatic tube transport system" [c3sidechannel]:https://twitter.com/c3sidechannel "C3 field phone service" [c3troc]:https://twitter.com/c3troc "C3 Train operation center" From 7f95989d318bdcd19257b1070edb808c3a0444ad Mon Sep 17 00:00:00 2001 From: MacLemon Date: Sat, 10 Dec 2016 18:17:20 +0100 Subject: [PATCH 8/9] Added Link to World electrical plug and socket map. --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 5107857..bc7d3cf 100644 --- a/README.md +++ b/README.md @@ -230,6 +230,9 @@ In case something gets lost it can find its way back to you. #### Power and Chargers Start charging your batteries right now so they're ready when you finish packing and leave. +For travelling abroad there is a handy [World Electrical Plug & Socket Map][40] + + - Charger for laptop - Mac: small Duck-head and long ([Schuko Plug][6]) cord - Mac: MagSafe to MagSafe 2 Adapter @@ -650,6 +653,7 @@ These people have contributed to improve this list for everyone (in no particula [37]:https://de.wikipedia.org/wiki/Datenklo "CCC Datenklo - Akustik Koppler" [38]:https://cert.ccc.de/ "C3 CERT" [39]:https://events.ccc.de/congress/2016/wiki/Assembly:Coffeenerds "Coffeenerds at 33c3" +[40]:http://britishbusinessenergy.co.uk/plug-socket/ "World Electrical Plug & Socket Map" [100]:https://twitter.com/Astarioth [101]:https://twitter.com/N4mes From 8f8325735a3fb4bb39a5a30a24c3f030d0986b12 Mon Sep 17 00:00:00 2001 From: MacLemon Date: Sun, 11 Dec 2016 22:29:56 +0100 Subject: [PATCH 9/9] Added C3HOC --- CCCongress Info Channels.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CCCongress Info Channels.md b/CCCongress Info Channels.md index 22215af..7781f47 100644 --- a/CCCongress Info Channels.md +++ b/CCCongress Info Channels.md @@ -21,6 +21,7 @@ Many CCC Events record videos of the given lectures and some event offer live [s ## Twitter - @[c3bar] Bar Operation Center - Department of Tschunk Quality Assurance - @[c3cert] Chaos Emergency Response Team +- @[c3hoc] Hair operations center - @[c3infodesk] Infodesk/Travelservice for CCC related events - @[c3kidspace] Childcare at Chaos events - @[c3lightning_tlk] C3 Lighting talks organisation @@ -50,6 +51,7 @@ Many CCC Events record videos of the given lectures and some event offer live [s [c3bar]:https://twitter.com/c3bar "Bar Operation Center - Department of Tschunk Quality Assurance" [c3cert]:https://twitter.com/c3cert "Chaos Emergency Response Team" +[c3hoc]:https://twitter.com/c3hoc "Hair operations center" [c3infodesk]:https://twitter.com/c3infodesk "Infodesk/Travelservice for CCC related events" [c3kidspace]:https://twitter.com/c3kidspace "C3 Kidspace" [c3lightning_tlk]:https://twitter.com/c3lightning_tlk "C3 lightning talks organisation"