From a567b956b68bd6f7cc4747ed42bcdc9c079fe85b Mon Sep 17 00:00:00 2001 From: MacLemon Date: Sat, 17 Dec 2016 18:57:05 +0100 Subject: [PATCH 01/13] Added @congress_ios, a Congress App for iOS devices --- CCCongress Info Channels.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CCCongress Info Channels.md b/CCCongress Info Channels.md index 2e11f08..26a912e 100644 --- a/CCCongress Info Channels.md +++ b/CCCongress Info Channels.md @@ -30,16 +30,17 @@ Many CCC Events record videos of the given lectures and some event offer live [s - @[c3roc_] C3 Radio Operation Center - Frequency coordination for events - @[c3seidenstrasse] C3 pneumatic tube transport system - @[c3sidechannel] C3 Field phone service +- @[c3srt_releases] C3 Subtitle Releases (Bot) +- @[c3subtitles] Making C3 events more barrier-free by providing subtitles and translations - @[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 +- @[congress_ios] Congress App for iOS devices - @[engelsystem] Engelsystem information system for chaos events - @[eventphone] DECT wireless phone network operations -- @[c3srt_releases] C3 Subtitle Releases (Bot) -- @[c3subtitles] Making C3 events more barrier-free by providing subtitles and translations [RSS]:https://en.wikipedia.org/wiki/Rss "Wikipedia: RSS" @@ -49,27 +50,28 @@ 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) +[C3_LightningTLK]:https://twitter.com/c3_lightningtlk "C3 lightning talks organisation" [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" -[C3_LightningTLK]:https://twitter.com/c3_lightningtlk "C3 lightning talks organisation" [c3lingo]:https://twitter.com/c3lingo "Translation and interpreter service" [c3noc]:https://twitter.com/c3noc "C3 network operation center" [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" +[c3srt_releases]:https://twitter.com/c3srt_releases "C3 Subtitles Release Info (Bot)" +[c3subtitles]:https://twitter.com/c3subtitles "Making C3 events more barrier-free by providing subtitles and translations" [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" +[congress_ios]:https://twitter.com/congress_ios "Congress App for iOS devices" [chaospatinnen]:https://twitter.com/chaospatinnen "Mentoring Operation Center" [chaosupdates]:https://twitter.com/chaosupdates "CCC Updates" [engelsystem]:https://twitter.com/engelsystem "Engelsystem information system for chaos events" [eventphone]:https://twitter.com/eventphone "DECT wireless phone network operations" -[c3srt_releases]:https://twitter.com/c3srt_releases "C3 Subtitles Release Info (Bot)" -[c3subtitles]:https://twitter.com/c3subtitles "Making C3 events more barrier-free by providing subtitles and translations" [MacLemon]:https://twitter.com/MacLemon "MacLemon" From 35825df02ea48aa0263ae7fbe2dc4d8753eb74b1 Mon Sep 17 00:00:00 2001 From: MacLemon Date: Mon, 19 Dec 2016 11:30:41 +0100 Subject: [PATCH 02/13] Added fligh regulations hint for fluids when travelling with contact lenses --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bc7d3cf..ee8eb5d 100644 --- a/README.md +++ b/README.md @@ -139,7 +139,7 @@ Event and location related emergency information is in a seperate document for t - Towel. Never hitchhike the Galaxy without one. - Contact lenses - cleaning fluid - - contact lens container + - contact lens container (make sure it fits flight regulations for fluids if you travel by plane.) - replacement contact lenses - replacement glasses - eye drops From 0a603c0eb602d445834cbff55b7b1cf1b6bdf6d9 Mon Sep 17 00:00:00 2001 From: MacLemon Date: Wed, 21 Dec 2016 12:22:45 +0100 Subject: [PATCH 03/13] Added remindet to check ATMs for skimmers. Thanks to @dot__not. --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index ee8eb5d..ab374fe 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,8 @@ This applies to the Congress Center as well as your hotel windows. ### Payment stuff +When using ATMs/Cash Machines/Bankomaten/Geldautomaten give them a good wiggle before inserting your card. During 32C3 a Skimmer device had been found at an ATM at Bahnhof Dammtor. This is just a reminder, you should do that every time you use your card. + - Some cash (€uros, or other local currency) - Credit card - Maestro card (Bankomatkarte) @@ -611,6 +613,7 @@ These people have contributed to improve this list for everyone (in no particula - [@cloelkes][135] - [raven][136] - [@trollkopp][137] +- [@dot__not][138] ## Links @@ -693,3 +696,4 @@ These people have contributed to improve this list for everyone (in no particula [135]:https://twitter.com/cloelkes [136]:https://forestraven.net [137]:https://twitter.com/trollkopp +[137]:https://twitter.com/dot__not From c7c6bbfdb020c969758cfff86508f63a4375ec03 Mon Sep 17 00:00:00 2001 From: Peter Grassberger Date: Wed, 21 Dec 2016 14:06:45 +0100 Subject: [PATCH 04/13] Fix link to @dot__not also add myself to contributed list ^^ --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ab374fe..d4d9d70 100644 --- a/README.md +++ b/README.md @@ -614,6 +614,7 @@ These people have contributed to improve this list for everyone (in no particula - [raven][136] - [@trollkopp][137] - [@dot__not][138] +- [@PeterTheOne][139] ## Links @@ -696,4 +697,5 @@ These people have contributed to improve this list for everyone (in no particula [135]:https://twitter.com/cloelkes [136]:https://forestraven.net [137]:https://twitter.com/trollkopp -[137]:https://twitter.com/dot__not +[138]:https://twitter.com/dot__not +[139]:https://twitter.com/PeterTheOne From 97005559209b37d2cfd46f0e651b8f0a36f8a02e Mon Sep 17 00:00:00 2001 From: MacLemon Date: Wed, 21 Dec 2016 15:28:16 +0100 Subject: [PATCH 05/13] Linked to a list of identifying documents that are accepted be Deutsche Bahn for tickets. Thanks to @Katti. --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ab374fe..14de10f 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ This applies to the Congress Center as well as your hotel windows. ### Documents -- Train/plane tickets (including verification documents for self-printed DB tickets, like your credit card or Personalausweis) +- Train/plane tickets (including verification documents for self-printed DB tickets, like your credit card or Personalausweis[49].) - Congress tickets (printed or digital. iOS passbook/wallet, PDF) - Passport or other kind of photo ID (Personalausweis) - Driver's license (even an international one) @@ -614,6 +614,7 @@ These people have contributed to improve this list for everyone (in no particula - [raven][136] - [@trollkopp][137] - [@dot__not][138] +- [@Katti][139] ## Links @@ -696,4 +697,5 @@ These people have contributed to improve this list for everyone (in no particula [135]:https://twitter.com/cloelkes [136]:https://forestraven.net [137]:https://twitter.com/trollkopp -[137]:https://twitter.com/dot__not +[138]:https://twitter.com/dot__not +[139]:https://twitter.com/Katti From 355800a1319f1035ea3799061b1d2a5a7efaa7fb Mon Sep 17 00:00:00 2001 From: MacLemon Date: Thu, 22 Dec 2016 21:41:32 +0100 Subject: [PATCH 06/13] Added C3 Logistics Team --- CCCongress Info Channels.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CCCongress Info Channels.md b/CCCongress Info Channels.md index 26a912e..897db0d 100644 --- a/CCCongress Info Channels.md +++ b/CCCongress Info Channels.md @@ -19,13 +19,14 @@ 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 +- @[C3_LightningTLK] C3 Lighting talks organisation - @[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 -- @[C3_LightningTLK] C3 Lighting talks organisation - @[c3lingo] Translation and interpreter service - Volunteers welcome! +- @[c3logistic] C3 Logistics - @[c3noc] Network operation center - @[c3roc_] C3 Radio Operation Center - Frequency coordination for events - @[c3seidenstrasse] C3 pneumatic tube transport system @@ -42,7 +43,6 @@ Many CCC Events record videos of the given lectures and some event offer live [s - @[engelsystem] Engelsystem information system for chaos events - @[eventphone] DECT wireless phone network operations - [RSS]:https://en.wikipedia.org/wiki/Rss "Wikipedia: RSS" [Streaming]:https://streaming.media.ccc.de/ "C3VOC Streaming - LIVE!" @@ -57,6 +57,7 @@ Many CCC Events record videos of the given lectures and some event offer live [s [c3infodesk]:https://twitter.com/c3infodesk "Infodesk/Travelservice for CCC related events" [c3kidspace]:https://twitter.com/c3kidspace "C3 Kidspace" [c3lingo]:https://twitter.com/c3lingo "Translation and interpreter service" +[c3logistic]:https://twitter.com/c3logistic "C3 logistics" [c3noc]:https://twitter.com/c3noc "C3 network operation center" [c3roc_]:https://twitter.com/c3roc_ "Radio Operation Center - Frequency coordination for events" [c3seidenstrasse]:https://twitter.com/c3seidenstrasse "C3 pneumatic tube transport system" @@ -67,9 +68,9 @@ Many CCC Events record videos of the given lectures and some event offer live [s [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" -[congress_ios]:https://twitter.com/congress_ios "Congress App for iOS devices" [chaospatinnen]:https://twitter.com/chaospatinnen "Mentoring Operation Center" [chaosupdates]:https://twitter.com/chaosupdates "CCC Updates" +[congress_ios]:https://twitter.com/congress_ios "Congress App for iOS devices" [engelsystem]:https://twitter.com/engelsystem "Engelsystem information system for chaos events" [eventphone]:https://twitter.com/eventphone "DECT wireless phone network operations" From 075cf2d6119018dfda662869362d91f66a6abc06 Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Thu, 22 Dec 2016 21:54:06 +0100 Subject: [PATCH 07/13] Add 'silicone-based' as an option --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 14de10f..a57a2c4 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ Event and location related emergency information is in a seperate document for t - Tampons - Sanitary towels - Condoms, dental dams and other protective gear (Make sure the condoms are not beyond their usage date! (Yes, it really happens…)) -- Lubricant (water based to be compatible with condoms) +- Lubricant (silicone or water based, to be compatible with condoms) - Disinfectants - Soap - Deodorant, antiperspirant @@ -615,6 +615,7 @@ These people have contributed to improve this list for everyone (in no particula - [@trollkopp][137] - [@dot__not][138] - [@Katti][139] +- [joepie91][140] ## Links @@ -699,3 +700,4 @@ These people have contributed to improve this list for everyone (in no particula [137]:https://twitter.com/trollkopp [138]:https://twitter.com/dot__not [139]:https://twitter.com/Katti +[140]:https://cryto.net/~joepie91 From 2ca880e7ce5afb56cf55dac86a9a25fe5edb418a Mon Sep 17 00:00:00 2001 From: MacLemon Date: Fri, 23 Dec 2016 11:32:01 +0100 Subject: [PATCH 08/13] Fixed small lighters section with current flight regulation info and accepted ID documents when travelling with Deusche Bahn. --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 14de10f..2b90302 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Stuff that you're not allowed to bring on a plane or otherwise need to send via - Handcuffs -### Items *only* allowed in hand luggage, but *not* checked in luggage +### Items *only* allowed to be carried *on your body*, but *neither* in checked in luggage nor hand-lagguage. - Small lighters @@ -80,7 +80,7 @@ This applies to the Congress Center as well as your hotel windows. ### Documents -- Train/plane tickets (including verification documents for self-printed DB tickets, like your credit card or Personalausweis[49].) +- Train/plane tickets (including verification documents for self-printed DB tickets. Check the List of accepted documents! [Was ist als Identifizierungskarte zugelassen?][41].) - Congress tickets (printed or digital. iOS passbook/wallet, PDF) - Passport or other kind of photo ID (Personalausweis) - Driver's license (even an international one) @@ -646,7 +646,7 @@ These people have contributed to improve this list for everyone (in no particula [26]:https://play.google.com/store/apps/details?id=nerd.tuxmobil.fahrplan.congress [27]:https://github.com/tuxmobil/CampFahrplan [28]:https://itunes.apple.com/us/app/30c3-fahrplan-30c3-event-organizer/id764609606?mt=8 -[29]: http://en.wikipedia.org/wiki/Knife_legislation#Germany +[29]:http://en.wikipedia.org/wiki/Knife_legislation#Germany [30]:https://rad1o.badge.events.ccc.de/ "Rad1o Badge, CCCamp 2015" [31]:https://www.eventphone.de/wiki/index.php/DECT_Phone_Compatibility_List "Eventphone DECT handset compatibility list" [32]:https://www.youtube.com/watch?v=J0MUEqzWve8 "YouTube: B.O.O.K." @@ -658,6 +658,7 @@ These people have contributed to improve this list for everyone (in no particula [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" +[41]:https://www.bahn.de/hilfe/view/pk/de/ticketbuchung/identifizierungskarte.shtml "Deutsche Bahn: Was ist als Identifizierungskarte zugelassen?" [100]:https://twitter.com/Astarioth [101]:https://twitter.com/N4mes From e281247a65d666e83acde5545801ec9ff55ee3a2 Mon Sep 17 00:00:00 2001 From: MacLemon Date: Fri, 23 Dec 2016 12:11:19 +0100 Subject: [PATCH 09/13] Eeek, a typo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b90302..255859e 100644 --- a/README.md +++ b/README.md @@ -563,7 +563,7 @@ If you need help with buying a SIM card, ask a local for assistance. They're fri ## Staying up-to-date -Most events publich a lot of information about events as they happen. There are many ways to stay in the loop during the event or in between by subscribing to RSS feeds, Twitter accounts, mailing lists and even newsletters [sic]. +Most events publish a lot of information about events as they happen. There are many ways to stay in the loop during the event or in between by subscribing to RSS feeds, Twitter accounts, mailing lists and even newsletters [sic]. For a list of CCC related news sources you may be interested in following, see CCCongress.md in this repository. From 67e6dbbfbc43905f7ccc3566c73aeb8dafa70042 Mon Sep 17 00:00:00 2001 From: jomo Date: Fri, 23 Dec 2016 16:43:18 +0100 Subject: [PATCH 10/13] Stickers! how was this not in here yet? --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 255859e..9846cb5 100644 --- a/README.md +++ b/README.md @@ -457,6 +457,7 @@ Check out the [USB-C cable matrix][36] on what a certain manufacturer's cable ac - A pillow (and sleeping bag/camping mat if you intend to sleep at the gym or in heaven) - Velcro straps to mount things to other things or people to things - Your favourite tea/coffee for [Coffeenerds][39] +- All the stickers to trade and give away! @@ -615,6 +616,7 @@ These people have contributed to improve this list for everyone (in no particula - [@trollkopp][137] - [@dot__not][138] - [@Katti][139] +- [jomo][140] ## Links @@ -700,3 +702,4 @@ These people have contributed to improve this list for everyone (in no particula [137]:https://twitter.com/trollkopp [138]:https://twitter.com/dot__not [139]:https://twitter.com/Katti +[140]:https://twitter.com/0xjomo From 1694e3465526d891aca81e4df85dba350399e70e Mon Sep 17 00:00:00 2001 From: MacLemon Date: Sun, 25 Dec 2016 11:16:32 +0100 Subject: [PATCH 11/13] Added Flip Flops for shared showers --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 255859e..2f31686 100644 --- a/README.md +++ b/README.md @@ -126,6 +126,7 @@ Event and location related emergency information is in a seperate document for t - Tooth brush (plus charger if it is an electrical one) - Toothpaste - Shower gel +- Flip Flops for shared showers - Shampoo (to avoid bad hair days) - Conditioner - Tampons From 013730c0e12bc30eb213e05408f3871e31fa88c0 Mon Sep 17 00:00:00 2001 From: sandzwerg Date: Sun, 25 Dec 2016 15:26:37 +0100 Subject: [PATCH 12/13] Added Awareness Team to Emergency Info For the 33c3 the Awareness Team is again available under DECT 113 --- 33C3 Emergency Info.md | 1 + 1 file changed, 1 insertion(+) diff --git a/33C3 Emergency Info.md b/33C3 Emergency Info.md index 72c93b8..c0954aa 100644 --- a/33C3 Emergency Info.md +++ b/33C3 Emergency Info.md @@ -6,6 +6,7 @@ If you need help, just call for help, there are many, many friendly people aroun * 33c3 Medical Emergency or in case of fire: Call local DECT 112 (CERT) * 33c3 Security: Call local DECT 110 +* 33c3 Awareness: Call local DECT 113 * 33c3 organizers: 33c3-orga@cccv.de * local law enforcement in Hamburg: 110 or +49 40 4286 - 51410 * local sexual assault hotline in Hamburg: +49 40 - 255566 (http://www.frauennotruf-hamburg.de) From b9f8cc08e38bd1cf3838594c6c69bbaf35b66044 Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 25 Dec 2016 16:28:14 +0100 Subject: [PATCH 13/13] Added link for the power-saving feature --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2f31686..4bae422 100644 --- a/README.md +++ b/README.md @@ -257,7 +257,7 @@ For travelling abroad there is a handy [World Electrical Plug & Socket Map][40] - Smart Watches - Charging cable or docking station required to charge - A portable battery pack (aka powerbank) so you can charge on the go. (And the necessary cable to recharge that battery pack overnight. A USB-A to micro USB cable in most cases, maybe already a USB-C cable as well.) -- A spare plastic card to fool the power-saving system in your hotel room, while you're not there. (So your gear can charge and the LEDs keep blinking.) +- A spare plastic card to [fool the power-saving system][140] in your hotel room, while you're not there. (So your gear can charge and the LEDs keep blinking.) #### Laptop and Devices @@ -268,7 +268,7 @@ For travelling abroad there is a handy [World Electrical Plug & Socket Map][40] - For devices with private information be sure to encrypt them! (VeraCrypt, GPG, FileVault, EncFS, Bitlocker, gbde, geli, dm-crypt, LUKS, eCryptFS) - Make a GPT Label or Volume label with your online nickname or handle because people can't read your owner.txt file on encrypted devices. You may also create multiple partitions (plaintext and encrypted ones). - make note of the filesystem used so you know if they will work on the system of the person you want to exchange data with. (FAT32 is a safe bet to work everywhere, for larger files ExFAT should also work on most platforms.) - - Mac: NTFS can be read, but not written to without 3rd party software. FAT, ExFAT, HFS+(J), HFSX are fine for current OS X versions, ZFS, Ext2/Ext3/Ext4 and NTFS r/w support need 3rd party software. APFS support is experimental in macOS 10.12 Sierra and available from the command line only. + - Mac: NTFS can be read, but not written to without 3rd party software. FAT, ExFAT, HFS+(J), HFSX are fine for current OS X versions, ZFS, Ext2[/Ext3/Ext4 and NTFS r/w support need 3rd party software. APFS support is experimental in macOS 10.12 Sierra and available from the command line only. - USB/Thunderbolt/USB-C to Ethernet RJ45 adapter, if your device needs one (for example thin notebooks) - Mass storage devices (bring some empty ones to fill with data and/or bring your own data and share it!) - Tablet computer, iPad, Android tablet, Microsoft surface @@ -701,3 +701,4 @@ These people have contributed to improve this list for everyone (in no particula [137]:https://twitter.com/trollkopp [138]:https://twitter.com/dot__not [139]:https://twitter.com/Katti +[140]:http://travel.stackexchange.com/questions/55409/what-is-the-hotel-room-card-slot-inside-the-room-for