diff --git a/Gemfile.lock b/Gemfile.lock
index 4de059d..3ff72f5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
uber (~> 0.0.4)
http_parser.rb (0.5.3)
i18n (0.6.11)
- json (1.8.1)
+ json (1.8.3)
kramdown (1.4.1)
listen (2.7.9)
celluloid (>= 0.15.2)
@@ -133,3 +133,6 @@ DEPENDENCIES
middleman-deploy
middleman-livereload
wdm (~> 0.1.0)
+
+BUNDLED WITH
+ 1.11.2
diff --git a/README.md b/README.md
index b6cd732..722303b 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,16 @@ Add Your User Group/Conference to the List
1. Fork repository.
2. Open *data/supporters.json* and add your name, location,
link and contact data.
+ - Note that contact data is optional and public, but we recommend adding some.
3. Check if site is working locally if possible (see [setup](#setup)).
4. Open a pull request.
+Why is my contact data public?
+------------------------------
+
+We encourage UG organisers to publicise contact emails and preferably phone numbers. This allows easy approaching and makes clear that contacting you should be the default, not an exception. Also, it allows contacting by direct means, instead of using a third-party-service like the meetups meetup page.
+
+The contact details are published on the CoC page itself to make clear who is responsible for handling incidents and who can be approached using which means.
Additions or Changes to the Code of Conduct?
--------------------------------------------
@@ -32,12 +39,10 @@ Do you want to translate to another language? Great! If you want to translate fr
3. Open a pull request. We will try to find other native speakers and disscuss it there. The discussion may look like [the one for the Spanish translation](https://github.com/rubyberlin/code-of-conduct/pull/23).
-
Setup
-----
-Ruby 2.x.y (1.9.x still OK) must be [installed](http://www.ruby-lang
-.org/de/downloads/).
+Ruby 2.x.y (1.9.x still OK) must be [installed](http://www.ruby-lang.org/de/downloads/).
git clone git@github.com:rubyberlin/code-of-conduct.git
cd code-of-conduct
diff --git a/config.rb b/config.rb
index b94246b..b149b80 100644
--- a/config.rb
+++ b/config.rb
@@ -16,7 +16,7 @@ def t(id, replacements = {})
set :js_dir, 'javascripts'
set :images_dir, 'images'
-set :displayed_languages, %i(en de es pl fr)
+set :displayed_languages, %i(en de es pl fr it)
configure :build do
activate :minify_css
diff --git a/data/supporters.json b/data/supporters.json
index 0606b74..a9bd86e 100644
--- a/data/supporters.json
+++ b/data/supporters.json
@@ -1,5 +1,27 @@
{
"usergroups": [
+ {
+ "name": "EuRuKo 2017",
+ "city": "Budapest",
+ "country": "Hungary",
+ "link": "http://euruko2017.org",
+ "twitter": "euruko",
+ "contacts": [
+ {
+ "name": "Amr Abdelwahab",
+ "twitter": "amrabdelwahab",
+ "email": "amr@digitalnatives.hu"
+ },
+ {
+ "name": "Ádám Madácsi",
+ "email": "adam@digitalnatives.hu"
+ },
+ {
+ "name": "Daniella Varga",
+ "email": "daniella@digitalnatives.hu"
+ }
+ ]
+ },
{
"name": "RUG-B – Ruby User Group Berlin",
"city": "Berlin",
@@ -8,9 +30,10 @@
"twitter": "rug_b",
"contacts": [
{
- "name": "Tobias Pfeiffer",
- "phone": "+49 160 205 0792",
- "email": "pragtob@gmail.com"
+ "name": "Tobias Pfeiffer",
+ "phone": "+49 160 205 0792",
+ "email": "pragtob@gmail.com",
+ "twitter": "PragTob"
},
{
"name": "Thilo Utke",
@@ -100,7 +123,7 @@
}
]
},
- {
+ {
"name": "Rails Girls Berlin",
"city": "Berlin",
"country": "Germany",
@@ -183,6 +206,16 @@
"name": "Jan Krutisch",
"phone": "+49 1752935345",
"email": "jan@krutisch.de"
+ },
+ {
+ "name": "Irina Lindt",
+ "phone": "+49 176 62761433",
+ "email": "lindtdev@gmail.com"
+ },
+ {
+ "name": "Jan Zaydowicz",
+ "phone": "+49 176 52857961",
+ "email": "jan.zaydowicz@gmail.com"
}
]
},
@@ -214,7 +247,7 @@
}
]
},
- {
+ {
"name": "Rails Girls Hamburg",
"city": "Hamburg",
"country": "Germany",
@@ -266,7 +299,7 @@
"contacts": [
{
"name": "Piotr Szotkowski",
- "phone": "+48 533 950 455",
+ "phone": "+48 501 28 30 20",
"email": "chastell@chastell.net"
},
{
@@ -338,7 +371,7 @@
"city": "Berlin",
"country": "Germany",
"link": "https://groups.google.com/forum/#!forum/creativecodeberlin",
- "twitter": "P5Jam",
+ "twitter": "creativeCodeBLN",
"contacts": [
{
"name": "Rachel Uwa",
@@ -348,12 +381,12 @@
},
{
"name": "Abe Pazos",
- "email": "abe@hamoid.com",
+ "email": "hamoid@gmail.com",
"twitter": "hamoid"
},
{
"name": "Ramin Soleymani",
- "email": "diskordier@gmail.com",
+ "email": "ramin@opentechschool.org",
"twitter": "ramin__"
},
{
@@ -427,6 +460,962 @@
"email": "v@gor.io"
}
]
+ },
+ {
+ "name": "Wizard Amigos",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://wizardamigos.com",
+ "twitter": "wizardamigos",
+ "contacts": [
+ {
+ "name": "Wizard Amigos",
+ "twitter": "wizardamigos",
+ "email": "we@wizardamigos.com"
+ },
+ {
+ "name": "Alexander Praetorius",
+ "twitter": "serapath",
+ "email": "a.praetorius@serapath.de"
+ },
+ {
+ "name": "Nina Breznik",
+ "twitter": "ninabreznik",
+ "email": "ninabreznik@gmail.com"
+ }
+ ]
+ },
+ {
+ "name": "Web Audio Berlin",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://webaudio.berlin",
+ "twitter": "webaudioberlin",
+ "contacts": [
+ {
+ "name": "Jan Monschke",
+ "twitter": "thedeftone",
+ "phone": "+49 157 789 021 18",
+ "email": "jan@janmonschke.com"
+ }
+ ]
+ },
+ {
+ "name": "Berlin Mobile .NET",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://www.meetup.com/Berlin-Mobile-DotNet-Meetup/",
+ "twitter": "BerlinDotNet",
+ "contacts": [
+ {
+ "name": "Nathan Guerin",
+ "twitter": "Gusennan",
+ "email": "nathan.guerin@riseup.net"
+ },
+ {
+ "name": "Daniel Münch",
+ "twitter": "ddotmunch",
+ "email": "dani.munch@gmail.com"
+ }
+ ]
+ },
+ {
+ "name": "Málaga Scala Meetup",
+ "city": "Málaga",
+ "country": "Spain",
+ "link": "http://www.meetup.com/Malaga-Scala",
+ "twitter": "MalagaScala",
+ "contacts": [
+ {
+ "name": "Nando Sola",
+ "twitter": "mr_solo"
+ },
+ {
+ "name": "Sergio Tudela",
+ "twitter": "sergiotudela"
+ },
+ {
+ "name": "Carmel Hassan",
+ "twitter": "karmel"
+ }
+ ]
+ },
+ {
+ "name": "Lambda World Cádiz 2015",
+ "city": "Cádiz",
+ "country": "Spain",
+ "link": "http://www.lambda.world",
+ "twitter": "Lambda_World",
+ "contacts": [
+ {
+ "name": "Jorge Galindo",
+ "twitter": "jorge__galindo"
+ },
+ {
+ "name": "Susana Marló",
+ "twitter": "carabuu_u"
+ },
+ {
+ "name": "Inés Arroyo",
+ "twitter": "toda1dama"
+ }
+ ]
+ },
+ {
+ "name": "Data Science for Social Good Berlin",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://dssg-berlin.org",
+ "twitter": "dssgber",
+ "contacts": [
+ {
+ "name": "Daniel Kirsch",
+ "twitter": "kirel",
+ "phone": "+49 151 15729370",
+ "email": "daniel@dssg-berlin.org"
+ }
+ ]
+ },
+ {
+ "name": "More Micro Modules",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://moremicromodules.org",
+ "twitter": "micromodules",
+ "contacts": [
+ {
+ "name": "Jan Lelis",
+ "twitter": "JanLelis",
+ "email": "mail@janlelis.de"
+ },
+ {
+ "name": "Christoph Grabo",
+ "twitter": "asaaki",
+ "email": "christoph@grabo.berlin"
+ }
+ ]
+ },
+ {
+ "name": "J On The Beach",
+ "city": "Málaga",
+ "country": "Spain",
+ "link": "http://www.jonthebeach.com/",
+ "twitter": "J_OnTheBeach",
+ "contacts": [
+ {
+ "name": "Sergio Tudela",
+ "twitter": "sergiotudela",
+ "email": "info@jonthebeach.com"
+ }
+ ]
+ },
+ {
+ "name": "Silesian Ruby Users Group",
+ "city": "Gliwice",
+ "country": "Poland",
+ "link": "https://srug.pl/",
+ "twitter": "srugpl",
+ "contacts": [
+ {
+ "name": "Kuba Kuźma",
+ "twitter": "qoobaa",
+ "email": "kuba@jah.pl"
+ }
+ ]
+ },
+ {
+ "name": "unKonf 2016",
+ "city": "Mannheim",
+ "country": "Germany",
+ "link": "https://www.unkonf.de/",
+ "twitter": "unkonf",
+ "contacts": [
+ {
+ "name": "Stephan Hochdörfer",
+ "twitter": "shochdoerfer",
+ "email": "info@unKonf.de"
+ }
+ ]
+ },
+ {
+ "name": "PySilesia / Silesian Python Users Group",
+ "city": "Katowice",
+ "country": "Poland",
+ "link": "http://pysilesia.org/",
+ "twitter": "pysilesia",
+ "contacts": [
+ {
+ "name": "Filip Kłębczyk",
+ "twitter": "fk_lx",
+ "email": "fklebczyk@gmail.com"
+ }
+ ]
+ },
+ {
+ "name": "dber - diaspora* Berlin",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "https://dber.org",
+ "contacts": [
+ {
+ "name": "Lisa Passing",
+ "email": "mail@lislis.de",
+ "diaspora": "lis@wk3.org"
+ }
+ ]
+ },
+ {
+ "name": "React Berlin",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://reactjs.berlin/",
+ "twitter": "reactberlin",
+ "contacts": [
+ {
+ "name": "Tobias Pfeiffer",
+ "phone": "+49 160 205 0792",
+ "email": "pragtob@gmail.com",
+ "twitter": "PragTob"
+ },
+ {
+ "name": "Bodo Tasche",
+ "phone": "+49 1512 7533048",
+ "email": "bodo@tasche.me",
+ "twitter": "bitboxer"
+ },
+ {
+ "name": "Christoph Beck",
+ "email": "aqualung@crapmap.de",
+ "twitter": "chris_bitcrowd"
+ }
+ ]
+ },
+ {
+ "name": "JavaScript and the Internet of Things",
+ "city": "Portland, OR",
+ "country": "USA",
+ "link": "http://www.meetup.com/JavaScript-and-the-Internet-of-Things/",
+ "contacts": [
+ {
+ "name": "Andrew Chalkley",
+ "email": "andrew@chalkley.org",
+ "twitter": "chalkers"
+ },
+ {
+ "name": "Craig Dennis",
+ "twitter": "craigsdennis"
+ }
+ ]
+ },
+ {
+ "name": "EuRuKo 2016",
+ "city": "Sofia",
+ "country": "Bulgaria",
+ "link": "http://euruko2016.org",
+ "twitter": "euruko",
+ "contacts": [
+ {
+ "name": "Svetlozar Todorov",
+ "email": "svetlik@gmail.com"
+ },
+ {
+ "name": "Genadi Samokovarov",
+ "email": "gsamokovarov@gmail.com"
+ },
+ {
+ "name": "Vestimir Markov",
+ "email": "me@vestimir.com"
+ },
+ {
+ "name": "Svetlozar Mihaylov",
+ "email": "svetliomihailov@gmail.com",
+ "phone": "+359 883 33 20 91"
+ }
+ ]
+ },
+ {
+ "name": "Raspberry Pi Hackers MeetUp",
+ "city": "Sevilla",
+ "country": "Spain",
+ "link": "http://www.meetup.com/es-ES/RaspberryPi-Hackers-en-Sevilla/",
+ "twitter": "RaspberryHack",
+ "contacts": [
+ {
+ "name": "Bernardo Ronquillo",
+ "email": "brjapon@psykia.com",
+ "link": "https://es.linkedin.com/in/brjapon",
+ "twitter": "brjapon",
+ "phone": "+34 678 590 171"
+ },
+ {
+ "name": "Víctor Murillo",
+ "email": "victor@psykia.com"
+ },
+ {
+ "name": "Rubén Rodríguez",
+ "email": "ruben@pyskia.com"
+ }
+ ]
+ },
+ {
+ "name": "Sonic Code Sessions",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://spektrumberlin.de/communities/sonic-code-sessions/about.html",
+ "twitter": "scsBLN",
+ "contacts": [
+ {
+ "name": "Abe Pazos",
+ "email": "hamoid@gmail.com",
+ "link": "http://hamoid.com",
+ "twitter": "hamoid"
+ }
+ ]
+ },
+ {
+ "name": "Berlin Node.js Community Meetup",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "https://ti.to/travisci/berlin-node-js-community-meetup",
+ "contacts": [
+ {
+ "name": "Jenifer Duke",
+ "email": "duke@travis-ci.com",
+ "phone": "+49 170 7986487"
+ },
+ {
+ "name": "Vanja Cosic",
+ "email": "vanja@opbeat.com",
+ "phone": "+45 28 49 16 32"
+ }
+ ]
+ },
+ {
+ "name": "Berlin.JS – Berlin JavaScript usergroup",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://www.berlinjs.org",
+ "twitter": "berlinjs",
+ "contacts": [
+ {
+ "name": "Michele Guido",
+ "twitter": "sheley"
+ },
+ {
+ "name": "Robin Mehner",
+ "twitter": "rmehner",
+ "phone": "+49 160 906 59729",
+ "email": "robin@coding-robin.de"
+ }
+ ]
+ },
+ {
+ "name": "Macoun - Mac OS X and iOS Developer Conference",
+ "city": "Frankfurt",
+ "country": "Germany",
+ "link": "https://macoun.de",
+ "twitter": "MacounFFM",
+ "contacts": [
+ {
+ "name": "Christian Hauser",
+ "phone": "+49 69 981 912 06",
+ "email": "contact@macoun.de"
+ },
+ {
+ "name": "Thomas Biedorf",
+ "phone": "+49 69 981 912 06",
+ "email": "contact@macoun.de"
+ }
+ ]
+ },
+ {
+ "name": "Rustfest",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://rustfest.eu",
+ "twitter": "rustfest",
+ "contacts": [
+ {
+ "name": "Florian Gilcher",
+ "phone": "+49 172 8122469",
+ "email": "florian.gilcher@asquera.de"
+ }
+ ]
+ },
+ {
+ "name": "React.HH",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "http://www.meetup.com/de-DE/Hamburg-React-js-Meetup/",
+ "twitter": "reacthh",
+ "contacts": [
+ {
+ "name": "Dave Brotherstone",
+ "phone": "+49 177 5548569",
+ "email": "davegb@pobox.com",
+ "twitter": "bruderstein"
+ },
+ {
+ "name": "Rebecca Spindler",
+ "phone": "+49 170 9322635",
+ "email": "spindler.rebecca@gmail.com",
+ "twitter": "beccspin"
+ },
+ {
+ "name": "Leonard Koch",
+ "email": "leonard@leonardkoch.com",
+ "twitter": "LeonardKoch_"
+ }
+ ]
+ },
+ {
+ "name": "node.HH",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "http://www.meetup.com/de-DE/node-HH/",
+ "twitter": "NodeHamburg",
+ "contacts": [
+ {
+ "name": "Gregor Elke",
+ "phone": "+49 174 2100996",
+ "email": "greelgorke@gmail.com",
+ "twitter": "greelgorke"
+ }
+ ]
+ },
+ {
+ "name": "decode hamburg",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "https://www.meetup.com/decode-hh/",
+ "twitter": "decodehh",
+ "contacts": [
+ {
+ "name": "Martin Schuhfuss",
+ "phone": "+49 172 5188 662",
+ "email": "m.schuhfuss@gmail.com",
+ "twitter": "usefulthink"
+ },
+ {
+ "name": "Felicitas Kugland",
+ "email": "felicitas.kugland@gmail.com",
+ "twitter": "kotzendekrabbe"
+ }
+ ]
+ },
+ {
+ "name": "HH.JS",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "http://www.meetup.com/hamburg-js/",
+ "twitter": "hhjs",
+ "contacts": [
+ {
+ "name": "Martin Kleppe",
+ "phone": "+49 178 236 53 40",
+ "email": "kleppe@gmail.com",
+ "twitter": "aemkei"
+ },
+ {
+ "name": "Felicitas Kugland",
+ "email": "felicitas.kugland@gmail.com",
+ "twitter": "kotzendekrabbe"
+ },
+ {
+ "name": "Rebecca Spindler",
+ "phone": "+49 170 9322635",
+ "email": "spindler.rebecca@gmail.com",
+ "twitter": "beccspin"
+ },
+ {
+ "name": "Daniel Dembach",
+ "phone": "+49 151 22962186",
+ "email": "daniel@dmbch.net",
+ "twitter": "dmbch"
+ }
+ ]
+ },
+ {
+ "name": "CouchDB Meetup Hamburg",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "http://www.meetup.com/CouchDB-Meetup-Hamburg/",
+ "twitter": "HamburgCouchDB",
+ "contacts": [
+ {
+ "name": "Klaus Trainer",
+ "phone": "+49 1577 7855886",
+ "email": "klaus_trainer@apache.org",
+ "twitter": "KlausTrainer"
+ }
+ ]
+ },
+ {
+ "name": "DO!Hack 2016",
+ "city": "Dortmund",
+ "country": "Germany",
+ "link": "https://www.dohack.io",
+ "twitter": "dohack_io",
+ "contacts": [
+ {
+ "name": "Christoph Weinzierl",
+ "email": "team@dohack.io",
+ "twitter": "wir3bug"
+ }
+ ]
+ },
+ {
+ "name": "Berlin C++ User Group",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://www.meetup.com/berlincplusplus/",
+ "contacts": [
+ {
+ "name": "Fabio Fracassi",
+ "phone": "+49 172 97 28 955",
+ "email": "f.fracassi@gmx.net"
+ },
+ {
+ "name": "Celine Dedaj",
+ "email": "celine.dedaj@ableton.com"
+ }
+ ]
+ },
+ {
+ "name": "Coding Amigos - collective of freelance developers",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://codingamigos.com",
+ "twitter": "codingamigos",
+ "contacts": [
+ {
+ "name": "Coding Amigos",
+ "twitter": "codingamigos",
+ "email": "we@codingamigos.com"
+ },
+ {
+ "name": "Nina Breznik",
+ "twitter": "ninabreznik",
+ "email": "ninabreznik@gmail.com"
+ },
+ {
+ "name": "Alexander Praetorius",
+ "twitter": "serapath",
+ "email": "a.praetorius@serapath.de"
+ }
+ ]
+ },
+ {
+ "name": "Refugees Work",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://refugeeswork.com",
+ "twitter": "refugeeswork",
+ "contacts": [
+ {
+ "name": "RefugeesWork",
+ "twitter": "refugeeswork",
+ "email": "we@refugeeswork.com"
+ }
+ ]
+ },
+ {
+ "name": "Serverless Usergroup Hamburg",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "http://www.meetup.com/Serverless-Hamburg",
+ "contacts": [
+ {
+ "name": "Soenke Ruempler",
+ "twitter": "s0enke",
+ "email": "soenke@ruempler.eu"
+ }
+ ]
+ },
+ {
+ "name": "Hamburg AngularJS Meetup",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "http://www.meetup.com/Hamburg-AngularJS-Meetup/",
+ "twitter": "angular_hamburg",
+ "contacts": [
+ {
+ "name": "David Muellerchen",
+ "email": "dave@webdave.de",
+ "twitter": "webdave_de"
+ },
+ {
+ "name": "John Behrens",
+ "twitter": "WebConsultsEu"
+ }
+ ]
+ },
+ {
+ "name": "Hackerstolz e.V.",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://www.hackerstolz.de",
+ "twitter": "hackerstolz",
+ "contacts": [
+ {
+ "name": "Sebastian Waschnick",
+ "twitter": "waschnick"
+ }
+ ]
+ },
+ {
+ "name": "Lemmings I/O",
+ "city": "Vienna",
+ "country": "Austria",
+ "link": "https://lemmings.io",
+ "contacts": [
+ {
+ "name": "Thomas Schranz",
+ "email": "thomas+lemmings@blossom.io",
+ "twitter": "__tosh"
+ }
+ ]
+ },
+ {
+ "name": "OpenGnsys Project",
+ "city": "Zaragoza",
+ "country": "Spain",
+ "link": "http://opengnsys.es",
+ "twitter": "opengnsys",
+ "contacts": [
+ {
+ "name": "OpenGnsys Project",
+ "email": "opengnsys@gmail.com"
+ }
+ ]
+ },
+ {
+ "name": "partial :: Conf",
+ "city": "Sofia",
+ "country": "Bulgaria",
+ "link": "http://partialconf.com",
+ "twitter": "partialconf",
+ "contacts": [
+ {
+ "name": "Genadi Samokovarov",
+ "twitter": "gsamokovarov",
+ "email": "gsamokovarov@gmail.com"
+ },
+ {
+ "name": "Svetlozar Mihailov",
+ "twitter": "svetliomihailov",
+ "email": "svetliomihailov@gmail.com"
+ },
+ {
+ "name": "Svetlozar Todorov",
+ "twitter": "svetlozaurus",
+ "email": "svetlik@gmail.com"
+ },
+ {
+ "name": "Vestimir Markov",
+ "twitter": "vestimir",
+ "email": "me@vestimir.com"
+ }
+ ]
+ },
+ {
+ "name": "Magdeburger Developer Days",
+ "city": "Magdeburg",
+ "country": "Germany",
+ "link": "http://md-devdays.de/",
+ "twitter": "MiB_MD_DevDays",
+ "contacts": [
+ {
+ "name": "Michael Blume",
+ "email": "info@md-devdays.de"
+ }
+ ]
+ },
+ {
+ "name": "Isle of Ruby",
+ "city": "Exeter",
+ "country": "United Kingdom",
+ "link": "http://isleofruby.org",
+ "twitter": "isleofruby",
+ "contacts": [
+ {
+ "name": "Bruno Antunes",
+ "twitter": "b_antunes",
+ "email": "bruno@isleofruby.org"
+ },
+ {
+ "name": "Fanny Krebs",
+ "twitter": "fannivuniconnu",
+ "email": "fanny@isleofruby.org"
+ },
+ {
+ "name": "Alex Coles",
+ "twitter": "myabc",
+ "email": "alex@isleofruby.org"
+ }
+ ]
+ },
+ {
+ "name": "Azure Meetup Hamburg",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "https://www.meetup.com/de-DE/Azure-Meetup-Hamburg/",
+ "twitter": "AzureMeetupHH",
+ "contacts": [
+ {
+ "name": "Bjoern Peters",
+ "email": "bjoern@sql-aus-hamburg.de",
+ "twitter": "sql_aus_hh"
+ }
+ ]
+ },
+ {
+ "name": "Hardware Hack Lab",
+ "city": "New York",
+ "country": "United States of America",
+ "link": "https://hardwarehacklab.io/",
+ "twitter": "hardwarehacklab",
+ "contacts": [
+ {
+ "name": "Julien Deswaef",
+ "twitter": "xuv",
+ "email": "julien.deswaef@thoughtworks.com",
+ "phone": "+1 646 427 4897"
+ },
+ {
+ "name": "Greg Dutcher",
+ "twitter": "greg_dutcher",
+ "email": "gdutcher@thoughtworks.com"
+ },
+ {
+ "name": "Andrew McWilliams",
+ "twitter": "jahyadotnet",
+ "email": "andy@hardwarehacklab.io"
+ },
+ {
+ "name": "Kent Rahman",
+ "email": "krahman@thoughtworks.com",
+ "phone": "+1 917 734 7635"
+ }
+ ]
+ },
+ {
+ "name": "C++::London",
+ "city": "London",
+ "country": "United Kingdom",
+ "link": "https://www.meetup.com/CppLondon/",
+ "twitter": "cpplondon",
+ "contacts": [
+ {
+ "name": "Phil Nash",
+ "twitter": "phil_nash",
+ "email": "cpplondon@philnash.me",
+ "phone": "+44 7793 515336"
+ }
+ ]
+ },
+ {
+ "name": "Auckland C++ Meetup",
+ "city": "Auckland",
+ "country": "New Zealand",
+ "link": "https://www.meetup.com/Auckland-C-Meetup/",
+ "contacts": [
+ {
+ "name": "Toby Allsopp",
+ "twitter": "toby_allsopp",
+ "email": "toby@mi6.gen.nz",
+ "phone": "+64 21 0233 3914"
+ }
+ ]
+ },
+ {
+ "name": "Scala Swarm Conference",
+ "city": "Porto",
+ "country": "Portugal",
+ "link": "https://scala-swarm.org",
+ "twitter": "ScalaSwarmConf",
+ "contacts": [
+ {
+ "name": "Gorazd Kozmus",
+ "twitter": "c05m1x",
+ "email": "gorazd@scala-swarm.org",
+ "phone": "+386 41 676 697"
+ }
+ ]
+ },
+ {
+ "name": "Azure Meetup Hannover",
+ "city": "Hanover",
+ "country": "Germany",
+ "link": "http://azure-hannover.de",
+ "twitter": "AzureHAJ",
+ "contacts": [
+ {
+ "name": "Benjamin Huepeden",
+ "twitter": "bhuepeden",
+ "email": "orga@azure-hannover.de"
+ },
+ {
+ "name": "Martin Steiner",
+ "email": "orga@azure-hannover.de"
+ }
+ ]
+ },
+ {
+ "name": "Azure Meetup Berlin",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://azure-berlin.de",
+ "twitter": "Azure_Berlin",
+ "contacts": [
+ {
+ "name": "Tyrone Guiamo",
+ "email": "orga@azure-berlin.de"
+ },
+ {
+ "name": "Benjamin Huepeden",
+ "twitter": "bhuepeden",
+ "email": "orga@azure-berlin.de"
+ }
+ ]
+ },
+ {
+ "name": "eTextile SummerCamp",
+ "city": "Poncé sur le Loir",
+ "country": "France",
+ "link": "http://etextile-summercamp.org/",
+ "contacts": [
+ {
+ "name": "Mika Satomi",
+ "email": "info@etextile-summercamp.org"
+ }
+ ]
+ },
+ {
+ "name": "BotsHub Vienna",
+ "city": "Vienna",
+ "country": "Austria",
+ "link": "http://botshub.org",
+ "contacts": [
+ {
+ "name": "David Pichsenmeister",
+ "twitter": "3x14159265"
+ },
+ {
+ "name": "Thomas Schranz",
+ "twitter": "__tosh"
+ },
+ {
+ "name": "Jakob Reiter",
+ "twitter": "reiter_jakob"
+ },
+ {
+ "name": "Natalie Korotaeva",
+ "twitter": "siberiancyborg"
+ },
+ {
+ "name": "Barbara Ondrisek",
+ "twitter": "electrobabe"
+ }
+ ]
+ },
+ {
+ "name": "Apache Flink Meetup Berlin",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://www.meetup.com/de-DE/Apache-Flink-Meetup/",
+ "contacts": [
+ {
+ "name": "Daniela Bentrup",
+ "twitter": "danibentrup",
+ "email": "daniela@data-artisans.com"
+ }
+ ]
+ },
+ {
+ "name": "Flink Forward Berlin",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://berlin.flink-forward.org/",
+ "contacts": [
+ {
+ "name": "Daniela Bentrup",
+ "twitter": "danibentrup",
+ "email": "daniela@data-artisans.com"
+ }
+ ]
+ },
+ {
+ "name": "Flink Forward San Francisco",
+ "city": "San Francisco",
+ "country": "USA",
+ "link": "http://sf.flink-forward.org/",
+ "contacts": [
+ {
+ "name": "Daniela Bentrup",
+ "twitter": "danibentrup",
+ "email": "daniela@data-artisans.com"
+ }
+ ]
+ },
+ {
+ "name": "React Day Berlin",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "https://reactday.berlin",
+ "contacts": [
+ {
+ "name": "Robert Haritonov",
+ "twitter": "operatino"
+ }
+ ]
+ },
+ {
+ "name": "Ionic Berlin",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "https://www.meetup.com/Ionic-Berlin/",
+ "contacts": [
+ {
+ "name": "IonicBerlin",
+ "twitter": "IonicBerlin"
+ }
+ ]
+ },
+ {
+ "name": "Qt World Summit 2017",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "https://www.qtworldsummit.com/",
+ "contacts": [
+ {
+ "name": "Qt Project",
+ "twitter": "QtProject"
+ }
+ ]
+ },
+ {
+ "name": "Science Hack Day Berlin",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://berlin.sciencehackday.org/",
+ "contacts": [
+ {
+ "name": "Lucy Patterson",
+ "twitter": "lu_cyP",
+ "email": "lucy.shd@opentechschool.org"
+ },
+ {
+ "name": "Joram Schwartzmann",
+ "twitter": "sciencejoram",
+ "email": "joram.shd@opentechschool.org"
+ },
+ {
+ "name": "Giulia Paparo",
+ "twitter": "giu_pap",
+ "email": "giulia.shd@opentechschool.org"
+ }
+ ]
}
]
}
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index b7440db..4cfe1fc 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -10,7 +10,7 @@
diff --git a/source/localizable/_code-of-conduct.de.md b/source/localizable/_code-of-conduct.de.md
index 6981be1..e4c7f14 100644
--- a/source/localizable/_code-of-conduct.de.md
+++ b/source/localizable/_code-of-conduct.de.md
@@ -18,20 +18,6 @@ Communities spiegeln die Gesellschaften wider, in denen sie existieren. Positive
Wenn du Personen begegnest, die sich viel Mühe geben, unsere Community einladend und freundlich zu gestalten und alle Teilnehmenden dazu anregt, sich voll einzubringen, würden wir gerne davon hören.
-Erwartetes Verhalten
---------------------
-
-* Beteilige dich authentisch und aktiv. Dadurch trägst du zur Gesundheit und Langlebigkeit dieser Community bei.
-
-* Verhalte dich rücksichts- und respektvoll in Wort und Tat.
-
-* Bemühe dich um Zusammenarbeit, damit du Konflikte von Anfang an vermeiden kannst.
-
-* Nimm Abstand von erniedrigender, diskriminierender oder belästigender Sprache und Verhalten.
-
-* Achte auf deine Umgebung und die anderen Teilnehmenden. Mache die Veranstaltenden oder andere Anwesende darauf aufmerksam, wenn du eine gefährliche Situation, jemanden in Bedrängnis oder Verletzungen dieses Verhaltenskodexes bemerkst, selbst wenn sie zunächst belanglos erscheinen.
-
-
Inakzeptables Verhalten
-----------------------
@@ -66,3 +52,8 @@ Geltungsbereich
---------------
Wir erwarten, dass sich alle Teilnehmenden der Community (bezahlte oder unbezahlte Beitragende, Sponsoren sowie andere Gäste) an jedweden Veranstaltungsorten der Community - online und offline - sowie in allen persönlichen Gesprächen im Rahmen der Community an diesen Verhaltenskodex halten.
+
+Lizenz und Namensnennung
+------------------------
+
+Der Berlin Code of Conduct steht unter der Creative Commons Attribution-ShareAlike Lizenz. Er basiert auf dem [pdx.rb code of conduct](http://pdxruby.org/codeofconduct), der unter der selben Lizenz steht.
diff --git a/source/localizable/_code-of-conduct.en.md b/source/localizable/_code-of-conduct.en.md
index f94684a..9482dea 100644
--- a/source/localizable/_code-of-conduct.en.md
+++ b/source/localizable/_code-of-conduct.en.md
@@ -17,23 +17,12 @@ Communities mirror the societies in which they exist and positive action is esse
If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, we want to know.
-
-Expected Behavior
------------------
-
-* Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
-* Exercise consideration and respect in your speech and actions.
-* Attempt collaboration before conflict.
-* Refrain from demeaning, discriminatory, or harassing behavior and speech.
-* Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
-
-
Unacceptable Behavior
---------------------
Unacceptable behaviors include: intimidating, harassing, abusive, discriminatory, derogatory or demeaning speech or actions by any participant in our community online, at all related events and in one-on-one communications carried out in the context of community business. Community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
-Harassment includes: harmful or prejudicial verbal or written comments related to gender, sexual orientation, race, religion, disability; inappropriate use of nudity and/or sexual images in public spaces (including presentation slides); deliberate intimidation, stalking or following; harassing photography or recording; sustained disruption of talks or other events; inappropriate physical contact, and unwelcome sexual attention.
+Harassment includes: harmful or prejudicial verbal or written comments related to gender, sexual orientation, race, religion, disability; inappropriate use of nudity and/or sexual images in public spaces (including presentation slides); inappropriate depictions of violence in public spaces (including presentation slides); deliberate intimidation, stalking or following; harassing photography or recording; sustained disruption of talks or other events; inappropriate physical contact, and unwelcome sexual attention.
Consequences of Unacceptable Behavior
@@ -66,3 +55,8 @@ Scope
We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues—online and in-person—as well as in all one-on-one communications pertaining to community business.
+
+License and attribution
+-----------------------
+
+Berlin Code of Conduct is distributed under a Creative Commons Attribution-ShareAlike license. It is based on the [pdx.rb code of conduct](http://pdxruby.org/codeofconduct), which is distributed under the same license.
diff --git a/source/localizable/_code-of-conduct.es.md b/source/localizable/_code-of-conduct.es.md
index ea0b967..9e4b1e5 100644
--- a/source/localizable/_code-of-conduct.es.md
+++ b/source/localizable/_code-of-conduct.es.md
@@ -18,17 +18,6 @@ Las comunidades son espejo de las sociedades en las cuales existen y las accione
Si Ud. ve a alguien haciendo un esfuerzo extra por asegurarse que nuestra comunidad es acogedora, amistosa e incentiva a todos los que participan en ella a contribuir de manera completa, nos gustaría saberlo.
-Comportamiento esperado
------------------------
-
-* Participe de un modo auténtico y activo. Al hacerlo contribuye a la salud y longevidad de esta comunidad.
-* Ejercite la consideración y el respeto en su discurso y en sus acciones.
-* Intente colaborar para evitar conflictos.
-* Absténgase de discursos o comportamientos despectivos, discriminatorios o abusivos.
-* Sea consciente de su entorno y de los/as otros/as participantes. Alerte a los líderes de la comunidad si nota alguna situación peligrosa, alguien sufriendo una situación comprometedora o violaciones de este Código de Conducta, incluso si parecieran poco importantes.
-
-
-
Comportamiento inaceptable
--------------------------
@@ -63,3 +52,9 @@ Alcance
-------
Se espera que todos los participantes de la comunidad (colaboradores/as —pagos o no—, patrocinadores y otros/as invitados/as) se atengan a este Código de Conducta en todos los lugares de encuentro de la comunidad –online o en persona– así como en todas las comunicaciones uno-a-uno relacionadas con actividades de la comunidad.
+
+
+Licencia y atribución
+---------------------
+
+El Berlin Code of Conduct se encuentra distribuido bajo una licencia Creative Commons Attribution-ShareAlike. Está basado en el [pdx.rb code of conduct](http://pdxruby.org/codeofconduct), que también es distribuido bajo la misma licencia.
diff --git a/source/localizable/_code-of-conduct.fr.md b/source/localizable/_code-of-conduct.fr.md
index c1b9b0a..4387f0c 100644
--- a/source/localizable/_code-of-conduct.fr.md
+++ b/source/localizable/_code-of-conduct.fr.md
@@ -18,16 +18,6 @@ Les communautés reflètent les sociétés dans lesquelles elle existent. Les ac
Si vous observez quelqu'un qui prend un soin particulier à s'assurer que notre communauté est accueillante, amicale et encourageante pour tous ses participants, faites le nous savoir.
-Comportement attendu
------------------
-
-* Participez activement et avec authenticité. Ce faisant, vous contribuerez à rendre la communauté saine et durable.
-* Faites preuve de considération et de respect dans vos paroles et actes.
-* Préférez la coopération au conflit.
-* Ne pratiquez pas le harcèlement, la méchanceté et la discrimination dans votre comportement et dans vos paroles.
-* Soyez attentif à votre environnement et aux autres participants. Alertez les organisateurs si vous êtes témoin d'une situation dangereuse, d'une personne en situation de détresse ou d'une violation de ce code de conduite, même si cela vous semble sans conséquence.
-
-
Comportements inacceptables
---------------------
diff --git a/source/localizable/_code-of-conduct.it.md b/source/localizable/_code-of-conduct.it.md
index c0cd67c..5d19814 100644
--- a/source/localizable/_code-of-conduct.it.md
+++ b/source/localizable/_code-of-conduct.it.md
@@ -19,16 +19,6 @@ Le comunità sono lo specchio delle società nelle quali esse esistono ed agire
Se vieni a conoscenza di qualcuno/a che in maniera esemplare si assicura che la nostra comunità sia accogliente, amichevole e che attivamente incoraggia tutti/e i/le partecipanti nel contribuire al massimo, faccelo sapere!
-Il comportamento che ci aspettiamo
------------------
-
-* Partecipa in maniera autentica e attiva. Così facendo, dai il tuo contributo per una comunità sana e longeva.
-* Sii attento e rispettoso riguardo a cosa dici e a come agisci.
-* Cerca di collaborare prima di entrare in conflitto.
-* Astieniti da commenti, discussioni o comportamenti avvilenti, discriminatori o molesti.
-* Sii conscio/a dell'ambiente e dei/delle suoi/sue partecipanti. Se noti una situazione pericolosa, qualcuno che non si sente a suo agio o una violazione di questo Codice di Condotta, avvisa immediatamente i leaders della comunità, anche se la situazione non sembra poter avere conseguenze particolarmente dannose.
-
-
Comportamento inaccettabile
---------------------
diff --git a/source/localizable/_code-of-conduct.pl.md b/source/localizable/_code-of-conduct.pl.md
index 0069c4b..41369c6 100644
--- a/source/localizable/_code-of-conduct.pl.md
+++ b/source/localizable/_code-of-conduct.pl.md
@@ -18,16 +18,6 @@ Społeczności odzwierciedlają społeczeństwa w ramach których istnieją, dla
Jeśli widzisz kogoś wkładającego dodatkowy wysiłek by zapewnić, że nasza społeczność jest przyjazna, życzliwa i zachęcająca wszystkich uczestników do wnoszenia w nią jak największego wkładu – chcielibyśmy o tym wiedzieć.
-Zachowania oczekiwane
----------------------
-
-* Uczestnicz w sposób autentyczny i aktywny. Robiąc to przyczyniasz się do zdrowia i żywotności tej społeczności.
-* Zachowuj rozwagę i szacunek w swoich słowach i czynach.
-* Spróbuj współpracy przed konfliktem.
-* Powstrzymuj się przed poniżającymi, dyskryminującymi lub niepokojącymi zachowaniami i słowami.
-* Zwracaj uwagę na swoje otoczenie i innych uczestników. Ostrzeż społeczność jeśli zauważysz niebezpieczną sytuację, kogoś potrzebującego pomocy lub naruszenie tego Kodeksu postępowania, nawet jeśli wydają się nieistotne.
-
-
Zachowania niedopuszczalne
--------------------------
@@ -41,13 +31,13 @@ Konsekwencje niedopuszczalnych zachowań
Niedopuszczalne zachowanie ze strony dowolnego uczestnika społeczności – w tym sponsorów i osób decyzyjnych – nie będzie tolerowane. Osoby poproszone o zaprzestanie niedopuszczalnego zachowania powinny się natychmiast do danej prośby zastosować.
-Jeśli uczestnik społeczności zachowuje się niedopuszczalnie, organizatorzy mogą podjąć dowolne działania, które uznają za właście, włącznie z tymczasowym lub stałym wyrzuceniem ze społeczności bez ostrzeżenia (i bez zwrotu pieniędzy w przypadku wydarzeń płatnych).
+Jeśli uczestnik społeczności zachowuje się niedopuszczalnie, organizatorzy mogą podjąć dowolne działania, które uznają za właściwe, włącznie z tymczasowym lub stałym wyrzuceniem ze społeczności bez ostrzeżenia (i bez zwrotu pieniędzy w przypadku wydarzeń płatnych).
Jeśli doświadczasz lub widzisz niedopuszczalne zachowanie
---------------------------------------------------------
-Jeśli doświadczas lub widzisz niedopuszczalne zachowanie – lub masz inne uwagi – jak najszybciej powiadom o tym organizatora. Listę organizatorów każdej społeczności wspierającej ten kodeks postępowania znajdziesz na dole tej strony. Organizatorzy są także dostępni by wspomóc uczestników w kontaktach z lokalnymi organami egzekwowania prawa i by wspierać poczucie bezpieczeństwa osób doświadczających niedopuszczalnych zachowań. Jeśli osoba poszkodowana wyrazi zapotrzebowanie, organizatorzy zapewnią też odpowiednią eskortę.
+Jeśli doświadczasz lub widzisz niedopuszczalne zachowanie – lub masz inne uwagi – jak najszybciej powiadom o tym organizatora. Listę organizatorów każdej społeczności wspierającej ten kodeks postępowania znajdziesz na dole tej strony. Organizatorzy są także dostępni by wspomóc uczestników w kontaktach z lokalnymi organami egzekwowania prawa i by wspierać poczucie bezpieczeństwa osób doświadczających niedopuszczalnych zachowań. Jeśli osoba poszkodowana wyrazi zapotrzebowanie, organizatorzy zapewnią też odpowiednią eskortę.
Skargi
@@ -60,3 +50,9 @@ Zakres
------
Oczekujemy, że wszyscy uczestnicy społeczności (organizatorzy, zarówno opłacani jak i wolontariusze; sponsorzy; pozostali goście) będą przestrzegać tego Kodeksu postępowania we wszelkich miejscach spotkań społeczności – online i w świecie rzeczywistym – jak i w komunikacji prywatnej dotyczącej spraw społeczności.
+
+
+Licencja i uznanie autorstwa
+----------------------------
+
+Berliński kodeks postępowania jest rozpowszechniany na warunkach licencji Creative Commons Uznanie autorstwa-Na tych samych warunkach. Kodeks został stworzony na podstawie [pdx.rb code of conduct](http://pdxruby.org/codeofconduct), rozpowszechnianego na warunkach tej samej licencji.