Compare commits

..

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

@ -1,61 +1,60 @@
.btn{background-color: #fff} .btn{background-color: #fff}
.leftCol{padding-top: 15px;} .leftCol{padding-top: 15px;}
.page-header pre {margin-bottom: 0;} .page-header pre {margin-bottom: 0;}
.formCont{ .formCont{
border: 2px solid #000000; border: 2px solid #000000;
-webkit-box-shadow: 0 0 0 5px, 11px 13px 0 4px black; -webkit-box-shadow: 0 0 0 5px, 11px 13px 0 4px black;
-moz-box-shadow: 0 0 0 5px, 11px 13px 0 4px black; -moz-box-shadow: 0 0 0 5px, 11px 13px 0 4px black;
box-shadow: 0 0 0 5px, 11px 13px 0 4px black; box-shadow: 0 0 0 5px, 11px 13px 0 4px black;
background: #bbbbbb; background: #bbbbbb;
padding: 10px 15px; padding: 10px 15px;
margin: 10px 5px; margin: 10px 5px;
margin-left: -5px; margin-left: -5px;
} }
.input{width: 100%;} .input{width: 100%;}
#status-msg.info{color: black} #status-msg.info{color: black}
#status-msg.error{color: red} #status-msg.error{color: red}
.parisCont{ .parisCont{
background-color: #000; background-color: #000;
width: 100% !important; width: 100% !important;
padding: 1em 0; padding: 1em 0;
} }
.parisCont svg{ .parisCont svg{
display: block; display: block;
max-width: 80%; max-width: 80%;
margin: 0 auto; margin: 0 auto;
} }
.attribution { .attribution {
width: 100%; width: 100%;
font-size: small; font-size: small;
text-align: center; text-align: center;
margin-top: 1em; margin-top: 1em;
} }
#logoCont{ #logoCont{
text-align: center; text-align: center;
} }
.belinLogo{ .belinLogo{
width: 200px; width: 200px;
display: inline-block; }
}
h2{white-space: normal;}
h2{white-space: normal;}
/*mq madness*/
/*mq madness*/ .maxW, .dskW,.tblW{display:none;}
.maxW, .dskW,.tblW{display:none;}
@media (min-width: 1200px) {
@media (min-width: 1200px) { .maxW{display:block;}
.maxW{display:block;} }
} @media (min-width: 980px) and (max-width: 1199px) {
@media (min-width: 980px) and (max-width: 1199px) { .dskW{display:block;}
.dskW{display:block;} }
} @media (min-width: 768px) and (max-width: 979px) {}
@media (min-width: 768px) and (max-width: 979px) {} @media (max-width: 767px) {
@media (max-width: 767px) { .parisCont svg{zoom: 0.6;}
.parisCont svg{zoom: 0.6;} }
} @media (max-width: 480px) {}
@media (max-width: 480px) {} @media (max-width: 979px) {
@media (max-width: 979px) { .tblW{display:block;}
.tblW{display:block;} }
} @media (min-width: 980px) {}
@media (min-width: 980px) {}

@ -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)

