Commit graph

233 commits

Author SHA1 Message Date
Stefan Kaufmann 075cf1777a grml markup 2014-12-24 12:37:25 +01:00
Stefan Kaufmann 39b4c8f79c knife legislation and purpose for securing devices 2014-12-24 12:34:44 +01:00
Pepi Zawodsky 07b85c31a7 merged johnjohndoe-patch-1 2014-12-24 01:36:56 +01:00
Pepi Zawodsky 7eb2ad5c78 Cleaned up a few links 2014-12-24 01:27:30 +01:00
Pepi Zawodsky 409206dda8 Merge pull request #24 from qsuscs/patch-1
Store backups somewhere else (Offsite Backups, Offsite of Congress that is.)
2014-12-24 01:10:06 +01:00
Pepi Zawodsky 551cccf158 Merge pull request #22 from azet/master
add throwing star lan tap and SDR equipment
2014-12-24 01:03:47 +01:00
Thomas Schneider 52b21bbf3b Store backups somewhere else
Signed-off-by: Thomas Schneider <thosch97@gmail.com>
2014-12-24 00:42:17 +01:00
Tim Weber 2e1b1e75b4 Suggest marking stuff with one’s name
Wasn’t quite sure where to put this, but it fits even worse under “things to pack”, “gear” or “securing your devices”.
2014-12-24 00:28:00 +01:00
Aaron Zauner 7c8bb145a0 pineappleboard, ethernet switch, sdr equipment 2014-12-21 06:25:56 +01:00
Aaron Zauner 20d78498ec add throwing star lan tap 2014-12-21 06:21:55 +01:00
Peter Grassberger 6ae228ab7f move dog subsection out of devices section 2014-12-14 18:12:11 +01:00
Tobias Preuss 490582462d Add Fahrplan apps. 2014-12-13 17:41:48 +01:00
Pepi Zawodsky 57fafc6871 Corrected misssorted MarkDown Link indices 2014-12-12 21:16:28 +01:00
Pepi Zawodsky 14c817993a Moved Survival Guide to the 2014 wiki 2014-12-12 21:12:28 +01:00
Pepi Zawodsky 9a2f18e5b1 Merge pull request #19 from schwindp/patch-1
Transferring wiki links towards 2014
2014-12-12 21:06:56 +01:00
Pepi Zawodsky c21ccea1e6 Bring ALL the LED strips to illuminate building's windows 2014-12-12 21:02:48 +01:00
Peter Schwindt 4a5c54a032 Transferring wiki links towards 2014 2014-12-02 07:02:09 +01:00
Pepi Zawodsky 9a2878def7 Added some more cosmetics thanks to Sarah 2014-12-02 00:57:11 +01:00
engeld 1d08d09f07 replaced 30c3 with 31c3 2014-11-24 15:45:12 +01:00
Columbia19 cb5e625276 Update README.md
added tweezers to the cosmetics section
added section at the end "if you travel with your dog"
2014-07-27 14:57:07 +02:00
Pepi Zawodsky b1d9b0b57f Added the term powerbank to portable battery packs. 2014-02-10 20:03:51 +01:00
Pepi Zawodsky 5efd82e2b8 Added RobFog to credits.x 2014-02-05 13:20:09 +01:00
Robbie d0520b8df3 Update README.md
Fix a bunch of typos which irked me.
2014-01-18 01:36:23 +01:00
Pepi Zawodsky 75324a2dd1 Added german law regulations about pocket knifes as provided by n0la 2014-01-02 01:34:46 +01:00
Pepi Zawodsky e25f6221dd Merge pull request #12 from KwadroNaut/master
sp
2013-12-26 01:12:19 -08:00
Pepi Zawodsky a42973e782 Merge pull request #13 from PeterTheOne/patch-1
fix typo: the -> they
2013-12-26 01:10:06 -08:00
Cheatha bb60599a4f Added blanket
Suggestion by FrauFledermaus
2013-12-25 12:27:57 +01:00
Cheatha 1bf319f167 Added health insurance card
Suggestion by FrauFledermaus
2013-12-25 12:27:27 +01:00
Cheatha acf1b0270e Added organ donor card 2013-12-25 12:25:12 +01:00
Peter Grassberger 3022e8325b fix typo: the -> they 2013-12-25 01:34:24 +01:00
KwadroNaut ae61329297 More spelling and clarification, dirty clothes bag
Dirty clothes bag shouldn't be from plastic: things get smelly in there without air. But plastic bags can be handy for your swimming gear on the last day, so either get both or make up your mind and think which one is good for you.
2013-12-24 23:55:23 +01:00
KwadroNaut 16618c9c83 sp 2013-12-24 23:42:21 +01:00
zakx 194cae3a75 removed advice to use GSM for emergency numbers 2013-12-24 00:43:45 +01:00
Pepi Zawodsky 272e0bbb41 Added @ccc to list of contributing people. Thanks 2013-12-16 21:05:25 +01:00
Pepi Zawodsky 72cb105fa3 Updated Fahrplan link for 30C3 and removed inactive DECT numbers. Thanks @ccc for checking this. 2013-12-16 21:04:43 +01:00
Pepi Zawodsky fd90f944ad Updated Link to Anti-Harrassment Policy Wiki Page 2013-12-16 20:22:11 +01:00
Pepi Zawodsky 76aa41d7df Fixed a comment. 2013-12-16 20:21:07 +01:00
Pepi Zawodsky 62aa32be04 Added links to most VPN suggestions 2013-12-16 19:50:29 +01:00
Pepi Zawodsky d5f918569e Use TLS on your servers 2013-12-16 19:29:55 +01:00
Pepi Zawodsky d5c1e5460c Added manual GSM network selection 2013-12-16 19:10:15 +01:00
Pepi Zawodsky 62c9f812fa Merge pull request #10 from stefan2904/patch-1
added think notebook, raspberry and wiki stuff
2013-12-16 09:48:52 -08:00
Pepi Zawodsky 990457b084 Share your VPN servers with those in need 2013-12-16 18:47:55 +01:00
Pepi Zawodsky cf6b7035fd Added more examples for disk encryption 2013-12-16 18:44:29 +01:00
Pepi Zawodsky 2e5f85d029 Added more info on extension cords and multi-outlet strips 2013-12-16 18:41:27 +01:00
Pepi Zawodsky 6fea71f685 Updated How to survive link. 2013-12-16 18:23:58 +01:00
Stefan ada67a70d3 fixed ellipsis 2013-12-12 10:31:59 +01:00
Stefan 8e353912f0 USB/Thunderbolt to Ethernet 2013-12-12 10:28:45 +01:00
Stefan 8ee9a57fe3 replaces rpi with all your devices 2013-12-12 10:26:44 +01:00
Stefan 6b6e37c048 congress wiki 2013-12-10 16:29:01 +01:00
Stefan c0c804275d lowercased 2013-12-10 15:33:42 +01:00
Stefan 8c7d6e8b45 more network stuff 2013-12-10 15:28:30 +01:00
Stefan 80ae695501 added Raspberry 2013-12-10 15:11:33 +01:00
Aaron Zauner 9badc3fc9b add: water plants, rs232<->usb, camomile tea for stomach, 2013-11-10 22:29:46 +01:00
Pepi Zawodsky 8c25eeb809 Corrected markdown link for blau.de 2013-11-10 20:28:43 +01:00
Pepi Zawodsky 075979a2e2 Slightly improved credits section and upgraded links to https where possible. 2013-11-10 20:15:04 +01:00
Pepi Zawodsky 96162f4407 Started section about PrePaid SIM cards 2013-11-10 20:08:25 +01:00
Pepi Zawodsky 29a1a89a80 Bring a real book 2013-11-10 20:03:57 +01:00
Pepi Zawodsky bd6c54c4e1 Test your backups 2013-11-10 20:01:51 +01:00
Pepi Zawodsky 348d8e1b9d Added comments to links that need updating once they become available in a 30C3 flavour 2013-11-10 19:58:38 +01:00
Pepi Zawodsky a653323502 Corrected even more typos. This is becoming embarrassing. 2013-11-10 19:54:54 +01:00
Pepi Zawodsky 7ba294074e Improved generic medication section with more product names for non-german speaking attendees. 2013-11-10 19:50:16 +01:00
Pepi Zawodsky b702561791 Another typo corrected 2013-11-10 19:37:48 +01:00
Pepi Zawodsky ec8a773fca Corrected a typo 2013-11-10 19:35:00 +01:00
Pepi Zawodsky 76568be18a Encrypt your Bitcoin wallets 2013-11-10 19:34:12 +01:00
Pepi Zawodsky d9286d2b93 Backup ALL your devices 2013-11-10 19:33:18 +01:00
Pepi Zawodsky 557311586e Less negations for easier reading, though more sophisticated vocabulary used. 2013-11-10 19:30:42 +01:00
Pepi Zawodsky 27e39f1abf Pull requests are welcome 2013-11-10 19:26:32 +01:00
Peter Schwindt 2ded7c2c2b Initial 30C3 changes
according to information found at
https://events.ccc.de/congress/2013/wiki/Static:Safety_and_Security
2013-10-08 19:13:38 +02:00
Pepi Zawodsky 46a2e51779 Added Ukulele and electronic tuner suggested by @nic_ko 2013-10-08 19:04:31 +02:00
Pepi Zawodsky 228afa6fe4 Added SSHuttle to tunneling solutions suggested by badboy 2013-10-08 19:04:30 +02:00
Pepi Zawodsky f2a3a485c4 Added: knitting stuff and credits for anked 2013-10-08 19:04:30 +02:00
Pepi Zawodsky 204ecf9116 Typo corrected 2013-10-08 19:04:30 +02:00
Pepi Zawodsky e4c208cb50 Added: Hint about power chords without needing an adapter. 2013-10-08 19:04:30 +02:00
Pepi Zawodsky c19f1045d5 Corrected Typos spotted by Uliwitness 2013-10-08 19:04:30 +02:00
Pepi Zawodsky 8c1ad36c99 Added credits for kjellski 2013-10-08 19:04:30 +02:00
Kjellski 2d2f9548eb added direct conference schedule link 2013-10-08 19:04:30 +02:00
Kjellski ef79a1c112 added train schedule informations 2013-10-08 19:04:30 +02:00
Kjellski 52b0da5d1f Added schedule section 2013-10-08 19:04:30 +02:00
Pepi Zawodsky d0d3ed6f8d Merge pull request #6 from schwindp/master
Some last-minute additions
2012-12-25 23:05:21 -08:00
Pepi Zawodsky 3f958c25f7 Added: Remotes, corrected typos 2012-12-26 08:01:54 +01:00
Pepi Zawodsky 9c70b60aa8 Added: Swimming stuff 2012-12-26 07:58:09 +01:00
Peter Schwindt e090501960 Some last-minute additions
Like typos and testing restore (!)
2012-12-26 07:51:34 +01:00
Pepi Zawodsky 95acf51887 Added: duct/gaffer tape 2012-12-26 02:04:52 +01:00
Pepi Zawodsky 5d9d965c34 Added: Cable ties 2012-12-26 02:03:19 +01:00
Pepi Zawodsky 89cd771c08 Added: More STD prevention tips, muscial instruments 2012-12-26 01:43:34 +01:00
Pepi Zawodsky f9e17fee71 Added credit for fin 2012-12-26 01:38:30 +01:00
Pepi Zawodsky c11c6ec643 Improved formatting 2012-12-26 01:37:56 +01:00
Pepi Zawodsky 7434d219bf Added: STD prevention tips 2012-12-26 01:21:52 +01:00
Pepi Zawodsky 00e6a57bf8 Merge pull request #5 from Monikae/patch-1
STD prevention
2012-12-25 16:18:51 -08:00
Pepi Zawodsky 0aad8c5a6f Amended Phone security section with tor for iOS. 2012-12-26 01:12:15 +01:00
Monikae c4264f2076 Update README.md 2012-12-26 01:06:33 +01:00
Pepi Zawodsky 38e6ccf34f Fixed link. 2012-12-26 01:04:32 +01:00
Pepi Zawodsky c831a076f2 Added: stuff for people wearing contact lenses or glasses, towels, phone security tips and more credits for contributions 2012-12-26 01:02:14 +01:00
Pepi Zawodsky 6f5082a3aa Merge pull request #3 from oe1rfc/master
DVB-T dongle and a phone security section added.
2012-12-25 15:56:51 -08:00
Pepi Zawodsky 835232c46f Merge pull request #4 from MarioVilas/master
Towel.
2012-12-25 15:54:58 -08:00
Pepi Zawodsky 7169f397e0 Merge pull request #2 from schwindp/master
Emergency contact fixes
2012-12-25 15:54:21 -08:00
Mario Vilas 0167141fb3 Update README.md
42
2012-12-26 00:11:06 +01:00
Pepi Zawodsky 881741815d Added: Gloves, scarf, lip(stick|balm|gloss) 2012-12-25 22:39:38 +01:00
Clemens Hopfer 755dec1a42 fixed link, now for real 2012-12-25 22:04:56 +01:00
Clemens Hopfer f6d793a094 fixed link 2012-12-25 22:03:50 +01:00
Clemens Hopfer b60750c8f5 Merge remote-tracking branch 'upstream/master' 2012-12-25 22:00:56 +01:00
Clemens Hopfer 6eb49bedda added DVB-T dongle 2012-12-25 21:58:06 +01:00
Clemens Hopfer 1b536b4d72 added phone security section 2012-12-25 21:57:05 +01:00
Pepi Zawodsky b05ccda72b Added: plastic bag for laundry 2012-12-25 21:07:51 +01:00
Pepi Zawodsky 365ff304cd Added: SIM eject tool 2012-12-25 21:04:28 +01:00
Pepi Zawodsky b8ca055779 Added: SIM cards 2012-12-25 21:03:56 +01:00
Pepi Zawodsky a54d6fc769 Link corrected 2012-12-25 20:43:33 +01:00
Pepi Zawodsky 0a8acb87b3 Corrected a typo in a contributor's handle. I'm sorry 2012-12-25 20:42:57 +01:00
Pepi Zawodsky 05df2cdaa3 Corrected a typo. 2012-12-25 20:38:22 +01:00
Peter Schwindt e7a602e90f Emergency contact fixes
added local 112 (CERT contact), removed duplicate Police Department
contact
2012-12-25 20:35:49 +01:00
Pepi Zawodsky e4ada93373 Added micro USB cable hint to r0cket. 2012-12-25 20:09:32 +01:00
Pepi Zawodsky b9ee8d54c7 Fixed my merge foobar. Added better linking to Schuko plugs. 2012-12-25 20:07:40 +01:00
Pepi Zawodsky 8f23f3c585 Added: HAM radio equipment 2012-12-25 20:04:06 +01:00
Pepi Zawodsky 7bcb1e55fe Merge pull request #1 from devdsp/master
Just checking off the pull request item :)
2012-12-25 11:02:46 -08:00
Adam Thomas e68f697fa9 Further notes on apologies. 2012-12-25 18:55:04 +00:00
Pepi Zawodsky 28d451d5c5 Added: HAM radio equipment 2012-12-25 19:53:44 +01:00
Adam Thomas 894c3b8345 Added plug adaptor 2012-12-25 18:49:33 +00:00
Adam Thomas fd5582dd95 Added hackerspace passport 2012-12-25 18:48:12 +00:00
Pepi Zawodsky c161432deb Added: comfortable shoes 2012-12-25 19:35:58 +01:00
Pepi Zawodsky 4a16e02afe Added: Bepanthen, Lubricant 2012-12-25 19:33:29 +01:00
Pepi Zawodsky 7ebd1587b7 Added hint to refresh the list as it is WIP. 2012-12-25 19:31:12 +01:00
Pepi Zawodsky bf4850d7a1 Added: portable battery packs 2012-12-25 19:26:30 +01:00
Pepi Zawodsky ca5015bd80 Added tablet computers and kindle 2012-12-25 19:25:04 +01:00
Pepi Zawodsky 5c5ec88ff1 added Monitor adapters by @michaelem 2012-12-25 19:23:48 +01:00
Pepi Zawodsky 27be590fb3 Added: r0cket by @towo 2012-12-25 19:20:41 +01:00
Pepi Zawodsky c7064f8908 Added @N4mes to credits 2012-12-25 19:14:38 +01:00
Pepi Zawodsky bce9b38f2f Removed homeopathic stuff. Grab a dextrose bonbon instead. 2012-12-25 19:13:58 +01:00
Pepi Zawodsky 69f93ca730 Added credits for contributing parties 2012-12-25 19:12:41 +01:00
Pepi Zawodsky 038bd55c91 Improved formatting of emergency information 2012-12-25 18:55:01 +01:00
Pepi Zawodsky 44c9bd7bb9 Added Emergency contact information, please add more 2012-12-25 18:50:38 +01:00
Pepi Zawodsky e242dfcb5a Added 29C3 Anti Harrassment Policy link 2012-12-25 18:46:30 +01:00
Pepi Zawodsky f78fce6b92 Added a gazillion things to to, to pack, and more 2012-12-25 18:42:20 +01:00
Pepi Zawodsky 2c5c7ae404 initial checkin 2012-12-25 17:37:52 +01:00