Commit graph

430 commits

Author SHA1 Message Date
Pepi Zawodsky
2e6024626a
Merge pull request #116 from Rntin/master
Cyborg necessities and Link updates
2023-12-23 14:30:23 +01:00
FlorentinAldenhoevel
bf92d24730 Update links
Changend links in "Things to do before traveling" to the equivalent 37c3 wiki links
2023-12-21 21:26:50 +01:00
FlorentinAldenhoevel
92ce406f19 Add Glass Eye to packing list
So I can remember, despite being dumb
2023-12-21 21:25:22 +01:00
MacLemon
44719e3e1b Replaced World map of electrical plugs and sockets. Fixes #108 2023-08-11 12:25:26 +02:00
Pepi Zawodsky
9250cfcdd4
Merge pull request #109 from kbroulik/fix-db-accepted-idcards
Fix dead link to Deutsche Bahn accepted ID cards
2023-08-11 12:21:40 +02:00
Kai Uwe Broulik
4da52ac34b Fix dead link to Deutsche Bahn accepted ID cards 2023-08-05 13:06:16 +02:00
Pepi Zawodsky
9837e217e0
Merge pull request #107 from Phil5555/master
Added Covid-19 equipment
2023-06-25 22:05:01 +02:00
Phil5555
7ffc59a64d
Added Covid-19 equipment. (Bit late, but GPN21 recommends daily tests and masks) 2023-06-07 22:32:53 +02:00
Pepi Zawodsky
9007f1ee1e
Merge pull request #106 from rixx/patch-1
Link to camping checklist
2022-06-14 22:06:54 +02:00
Tobias Kunze
123fc5de27
Link to camping checklist 2022-06-01 00:57:20 +02:00
Pepi Zawodsky
29ae98e2f4
Merge pull request #105 from alexrashed/wifi-connections
Add section to disabale automatic WIFI connections
2021-01-25 16:43:53 +01:00
Alexander Rashed
8303c417fb Add section to disabale automatic WIFI connections
Learned that the hard way on 36C3.
Malicous networks with popular public SSIDs are quite common (and
insanely simple to execute).
2021-01-06 16:41:31 +01:00
Pepi Zawodsky
f159df8fd2
Merge pull request #104 from patrislav1/fix-typo 2019-12-29 01:31:39 +01:00
Patrick Huesmann
45cbc6d6e0
Fix typo 2019-12-26 12:26:09 +01:00
Pepi Zawodsky
2f9084b123
Merge pull request #103 from xpac1985/patch-1 2019-12-26 02:03:53 +01:00
xpac1985
f1725635af
Updated some CERT info 2019-12-25 13:36:36 +01:00
MacLemon
3ffa4fbdfa Updated a few cable types, added RC model section 2019-12-19 19:24:38 +01:00
MacLemon
f2000c448c Added Card10 Badge to Hardware as suggested by Displayfreak 2019-12-19 18:47:15 +01:00
Pepi Zawodsky
f2c5c46e10
Merge pull request #99 from eest9/master
Update README.md
2019-12-19 18:42:25 +01:00
Pepi Zawodsky
e2a922908b
Merge pull request #98 from zivillian/patch-1
update eventphone links
2019-12-19 18:40:03 +01:00
Pepi Zawodsky
7170767fbc
Merge branch 'master' into patch-1 2019-12-19 18:39:43 +01:00
Pepi Zawodsky
2bbc496c5f
Merge pull request #100 from lucaswerkmeister/emergency
Update emergency info document
2019-12-19 18:37:19 +01:00
Pepi Zawodsky
fc74d13db3
Merge pull request #101 from schumar/master
Update URLs for 36C3
2019-12-19 18:35:13 +01:00
Martin Schuster
9e22cc0401 Update URLs for 36C3 2019-12-19 15:28:06 +01:00
Lucas Werkmeister
dd10d5c31a Update emergency info document
I checked that everything’s still up to date; sources:

* DECT numbers and orga email:
  https://events.ccc.de/congress/2019/wiki/index.php/Static:Safety_and_Security