@ -1,133 +1,151 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>SquatConf.386</title> <title>SquatConf.386</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Squatconf webSite"> <meta name="description" content="Squatconf webSite">
<link rel="icon" href="favicon.ico" type="image/x-icon" /> <link rel="icon" href="favicon.ico" type="image/x-icon" />
<link href="assets/css/bootstrap.css" rel="stylesheet"> <link href="assets/css/bootstrap.css" rel="stylesheet">
<link href="assets/css/bootstrap-responsive.css" rel="stylesheet"> <link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
<link href="assets/css/squatconf.css" rel="stylesheet"> <link href="assets/css/squatconf.css" rel="stylesheet">
</head> </head>
<body> <body>
<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>
<fieldset> </div>
<legend>Venue</legend> <br />
<div> <div class="formCont">
<a href="https://www.openstreetmap.org/node/2688963276" target="_blank"> <fieldset>
<button type="submit" class="btn">Spektrum Berlin</button> <legend>BE PART OF IT</legend>
</a> <label class="text-info">Lightning talks submission</label>
</div> <div>
</fieldset> <a href="https://pad.ijhack.nl/p/squatconf-lightning">
</div> <button type="submit" class="btn">Lightning talks</button>
<br />--}} </a>
</div>
<div class="formCont"> <label class="text-info">Send us your talk proposal</label>
<fieldset> <div>
<legend>JOIN US</legend> <a href="https://pad.ijhack.nl/p/squatconf-cfp">
<label class="text-info">Squatconf's mailing list</label> <button type="submit" class="btn">Pad</button>
<a href="https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/squatconf" target="_blank"> </a>
<button type="submit" class="btn">Subscribe</button> </div>
</a> <a href="mailto:talks@squatconf.eu">
<div id="status-msg">&nbsp;</div> <button type="submit" class="btn">Email</button>
<span class="help-block">we'll send you info about future events, and talk about all and nothing</span> </a>
</fieldset> <a href="https://git.cryto.net/Squatconf/Talks/pulls">
</form> <button type="submit" class="btn">pull request</button>
</div> </a>
<br /> <div id="status-msg">&nbsp;</div>
<!-- <ul class="nav nav-list"> <span class="help-block">
<li><a href="https://twitter.com/squatconf">@squatconf</a> You can either send us a pull request, write on the pad or send an email, if you have a talk to propose.
</ul> --> </span>
<br> </fieldset>
<ul class="nav nav-list"> </div>
<li><a href="#">#squatconf on freenode</a></li> <br />
</ul> <div class="formCont">
<br> <fieldset>
</div> <legend>JOIN US</legend>
<!-- content --> <label class="text-info">Squatconf's mailing list</label>
<div class="span9"> <a href="https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/squatconf">
<div class="page-header"> <button type="submit" class="btn">Subscribe</button>
<pre class="maxW"><small> </a>
.d8888b. 888 .d888 <div id="status-msg">&nbsp;</div>
d88P Y88b 888 d88P" <span class="help-block">we'll send you info about future events, and talk about all and nothing</span>
Y88b. 888 888 </fieldset>
"Y888b. .d88888888 888 8888b. 888888 .d8888b .d88b. 88888b. 888888 </form>
"Y88b.d88" 888888 888 "88b888 d88P" d88""88b888 "88b888 </div>
"888888 888888 888.d888888888 888 888 888888 888888 <br />
Y88b d88PY88b 888Y88b 888888 888Y88b. Y88b. Y88..88P888 888888 <!-- <ul class="nav nav-list">
"Y8888P" "Y88888 "Y88888"Y888888 "Y888 "Y8888P "Y88P" 888 888888 <li><a href="https://twitter.com/squatconf">@squatconf</a>
888 ___. .__ .__ </ul> -->
888 \_ |__ ___________| | |__| ____ <br>
888 | __ \_/ __ \_ __ \ | | |/ \ <ul class="nav nav-list">
| \_\ \ ___/| | \/ |_| | | \ <li><a href="#">#squatconf on freenode</a></li>
|___ /\___ >__| |____/__|___| / </ul>
\/ \/ \/ <br>
</div>
</small></pre> <!-- content -->
<pre class="dskW"> <div class="span9">
____ _ ____ __ <div class="page-header">
/ ___| __ _ _ _ __ _| |_ / ___|___ _ __ / _| <pre class="maxW"><small>
\___ \ / _` | | | |/ _` | __| | / _ \| '_ \| |_ .d8888b. 888 .d888
___) | (_| | |_| | (_| | |_| |__| (_) | | | | _| d88P Y88b 888 d88P"
|____/ \__, |\__,_|\__,_|\__|\____\___/|_| |_|_| Y88b. 888 888
|_| "Y888b. .d88888888 888 8888b. 888888 .d8888b .d88b. 88888b. 888888
"Y88b.d88" 888888 888 "88b888 d88P" d88""88b888 "88b888
___. .__ .__ "888888 888888 888.d888888888 888 888 888888 888888
\_ |__ ___________| | |__| ____ Y88b d88PY88b 888Y88b 888888 888Y88b. Y88b. Y88..88P888 888888
| __ \_/ __ \_ __ \ | | |/ \ "Y8888P" "Y88888 "Y88888"Y888888 "Y888 "Y8888P "Y88P" 888 888888
| \_\ \ ___/| | \/ |_| | | \ 888 ___. .__ .__
|___ /\___ >__| |____/__|___| / 888 \_ |__ ___________| | |__| ____
\/ \/ \/ 888 | __ \_/ __ \_ __ \ | | |/ \
<br></pre> | \_\ \ ___/| | \/ |_| | | \
<pre class="tblW"> |___ /\___ >__| |____/__|___| /
__. , ._ \/ \/ \/
(__ _.. . _.-+- _. _ ._ |,
.__)(_](_|(_] | (_.(_)[ )| </small></pre>
.__ | . <pre class="dskW">
[__) _ ._.|*._ ____ _ ____ __
[__)(/,[ ||[ ) / ___| __ _ _ _ __ _| |_ / ___|___ _ __ / _|
<br></pre> \___ \ / _` | | | |/ _` | __| | / _ \| '_ \| |_
</div> ___) | (_| | |_| | (_| | |_| |__| (_) | | | | _|
{{!--<div class="page-header"> |____/ \__, |\__,_|\__,_|\__|\____\___/|_| |_|_|
{{md "src/header.md"}} |_|
</div>--}}
<div> ___. .__ .__
{{md "src/index.md"}} \_ |__ ___________| | |__| ____
</div> | __ \_/ __ \_ __ \ | | |/ \
</div> | \_\ \ ___/| | \/ |_| | | \
</div> |___ /\___ >__| |____/__|___| /
</div> \/ \/ \/
<br><br><br> <br></pre>
<div class="parisCont"> <pre class="tblW">
<div class="container"> __. , ._
<div class="row"> (__ _.. . _.-+- _. _ ._ |,
<div class="span3"></div> .__)(_](_|(_] | (_.(_)[ )|
<div class="span9"> .__ | .
<div id="logo-wrapper"> [__) _ ._.|*._
<div id="logoCont"> [__)(/,[ ||[ )
<img src="assets/img/squatconf_baguette.svg" alt="" class="belinLogo"/> <br></pre>
<img src="assets/img/squatconf2016Berliner.svg" alt="" class="belinLogo"/> </div>
</div> <div class="page-header">
</div> {{md "src/header.md"}}
</div> </div>
</div> <div>
</div> {{md "src/index.md"}}
</div> </div>
</body> </div>
</html> </div>
<!-- useless comment to check if it is rebuilt corrrectly --> </div>
<div class="parisCont">
<div class="container">
<div class="row">
<div class="span3"></div>
<div class="span9">
<div id="logo-wrapper">
<div id="logoCont">
<img src="assets/img/squatconf2016Berliner.svg" alt="" class="belinLogo"/>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
<!-- useless comment to check if it is rebuilt corrrectly -->

@ -1,21 +1,50 @@
## 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
by all the people who attend. There were no advertisements from Silicon
They were not your typical IT conferences because it was mostly Just-in-Time-organized Valley companies (or any others) and several people felt free to give somewhat
by all the people who attend. There were no advertisements from Silicon radical talks on technologies and society, even openly associate with
Valley companies (or any others) and several people felt free to give somewhat anarchism. There also were a fair share of advanced tech talks on web
radical talks on technologies and society, even openly associate with Crypto, decentralized tech demos, internet of things, automatic garden
anarchism. There also were a fair share of advanced tech talks on web planting systems and what not. And we had many personal conversations
Crypto, decentralized tech demos, internet of things, automatic garden among each other which continue to this day.
planting systems and what not. And we had many personal conversations
among each other which continue to this day. ## ... and now we go to Berlin end april 2016!
## ... Squatconf never stop We want to make another Squatconf happening happen around
end April 2016 in Berlin. Timing wise it's next to "re:publica" so that
We want to make another Squatconf happening, but nothing is clear yet about dates. researchers and others who are going to this business conference can also
drop by at squatconf to participate in a more independent event.
Until then every place where we meet is squatconf, come talk on irc Berlin has gotten quite trendy, more expensive and squatting
is much less happening than it used to. But there still is lots of life
[1]:http://spektrumberlin.de/ 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).
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.
## I want to give a talk!
Please see [our talks repository](https://git.cryto.net/Squatconf/Talks) to propose a talk.

Loading…
Cancel
Save