Compare commits

..

No commits in common. 'master' and '2016' have entirely different histories.
master ... 2016

@ -36,7 +36,6 @@ margin: 0 auto;
} }
.belinLogo{ .belinLogo{
width: 200px; width: 200px;
display: inline-block;
} }
h2{white-space: normal;} h2{white-space: normal;}

@ -1,32 +1 @@
# Berlin, 29-30 april 2016 # Berlin, 29-30 april 2016
## Venue
[Spektrum Berlin](https://www.openstreetmap.org/node/2688963276)
Bürknerstraße 12 12047 Berlin
[http://spektrumberlin.de/home.html](http://spektrumberlin.de/home.html)
## Day one schedule
Morning (9-13)
Decentralized networking sessions
Lunch pause (13 - 14)
Afternoon (14 - 18)
Talks (order not defined yet)
[peergos](https://git.cryto.net/Squatconf/Talks/src/master/accepted/day1/peergos.md)
[Anarchitecture](https://git.cryto.net/Squatconf/Talks/src/master/accepted/day1/anarchitecture.md)
[PC20](https://git.cryto.net/Squatconf/Talks/src/master/accepted/day1/pc20.md)
[Federated Wiki intro](https://git.cryto.net/Squatconf/Talks/src/master/accepted/day1/federated.md) + workshop
[mayday demonstrations 101](https://pad.ijhack.nl/p/squatconf-workshops)
## Day 2 Schedule (Saturday 30th)
[pad for (almost) finalised schedule](https://pad.ijhack.nl/p/squatconf-schedule)

@ -17,31 +17,50 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="span3 leftCol"> <div class="span3 leftCol">
{{!--<div class="formCont"> <div class="formCont">
<fieldset> <fieldset>
<legend>TALKS</legend> <legend>TALKS</legend>
<div> <div>
<a href="https://git.cryto.net/Squatconf/Talks/src/master/accepted" target="_blank"> <a href="https://git.cryto.net/Squatconf/Talks/src/master/accepted">
<button type="submit" class="btn">Talks</button> <button type="submit" class="btn">Talks</button>
</a> </a>
</div> </div>
</fieldset> </fieldset>
</div>
<br />
<div class="formCont">
<fieldset> <fieldset>
<legend>Venue</legend> <legend>BE PART OF IT</legend>
<label class="text-info">Lightning talks submission</label>
<div> <div>
<a href="https://www.openstreetmap.org/node/2688963276" target="_blank"> <a href="https://pad.ijhack.nl/p/squatconf-lightning">
<button type="submit" class="btn">Spektrum Berlin</button> <button type="submit" class="btn">Lightning talks</button>
</a> </a>
</div> </div>
<label class="text-info">Send us your talk proposal</label>
<div>
<a href="https://pad.ijhack.nl/p/squatconf-cfp">
<button type="submit" class="btn">Pad</button>
</a>
</div>
<a href="mailto:talks@squatconf.eu">
<button type="submit" class="btn">Email</button>
</a>
<a href="https://git.cryto.net/Squatconf/Talks/pulls">
<button type="submit" class="btn">pull request</button>
</a>
<div id="status-msg">&nbsp;</div>
<span class="help-block">
You can either send us a pull request, write on the pad or send an email, if you have a talk to propose.
</span>
</fieldset> </fieldset>
</div> </div>
<br />--}} <br />
<div class="formCont"> <div class="formCont">
<fieldset> <fieldset>
<legend>JOIN US</legend> <legend>JOIN US</legend>
<label class="text-info">Squatconf's mailing list</label> <label class="text-info">Squatconf's mailing list</label>
<a href="https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/squatconf" target="_blank"> <a href="https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/squatconf">
<button type="submit" class="btn">Subscribe</button> <button type="submit" class="btn">Subscribe</button>
</a> </a>
<div id="status-msg">&nbsp;</div> <div id="status-msg">&nbsp;</div>
@ -103,16 +122,16 @@
[__)(/,[ ||[ ) [__)(/,[ ||[ )
<br></pre> <br></pre>
</div> </div>
{{!--<div class="page-header"> <div class="page-header">
{{md "src/header.md"}} {{md "src/header.md"}}
</div>--}} </div>
<div> <div>
{{md "src/index.md"}} {{md "src/index.md"}}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<br><br><br>
<div class="parisCont"> <div class="parisCont">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@ -120,7 +139,6 @@
<div class="span9"> <div class="span9">
<div id="logo-wrapper"> <div id="logo-wrapper">
<div id="logoCont"> <div id="logoCont">
<img src="assets/img/squatconf_baguette.svg" alt="" class="belinLogo"/>
<img src="assets/img/squatconf2016Berliner.svg" alt="" class="belinLogo"/> <img src="assets/img/squatconf2016Berliner.svg" alt="" class="belinLogo"/>
</div> </div>
</div> </div>

@ -1,9 +1,7 @@
## What is SquatConf? It started in Paris Nov 2014 ... ## What is SquatConf? It started in Paris Nov 2014 ...
Squatconf happened in November 2014 in "Le Hangard" a squat in Paris, hence the name. Squatconf happened in November 2014 in Paris in a squat, hence the name.
We had a second one happening in Berlin in April 2016 at [Spektrum][1]. It wasn't your typical IT conference because it was mostly Just-in-Time-organized
They were not your typical IT conferences because it was mostly Just-in-Time-organized
by all the people who attend. There were no advertisements from Silicon by all the people who attend. There were no advertisements from Silicon
Valley companies (or any others) and several people felt free to give somewhat Valley companies (or any others) and several people felt free to give somewhat
radical talks on technologies and society, even openly associate with radical talks on technologies and society, even openly associate with
@ -12,10 +10,41 @@ Crypto, decentralized tech demos, internet of things, automatic garden
planting systems and what not. And we had many personal conversations planting systems and what not. And we had many personal conversations
among each other which continue to this day. among each other which continue to this day.
## ... Squatconf never stop ## ... and now we go to Berlin end april 2016!
We want to make another Squatconf happening happen around
end April 2016 in Berlin. Timing wise it's next to "re:publica" so that
researchers and others who are going to this business conference can also
drop by at squatconf to participate in a more independent event.
Berlin has gotten quite trendy, more expensive and squatting
is much less happening than it used to. But there still is lots of life
and lazyness which hasn't been fully occupied by world-wide-capitalism
yet.
## Money and time
Whatever we need money wise we'll pay for it by asking
for donations by all who come. We'd like to keep it a somewhat small
no-entrance-fee conference, collectively organized by those who attend,
with a personal atmosphere. Besides listening to good talks you can
also have interesting conversations while preparing food for all in the
kitchen. We'd like nobody to get overly stressed which can happen all
too easily if single individuals feel responsible for collective
outcomes. The most important commitment when coming to Squatconf is our
time and dedication to create a space where things happen and people
feel free to talk. Btw, any kind of racist or sexist behaviour
will receive fierce opposition.
## I want to help / I need help
If you can help with organizing stuff in Berlin please come a few days earlier
as some of us do. Drop by at #squatconf on freenode and/or subscribe to the
[mailing list](https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/squatconf).
We want to make another Squatconf happening, but nothing is clear yet about dates. If you need travel funding or a place to sleep please ask on the channel.
If you bring a sleeping bag something should be possible but it's good
if you tell before so that we have an idea on how many people need accomodation.
Until then every place where we meet is squatconf, come talk on irc ## I want to give a talk!
[1]:http://spektrumberlin.de/ Please see [our talks repository](https://git.cryto.net/Squatconf/Talks) to propose a talk.

Loading…
Cancel
Save