* Police: https://www.polizei.sachsen.de/de/16342.htm
* Frauennotruf: http://www.frauennotruf-leipzig.de/
* Fire department:
  https://www.leipzig.de/buergerservice-und-verwaltung/sicherheit-und-ordnung/feuerwehr/
* Ambulance:
  https://www.leipzig.de/buergerservice-und-verwaltung/sicherheit-und-ordnung/feuerwehr/rettungsdienst/
2019-12-18 18:39:38 +01:00
Erwin Ernst Steinhammer
aeaa929939
Update README.md 2019-12-18 09:47:03 +01:00
zivillian
b4baa03b0a
update eventphone links 2019-12-04 19:52:32 +01:00
Pepi Zawodsky
b82679f110
Merge pull request #96 from karottenbaum/master
Spelling and style improvements
2019-10-29 22:49:18 +01:00
Pepi Zawodsky
1419917e46
Merge pull request #95 from BenWiederhake/master
Update infos, fix formatting, fix typos
2019-10-29 22:47:32 +01:00
karottenbaum
57579674e8
minor spelling and style corrections 2019-10-26 17:11:50 +02:00
Ben Wiederhake
ad78b379b4 Update link to sshuttle 2019-10-25 22:14:11 +02:00
Ben Wiederhake
1b21d8d50e Formatting 2019-10-25 21:39:26 +02:00
Ben Wiederhake
f9661fede7 Typos; credits go to codespell 2019-10-25 20:50:56 +02:00
Ben Wiederhake
5ee56a4af2 Nail files can save lifes, but are forbidden 2019-10-25 20:48:51 +02:00
Pepi Zawodsky
18d41a05ae
Merge pull request #94 from telegnom/master
@c3infodesk@chaos.social added
2019-10-01 21:17:57 +02:00
telegnom
9cc8a16b87 @c3infodesk@chaos.social added 2019-10-01 17:17:49 +02:00
Pepi Zawodsky
f6d899a365
Merge pull request #93 from stefan2904/patch-2
no one likes darktard at camp
2019-09-07 19:21:52 +02:00
Stefan
010d14fb11
no one likes darktard at camp 2019-08-09 17:52:33 +02:00
Pepi Zawodsky
ae20699b04
Merge pull request #90 from FreifunkerEZ/patch-1
Started Humans/Children
2019-08-01 19:39:04 +02:00
Pepi Zawodsky
aa4a0b0e9b
Merge pull request #91 from FreifunkerEZ/patch-2
clean your coffee-machine before you leave
2019-08-01 19:38:23 +02:00
Pepi Zawodsky
ffb0e3aeef
Merge pull request #92 from JackFy/master
Fixed r0ket.de Link
2019-08-01 19:38:00 +02:00
JackFy
cac221a38b
Fixed r0ket.de Link 2019-07-30 14:20:11 +02:00
Chris
f0782a77a1
Typo in humans/children 2019-07-26 13:06:28 +02:00
Chris
9fa4f00f22
clean your coffee-machine before you leave
or else: mold.
2019-07-26 12:05:14 +02:00
Chris
9db621aaa2
Started Humans/Children 2019-07-26 12:03:11 +02:00
Pepi Zawodsky
0fa79c2ff1
Merge pull request #89 from peterpoetzi/master
Update Hoverboard rule
2019-04-17 19:37:47 +02:00
Peter Pötzi
f553468200
Update README.md 2019-04-17 15:23:48 +02:00
Pepi Zawodsky
b6ec896cbd
Merge pull request #87 from genofire/patch-1
update decentral social networks
2019-01-04 19:24:04 +01:00
Pepi Zawodsky
6fb44779d2
Merge pull request #86 from TheMinefighter/master
Added batteries >=100Wh to the list of things forbidden on planes
2019-01-04 19:22:59 +01:00
Pepi Zawodsky
c17f400b3b
Merge pull request #85 from alexrashed/travel-by-car
Infos about travelling by car
2019-01-04 19:21:57 +01:00