From 6524e41f9016f155b90212eebd8c5e86710e93c3 Mon Sep 17 00:00:00 2001 From: Mathias Meyer Date: Wed, 20 Apr 2016 16:55:41 +0200 Subject: [PATCH 01/51] Add Berlin Node.js Community Meetup. --- data/supporters.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 42f7609..352f99b 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -739,6 +739,24 @@ "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" + } + ] } ] } From ba6d05c5f34ce5825ceee2d0445cbc35437bdb28 Mon Sep 17 00:00:00 2001 From: Robin Mehner Date: Wed, 27 Apr 2016 13:24:41 +0200 Subject: [PATCH 02/51] Add Berlin.JS to Berlin Code Of Conduct --- data/supporters.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 352f99b..fb94b0a 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -757,6 +757,25 @@ "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" + } + ] } ] } From a93a89aacd051917093b99269e0cf99d84159b91 Mon Sep 17 00:00:00 2001 From: Martin Zecher Date: Mon, 16 May 2016 11:50:41 +0200 Subject: [PATCH 03/51] added macoun.de to the list --- data/supporters.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index fb94b0a..514e08e 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -776,6 +776,25 @@ "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" + } + ] } ] } From 993499b1a74d27a0f5fff276c6ac753b6e77d798 Mon Sep 17 00:00:00 2001 From: Florian Gilcher Date: Wed, 18 May 2016 20:25:19 +0200 Subject: [PATCH 04/51] Add Rustfest.eu --- data/supporters.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 514e08e..2ec1c97 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -795,6 +795,20 @@ "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" + } + ] } ] } From 146d4caca00cebb5297a5360181727e72b1edab5 Mon Sep 17 00:00:00 2001 From: Tobias Pfeiffer Date: Wed, 18 May 2016 21:51:01 +0200 Subject: [PATCH 05/51] Update json due to install problems on 2.3.0 --- Gemfile.lock | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 From 6d4e65ef1f4a97810829c032a8b94cacbf280d14 Mon Sep 17 00:00:00 2001 From: Dave Brotherstone Date: Fri, 20 May 2016 07:52:46 +0200 Subject: [PATCH 06/51] Add React.HH Hamburg React Meetup --- data/supporters.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 2ec1c97..f5284b8 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -809,6 +809,32 @@ "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_" + } + ] } ] } From 367933eb310a99eadd130a07ed72d9f495361979 Mon Sep 17 00:00:00 2001 From: Gregor Elke Date: Fri, 20 May 2016 10:16:53 +0200 Subject: [PATCH 07/51] add node.HH --- data/supporters.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index f5284b8..6dd0977 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -835,6 +835,21 @@ "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" + } + ] } ] } From 1c3c0873db9f3a70c32d764fc861c37918034758 Mon Sep 17 00:00:00 2001 From: Martin Schuhfuss Date: Fri, 20 May 2016 12:45:09 +0200 Subject: [PATCH 08/51] add decodehh contact --- data/supporters.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 6dd0977..840f456 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -850,6 +850,26 @@ "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" + } + ] } ] } From b9622358de35d7e419d907738b1d775fcb5943f9 Mon Sep 17 00:00:00 2001 From: Martin Kleppe Date: Thu, 2 Jun 2016 22:42:07 +0200 Subject: [PATCH 09/51] Add HH.js (#2) --- data/supporters.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 840f456..7ec6d0e 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -870,6 +870,21 @@ "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" + } + ] } ] } From 581f5f556556e21d03a2e10ae1cf993aea7bad75 Mon Sep 17 00:00:00 2001 From: Klaus Trainer Date: Mon, 6 Jun 2016 10:50:31 +0200 Subject: [PATCH 10/51] Add CouchDB Meetup Hamburg --- data/supporters.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 7ec6d0e..e53c3ed 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -885,6 +885,21 @@ "twitter": "aemkei" } ] + }, + { + "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" + } + ] } ] } From 1de72e7ecbfd0056419584d8a9da3b469267a17e Mon Sep 17 00:00:00 2001 From: Daniel Dembach Date: Mon, 6 Jun 2016 20:43:09 +0200 Subject: [PATCH 11/51] add more HH.js contacts (#3) --- data/supporters.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index e53c3ed..0e5fae8 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -883,6 +883,23 @@ "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" } ] }, From 32eda0c085764e2d28a63731d106c10b8eca48bb Mon Sep 17 00:00:00 2001 From: Christoph Weinzierl Date: Thu, 16 Jun 2016 12:56:30 +0200 Subject: [PATCH 12/51] add dohack data --- data/supporters.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 0e5fae8..10a47ee 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -917,6 +917,20 @@ "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" + } + ] } ] } From 4e8bc732ad623ee4593633385a93bb1de18517bb Mon Sep 17 00:00:00 2001 From: Sebastian Schulze Date: Wed, 22 Jun 2016 10:59:06 +0200 Subject: [PATCH 13/51] Add italiano to the main menu. --- config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 6233a32e904b0482c1674b4a28d9f59ec3b508cd Mon Sep 17 00:00:00 2001 From: Fabio Fracassi Date: Sat, 16 Jul 2016 19:18:26 +0200 Subject: [PATCH 14/51] Add Berlin C++ User Group --- data/supporters.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 10a47ee..7b7cd39 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -931,6 +931,23 @@ "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" + }, + ] } ] } From 29d428617de92a9f917c212186e9ce1f05a5fe29 Mon Sep 17 00:00:00 2001 From: Florian Gilcher Date: Mon, 18 Jul 2016 18:19:09 +0200 Subject: [PATCH 15/51] Fix JSON --- data/supporters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/supporters.json b/data/supporters.json index 7b7cd39..8757b96 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -946,7 +946,7 @@ { "name": "Celine Dedaj", "email": "celine.dedaj@ableton.com" - }, + } ] } ] From 4b86f47835914ad711157891305b6525a62c04ea Mon Sep 17 00:00:00 2001 From: Nina Date: Thu, 8 Sep 2016 00:02:06 +0200 Subject: [PATCH 16/51] Update supporters.json --- data/supporters.json | 46 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/data/supporters.json b/data/supporters.json index 8757b96..bd5e2b9 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -430,16 +430,16 @@ ] }, { - "name": "Wizard Amigos Institute", + "name": "WizardAmigos", "city": "Berlin", "country": "Germany", - "link": "http://wizard.amigos.institute", + "link": "http://wizardamigos.com", "twitter": "wizardamigos", "contacts": [ { - "name": "Wizard Amigo", + "name": "Wizard Amigos", "twitter": "wizardamigos", - "email": "wizard@amigos.institute" + "email": "we@wizardamigos.com" }, { "name": "Alexander Praetorius", @@ -948,6 +948,44 @@ "email": "celine.dedaj@ableton.com" } ] + }, + { + "name": "CodingAmigos - freelance collectve 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": "RefugeesWork", + "city": "Berlin", + "country": "Germany", + "link": "http://refugeeswork.com", + "twitter": "refugeeswork", + "contacts": [ + { + "name": "RefugeesWork", + "twitter": "refugeeswork", + "email": "we@refugeeswork.com" + } + ] } ] } From dc8007bb0746844684fd1d5d86b7f8fcac961420 Mon Sep 17 00:00:00 2001 From: Nina Date: Thu, 8 Sep 2016 17:03:13 +0200 Subject: [PATCH 17/51] Update supporters.json I just noticed that titles are all caps, so I did spacing in the names of our projects:) --- data/supporters.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/supporters.json b/data/supporters.json index bd5e2b9..983597c 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -430,7 +430,7 @@ ] }, { - "name": "WizardAmigos", + "name": "Wizard Amigos", "city": "Berlin", "country": "Germany", "link": "http://wizardamigos.com", @@ -950,7 +950,7 @@ ] }, { - "name": "CodingAmigos - freelance collectve of freelance developers", + "name": "Coding Amigos - collective of freelance developers", "city": "Berlin", "country": "Germany", "link": "http://codingamigos.com", @@ -974,7 +974,7 @@ ] }, { - "name": "RefugeesWork", + "name": "Refugees Work", "city": "Berlin", "country": "Germany", "link": "http://refugeeswork.com", From 7070b832eef4b3a9fa03c30a414ac9c86a3bb4b9 Mon Sep 17 00:00:00 2001 From: Soenke Ruempler Date: Sun, 18 Sep 2016 22:12:18 +0200 Subject: [PATCH 18/51] Add serverless Hamburg Usergroup --- data/supporters.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 983597c..b257a94 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -986,6 +986,19 @@ "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" + } + ] } ] } From d3fe0cc6b3725733f95b72729ee66da8a03afe48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20M=C3=BCllerchen?= Date: Tue, 4 Oct 2016 10:54:53 +0200 Subject: [PATCH 19/51] Hamburg AngularJS Meetup --- data/supporters.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index b257a94..19a0cec 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -999,6 +999,24 @@ "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 Müllerchen", + "email": "dave@webdave.de", + "twitter": "webdave_de" + }, + { + "name": "John Behrens", + "twitter": "WebConsultsEu" + } + ] } ] } From c5b970062a92fa965c00a174a218d997d0808866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20M=C3=BCllerchen?= Date: Tue, 4 Oct 2016 10:56:32 +0200 Subject: [PATCH 20/51] rm special caracter --- data/supporters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/supporters.json b/data/supporters.json index 19a0cec..f1548a9 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1008,7 +1008,7 @@ "twitter": "angular_hamburg", "contacts": [ { - "name": "David Müllerchen", + "name": "David Muellerchen", "email": "dave@webdave.de", "twitter": "webdave_de" }, From dd06dc7f399648b06cd4b1cd067561ac3a86fcb5 Mon Sep 17 00:00:00 2001 From: danibentrup Date: Wed, 9 Nov 2016 14:11:09 +0100 Subject: [PATCH 21/51] Update supporters.json --- data/supporters.json | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/data/supporters.json b/data/supporters.json index f1548a9..828801f 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1017,6 +1017,16 @@ "twitter": "WebConsultsEu" } ] - } - ] -} + }, + { + "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" + } + ] From 9089b86c6231bd6f1b15b8c259c19a62047da035 Mon Sep 17 00:00:00 2001 From: danibentrup Date: Wed, 9 Nov 2016 14:57:28 +0100 Subject: [PATCH 22/51] Update supporters.json --- data/supporters.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 828801f..dffdb30 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1030,3 +1030,6 @@ "email": "daniela@data-artisans.com" } ] + } + ] +} From 5c49f2e54295aba6325160eaa970558402954e41 Mon Sep 17 00:00:00 2001 From: Sebastian Waschnick Date: Sun, 20 Nov 2016 10:33:14 +0100 Subject: [PATCH 23/51] adding hackerstolz --- data/supporters.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index f1548a9..26ceee5 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1017,6 +1017,19 @@ "twitter": "WebConsultsEu" } ] + }, + { + "name": "Hackerstolz e.V.", + "city": "Berlin", + "country": "Germany", + "link": "http://www.hackerstolz.de", + "twitter": "hackerstolz", + "contacts": [ + { + "name": "Sebastian Waschnick", + "twitter": "waschnick" + } + ] } ] } From a8fc5df9e3cce1349dbe8c324044f23dbe284ff2 Mon Sep 17 00:00:00 2001 From: Thomas Schranz Date: Wed, 25 Jan 2017 13:09:27 +0100 Subject: [PATCH 24/51] Add Lemmings --- data/supporters.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 26ceee5..62ac768 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1030,6 +1030,19 @@ "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" + } + ] } ] } From 4a594d6e126f2883a10ad53f3b9ea18e24b46097 Mon Sep 17 00:00:00 2001 From: Amr Abdelwahab Date: Thu, 2 Mar 2017 21:07:38 +0100 Subject: [PATCH 25/51] Add Euruko 2017 conference to the list of supporters --- data/supporters.json | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 62ac768..6dff3af 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", From e9f9e371ec041d6502ee9c7da004e4ad8177d856 Mon Sep 17 00:00:00 2001 From: David Pichsenmeister Date: Sun, 5 Mar 2017 16:27:42 +0100 Subject: [PATCH 26/51] Added BotsHub to supporters.json --- data/supporters.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 6dff3af..b1d61bf 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1065,6 +1065,36 @@ "twitter": "__tosh" } ] + }, + { + "name": "BotsHub Vienna", + "city": "Vienna", + "country": "Austria", + "link": "http://botshub.org", + "contacts": [ + { + "name": "David Pichsenmeister", + "email": "thomas+lemmings@blossom.io", + "twitter": "3x14159265" + }, + { + "name": "Thomas Schranz", + "email": "thomas+lemmings@blossom.io", + "twitter": "__tosh" + }, + { + "name": "Jakob Reiter", + "twitter": "reiter_jakob" + }, + { + "name": "Natalie Korotaeva", + "twitter": "siberiancyborg" + }, + { + "name": "Barbara Ondrisek", + "twitter": "electrobabe" + } + ] } ] } From 65927b2d1384f6089e6f8983eff4f09151595411 Mon Sep 17 00:00:00 2001 From: David Pichsenmeister Date: Sun, 5 Mar 2017 16:34:48 +0100 Subject: [PATCH 27/51] Added BotsHub to supporters.json --- data/supporters.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/supporters.json b/data/supporters.json index b1d61bf..2739f7a 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1074,12 +1074,10 @@ "contacts": [ { "name": "David Pichsenmeister", - "email": "thomas+lemmings@blossom.io", "twitter": "3x14159265" }, { "name": "Thomas Schranz", - "email": "thomas+lemmings@blossom.io", "twitter": "__tosh" }, { From 13fbc4c8c7e89117f483c19ec7ca364a687bf567 Mon Sep 17 00:00:00 2001 From: Piotr Szotkowski Date: Thu, 9 Mar 2017 11:38:36 +0100 Subject: [PATCH 28/51] Update WRUG phone number --- data/supporters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/supporters.json b/data/supporters.json index 6dff3af..e0e07ab 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -289,7 +289,7 @@ "contacts": [ { "name": "Piotr Szotkowski", - "phone": "+48 533 950 455", + "phone": "+48 501 28 30 20", "email": "chastell@chastell.net" }, { From 651edb61924acf0d900f0e47285890f26e1c4a02 Mon Sep 17 00:00:00 2001 From: opengnsys Date: Thu, 6 Apr 2017 12:54:02 +0200 Subject: [PATCH 29/51] Add OpenGnsys Project to supporters.json Add contact data of the OpenGnsys Project to supporters.json file. --- data/supporters.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index e0e07ab..c20771e 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1065,6 +1065,19 @@ "twitter": "__tosh" } ] + }, + { + "name": "OpenGnsys Project", + "city": "Zaragoza", + "country": "Spain", + "link": "http://opengnsys.es", + "twitter": "opengnsys", + "contacts": [ + { + "name": "OpenGnsys Project", + "email": "opengnsys@gmail.com" + } + ] } ] } From fa2f97173a6f7d05e7c77d0f4c9ab7e7e1b936b1 Mon Sep 17 00:00:00 2001 From: SQL_aus_HH Date: Fri, 14 Apr 2017 11:10:48 +0200 Subject: [PATCH 30/51] Update supporters.json --- data/supporters.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index c20771e..32a943a 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1078,6 +1078,21 @@ "email": "opengnsys@gmail.com" } ] + }, + { + "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" + } + ] } + ] } From 635e5c426d0c0a5b605f6c592371df3bd1327652 Mon Sep 17 00:00:00 2001 From: MichaelBlume23 Date: Fri, 21 Apr 2017 09:52:56 +0200 Subject: [PATCH 31/51] Update supporters.json --- data/supporters.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index c20771e..9a5d8b5 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1079,5 +1079,18 @@ } ] } + { + "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" + } + ] + } ] } From 5120f06cdeeaad65da434d146211a2a7ee5ae9f0 Mon Sep 17 00:00:00 2001 From: Genadi Samokovarov Date: Sun, 23 Apr 2017 14:34:03 +0300 Subject: [PATCH 32/51] Add partial :: Conf as a supporter I'm one of the EuRuKo 2016 organizers. We're planning a new conference, called [`partial :: Conf`](http://partialconf.com) which we're pretty close to announcing. We used the Berlin Code of Conduct for EuRuKo and we'll try to use it for Partial as well. --- data/supporters.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index c20771e..107362f 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1078,6 +1078,35 @@ "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" + } + ] } ] } From 149c1747f0631f1766b0ebcd8ac277ee14ee4066 Mon Sep 17 00:00:00 2001 From: Tobias Pfeiffer Date: Mon, 24 Apr 2017 10:29:17 +0200 Subject: [PATCH 33/51] Fix JSON error in Mafdeburg developer days --- data/supporters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/supporters.json b/data/supporters.json index 83712fd..1d68ba6 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1107,7 +1107,7 @@ "email": "me@vestimir.com" } ] - } + }, { "name": "Magdeburger Developer Days", "city": "Magdeburg", From 1f4fd376318cb2bcbc077bec990e72bdd486df0f Mon Sep 17 00:00:00 2001 From: Alex Coles Date: Fri, 28 Apr 2017 11:22:58 +0100 Subject: [PATCH 34/51] Add Isle of Ruby as a supporter --- data/supporters.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 1d68ba6..034b454 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1120,6 +1120,30 @@ "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" + } + ] } ] } From 68ce059cce8b258f7f6dd3ee4978bf736504f0c7 Mon Sep 17 00:00:00 2001 From: Julien Deswaef Date: Fri, 5 May 2017 17:27:02 -0400 Subject: [PATCH 35/51] Adding Hardware Hack Lab support --- data/supporters.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index df90fc8..4144501 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1158,6 +1158,20 @@ "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@thoughworks.com" + } + ] } ] } From 6fc27833b37ec3710bcca44b2666c11bf2175131 Mon Sep 17 00:00:00 2001 From: Julien Deswaef Date: Tue, 9 May 2017 14:44:37 -0400 Subject: [PATCH 36/51] Added all contact information --- data/supporters.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/data/supporters.json b/data/supporters.json index 4144501..43dc292 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1169,7 +1169,23 @@ { "name": "Julien Deswaef", "twitter": "xuv", - "email": "julien.deswaef@thoughworks.com" + "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" } ] } From c3534aec1f63ab0a8abde35ea5e617ff9fbc2f41 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Wed, 10 May 2017 14:40:51 +0100 Subject: [PATCH 37/51] Added C++::London --- data/supporters.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 43dc292..efd90c5 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1186,6 +1186,19 @@ "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" } ] } From 61f87d177ab4986f858807d64efb32908b71a8eb Mon Sep 17 00:00:00 2001 From: Toby Allsopp Date: Thu, 11 May 2017 21:06:46 +1200 Subject: [PATCH 38/51] Add Auckland C++ Meetup Also fix up what looks like a merge conflict resolution error. --- data/supporters.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/data/supporters.json b/data/supporters.json index efd90c5..21164df 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1186,7 +1186,9 @@ "name": "Kent Rahman", "email": "krahman@thoughtworks.com", "phone": "+1 917 734 7635" - }, + } + ] + }, { "name": "C++::London", "city": "London", @@ -1201,6 +1203,20 @@ "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" + } + ] } ] } From 3e705db9cb3ce4425817abc269f92e75c7d6b20e Mon Sep 17 00:00:00 2001 From: Gorazd Kozmus Date: Fri, 26 May 2017 23:19:53 +0200 Subject: [PATCH 39/51] add Scala Swarm Conf --- data/supporters.json | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/data/supporters.json b/data/supporters.json index 21164df..03f510b 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -781,7 +781,7 @@ ] }, { - "name": "Berlin.JS – Berlin JavaScript usergroup", + "name": "Berlin.JS – Berlin JavaScript usergroup", "city": "Berlin", "country": "Germany", "link": "http://www.berlinjs.org", @@ -1217,6 +1217,21 @@ "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" + } + ] } ] } From b0216676f912fa28ab2b50c9ccd154182d9a017a Mon Sep 17 00:00:00 2001 From: Benjamin Huepeden Date: Thu, 1 Jun 2017 19:21:48 +0200 Subject: [PATCH 40/51] Added Azure Meetups in Hanover and Berlin Added Azure Meetup Hannover and Azure Meetup Berlin to supporters.json, along with community organizers. --- data/supporters.json | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 03f510b..fa9680d 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1232,6 +1232,42 @@ "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" + } + ] } ] } From 27c23b8dafa2443427693147185843d00e5d23e3 Mon Sep 17 00:00:00 2001 From: "i.n.g.o" Date: Mon, 12 Jun 2017 00:37:28 +0200 Subject: [PATCH 41/51] adding eTextile SummerCamp --- data/supporters.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index fa9680d..570334c 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1268,6 +1268,18 @@ "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" + } + ] } ] } From bfeabdaf4f6462e75d09e434d8fc9fc09de910ad Mon Sep 17 00:00:00 2001 From: Tobias Pfeiffer Date: Tue, 13 Jun 2017 22:16:02 +0200 Subject: [PATCH 42/51] Fix JSON --- data/supporters.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/data/supporters.json b/data/supporters.json index 653e691..2e2f17e 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -123,7 +123,7 @@ } ] }, - { + { "name": "Rails Girls Berlin", "city": "Berlin", "country": "Germany", @@ -237,7 +237,7 @@ } ] }, - { + { "name": "Rails Girls Hamburg", "city": "Hamburg", "country": "Germany", @@ -1066,7 +1066,7 @@ } ] }, - { + { "name": "OpenGnsys Project", "city": "Zaragoza", "country": "Spain", @@ -1305,10 +1305,12 @@ }, { "name": "Barbara Ondrisek", - "twitter": "electrobabe" + "twitter": "electrobabe" + } + ] }, { - "name": "Apache Flink Meetup Berlin", + "name": "Apache Flink Meetup Berlin", "city": "Berlin", "country": "Germany", "link": "http://www.meetup.com/de-DE/Apache-Flink-Meetup/", From 60cc85ade6f338b7d3d0d7191909f891b045da0c Mon Sep 17 00:00:00 2001 From: Irina Lindt Date: Mon, 19 Jun 2017 11:56:57 +0200 Subject: [PATCH 43/51] added Hamburg supporters --- data/supporters.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 2e2f17e..d5bd08a 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -206,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" } ] }, From 016b495c3627ad1e35a4414e11368b36d01b8288 Mon Sep 17 00:00:00 2001 From: danibentrup Date: Wed, 21 Jun 2017 09:00:12 +0200 Subject: [PATCH 44/51] Create supporters.json (#129) Flink Forward --- data/supporters.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index d5bd08a..fdeb4e0 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1331,6 +1331,32 @@ "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" + } + ] } ] } From eec9741660ee90a554bbcd332697cd3eea9b3c8b Mon Sep 17 00:00:00 2001 From: Robert Haritonov Date: Mon, 31 Jul 2017 23:48:45 +0200 Subject: [PATCH 45/51] add React Day Berlin to supporters --- data/supporters.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index fdeb4e0..26ad698 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1357,6 +1357,18 @@ "email": "daniela@data-artisans.com" } ] + }, + { + "name": "React Day Berlin", + "city": "Berlin", + "country": "Germany", + "link": "https://reactday.berlin", + "contacts": [ + { + "name": "Robert Haritonov", + "twitter": "operatino" + } + ] } ] } From be6cd6914c04aefd08c09dbeef365a4123b64b09 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 13 Aug 2017 12:54:37 +0200 Subject: [PATCH 46/51] add Ionic Berlin to supporters (#133) * add Ionic Berlin to supporters * fix invalid json * fix invalid json 2 --- data/supporters.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 26ad698..c00bd0a 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1369,6 +1369,18 @@ "twitter": "operatino" } ] + }, + { + "name": "Ionic Berlin", + "city": "Berlin", + "country": "Germany", + "link": "https://www.meetup.com/Ionic-Berlin/", + "contacts": [ + { + "name": "IonicBerlin", + "twitter": "IonicBerlin" + } + ] } ] } From 552b612ddc6a38e8df0cc137e9da00055084e33c Mon Sep 17 00:00:00 2001 From: Olli Puurunen Date: Fri, 25 Aug 2017 13:28:24 +0300 Subject: [PATCH 47/51] Add Qt World Summit to supporters --- data/supporters.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index c00bd0a..154fa30 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1381,6 +1381,18 @@ "twitter": "IonicBerlin" } ] + }, + { + "name": "Qt World Summit 2017", + "city": "Berlin", + "country": "Germany", + "link": "https://www.qtworldsummit.com/", + "contacts": [ + { + "name": "Qt Project", + "twitter": "QtProject" + } + ] } ] } From 46ac297bb97aecea2eedb29a70292b42d3ada905 Mon Sep 17 00:00:00 2001 From: Lucy Patterson Date: Fri, 1 Sep 2017 14:03:45 +0200 Subject: [PATCH 48/51] Added Science Hack Day Berlin --- data/supporters.json | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/data/supporters.json b/data/supporters.json index 154fa30..6eb652f 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1393,6 +1393,29 @@ "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" + } + ] } ] } From b0c87e3f22dd18b9906652125a4d85e9af35bd1a Mon Sep 17 00:00:00 2001 From: Florian Gilcher Date: Fri, 1 Sep 2017 14:20:03 +0200 Subject: [PATCH 49/51] Fix JSON --- data/supporters.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/supporters.json b/data/supporters.json index 6eb652f..a9bd86e 100644 --- a/data/supporters.json +++ b/data/supporters.json @@ -1402,17 +1402,17 @@ "contacts": [ { "name": "Lucy Patterson", - "twitter": "lu_cyP" + "twitter": "lu_cyP", "email": "lucy.shd@opentechschool.org" }, { "name": "Joram Schwartzmann", - "twitter": "sciencejoram" + "twitter": "sciencejoram", "email": "joram.shd@opentechschool.org" }, { "name": "Giulia Paparo", - "twitter": "giu_pap" + "twitter": "giu_pap", "email": "giulia.shd@opentechschool.org" } ] From c2a5ee30224b9570c537a1d74f84ce537b45e4d3 Mon Sep 17 00:00:00 2001 From: Florian Gilcher Date: Sun, 10 Sep 2017 11:38:10 +0200 Subject: [PATCH 50/51] Fix link in README --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 5715e74..722303b 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,7 @@ Do you want to translate to another language? Great! If you want to translate fr 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 From 750efa3a1624db59d078bbfd0ee7a6a04757e104 Mon Sep 17 00:00:00 2001 From: Florian Gilcher Date: Sun, 10 Sep 2017 13:05:45 +0200 Subject: [PATCH 51/51] Remove "expected behaviour" paragraph --- source/localizable/_code-of-conduct.de.md | 14 -------------- source/localizable/_code-of-conduct.en.md | 11 ----------- source/localizable/_code-of-conduct.es.md | 11 ----------- source/localizable/_code-of-conduct.fr.md | 10 ---------- source/localizable/_code-of-conduct.it.md | 10 ---------- source/localizable/_code-of-conduct.pl.md | 10 ---------- 6 files changed, 66 deletions(-) diff --git a/source/localizable/_code-of-conduct.de.md b/source/localizable/_code-of-conduct.de.md index e1c2149..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 ----------------------- diff --git a/source/localizable/_code-of-conduct.en.md b/source/localizable/_code-of-conduct.en.md index 17d2357..9482dea 100644 --- a/source/localizable/_code-of-conduct.en.md +++ b/source/localizable/_code-of-conduct.en.md @@ -17,17 +17,6 @@ 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 --------------------- diff --git a/source/localizable/_code-of-conduct.es.md b/source/localizable/_code-of-conduct.es.md index 97b3293..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 -------------------------- 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 527959b..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 --------------------------