Skip to content

Add Berlin Buzzwords and FOSS Backstage #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 137 commits into from
Closed

Add Berlin Buzzwords and FOSS Backstage #170

Changes from 1 commit
Commits
Show all changes
137 commits
Select commit Hold shift + click to select a range
6524e41
Add Berlin Node.js Community Meetup.
roidrage Apr 20, 2016
69861c4
Merge pull request #93 from roidrage/master
PragTob Apr 21, 2016
ba6d05c
Add Berlin.JS to Berlin Code Of Conduct
rmehner Apr 27, 2016
f8e3a1f
Merge pull request #94 from rmehner/add-berlinjs
skade Apr 27, 2016
a93a89a
added macoun.de to the list
tieftoener May 16, 2016
766f786
Merge pull request #95 from tieftoener/master
hagenburger May 16, 2016
993499b
Add Rustfest.eu
skade May 18, 2016
7b71805
Merge pull request #100 from skade/rustfest-eu
PragTob May 18, 2016
146d4ca
Update json due to install problems on 2.3.0
PragTob May 18, 2016
6d4e65e
Add React.HH
bruderstein May 20, 2016
367933e
add node.HH
greelgorke May 20, 2016
1c3c087
add decodehh contact
usefulthink May 20, 2016
8f059b9
Merge pull request #1 from usefulthink/patch-1
bruderstein May 20, 2016
b962235
Add HH.js (#2)
aemkei Jun 2, 2016
581f5f5
Add CouchDB Meetup Hamburg
KlausTrainer Jun 6, 2016
1de72e7
add more HH.js contacts (#3)
dmbch Jun 6, 2016
8abda1b
Merge pull request #102 from bruderstein/web-hh
PragTob Jun 6, 2016
32eda0c
add dohack data
wirebug Jun 16, 2016
911d93d
Merge pull request #105 from wirebug/feature/add-dohack
PragTob Jun 16, 2016
b299838
Merge pull request #103 from 10ko/master
skade Jun 22, 2016
4e8bc73
Add italiano to the main menu.
bascht Jun 22, 2016
6233a32
Add Berlin C++ User Group
FabioFracassi Jul 16, 2016
0fc3b95
Merge pull request #106 from CppUGBerlin/master
skade Jul 16, 2016
29d4286
Fix JSON
skade Jul 18, 2016
4b86f47
Update supporters.json
ninabreznik Sep 7, 2016
c89bdff
Merge pull request #107 from ninabreznik/patch-2
PragTob Sep 8, 2016
dc8007b
Update supporters.json
ninabreznik Sep 8, 2016
0bb2dc4
Merge pull request #108 from ninabreznik/patch-3
PragTob Sep 8, 2016
7070b83
Add serverless Hamburg Usergroup
s0enke Sep 18, 2016
d20089b
Merge pull request #109 from s0enke/patch-1
PragTob Sep 19, 2016
d3fe0cc
Hamburg AngularJS Meetup
Oct 4, 2016
c5b9700
rm special caracter
Oct 4, 2016
95e0e44
Merge pull request #110 from web-dave/master
hagenburger Oct 4, 2016
dd06dc7
Update supporters.json
Nov 9, 2016
9089b86
Update supporters.json
Nov 9, 2016
5c49f2e
adding hackerstolz
Nov 20, 2016
2e7db49
Merge pull request #113 from CanardSauvage/adding_hackerstolz_as_supp…
PragTob Nov 20, 2016
a8fc5df
Add Lemmings
tosh Jan 25, 2017
f8300fd
Merge pull request #114 from tosh/patch-1
hagenburger Jan 25, 2017
4a594d6
Add Euruko 2017 conference to the list of supporters
amrabdelwahab Mar 2, 2017
7355cd5
Merge pull request #115 from amrabdelwahab/master
PragTob Mar 3, 2017
e9f9e37
Added BotsHub to supporters.json
pichsenmeister Mar 5, 2017
65927b2
Added BotsHub to supporters.json
pichsenmeister Mar 5, 2017
13fbc4c
Update WRUG phone number
chastell Mar 9, 2017
bd2cee0
Merge pull request #117 from rubyberlin/update-wrug-phone-number
PragTob Mar 9, 2017
651edb6
Add OpenGnsys Project to supporters.json
opengnsys Apr 6, 2017
5a8f3b9
Merge pull request #118 from opengnsys/master
PragTob Apr 7, 2017
fa2f971
Update supporters.json
Apr 14, 2017
635e5c4
Update supporters.json
MichaelBlume23 Apr 21, 2017
2ab9b4a
Merge pull request #120 from MichaelBlume23/master
PragTob Apr 23, 2017
5120f06
Add partial :: Conf as a supporter
gsamokovarov Apr 23, 2017
0215baf
Merge pull request #121 from gsamokovarov/patch-1
PragTob Apr 24, 2017
149c174
Fix JSON error in Mafdeburg developer days
PragTob Apr 24, 2017
1f4fd37
Add Isle of Ruby as a supporter
myabc Apr 28, 2017
0ee7450
Merge pull request #122 from rubyberlin/add-isleofruby
PragTob Apr 28, 2017
ab69f3c
Merge Azure Hamburg supprot group
PragTob Apr 28, 2017
68ce059
Adding Hardware Hack Lab support
xuv May 5, 2017
6fc2783
Added all contact information
xuv May 9, 2017
667f819
Merge pull request #123 from hardware-hack-lab/add-hardware-hack-lab-…
PragTob May 9, 2017
c3534ae
Added C++::London
philsquared May 10, 2017
15b48e8
Merge pull request #124 from philsquared/master
skade May 10, 2017
61f87d1
Add Auckland C++ Meetup
toby-allsopp May 11, 2017
e69a409
Merge pull request #125 from toby-allsopp/master
PragTob May 13, 2017
3e705db
add Scala Swarm Conf
c05m1x May 26, 2017
16a2c4b
Merge pull request #126 from c05m1x/master
PragTob May 29, 2017
b021667
Added Azure Meetups in Hanover and Berlin
phoenix-pnp Jun 1, 2017
6ef50ea
Merge pull request #127 from bhuepeden/master
PragTob Jun 2, 2017
27c23b8
adding eTextile SummerCamp
i-n-g-o Jun 11, 2017
da042df
Merge pull request #128 from i-n-g-o/master
PragTob Jun 13, 2017
cf7823a
Merge branch 'master' into master
PragTob Jun 13, 2017
0ad7c46
Merge pull request #116 from 3x14159265/master
PragTob Jun 13, 2017
c10f97a
Merge branch 'master' into master
PragTob Jun 13, 2017
c3c3c7d
Merge pull request #112 from danibentrup/master
PragTob Jun 13, 2017
bfeabda
Fix JSON
PragTob Jun 13, 2017
60cc85a
added Hamburg supporters
alster-wasser Jun 19, 2017
b00896d
Merge pull request #130 from lindtdev/adding-hamburg-rughh-supporters
hagenburger Jun 20, 2017
016b495
Create supporters.json (#129)
Jun 21, 2017
eec9741
add React Day Berlin to supporters
robhrt7 Jul 31, 2017
25ec51d
Merge pull request #132 from operatino/patch-1
PragTob Aug 1, 2017
be6cd69
add Ionic Berlin to supporters (#133)
zwacky Aug 13, 2017
552b612
Add Qt World Summit to supporters
ollipuu Aug 25, 2017
bc2f51a
Merge pull request #134 from TheQtCompany/master
skade Aug 25, 2017
46ac297
Added Science Hack Day Berlin
lucypatterson Sep 1, 2017
9037d3f
Merge pull request #135 from SHDBerlin/master
skade Sep 1, 2017
b0c87e3
Fix JSON
skade Sep 1, 2017
c2a5ee3
Fix link in README
skade Sep 10, 2017
4bbd603
Merge pull request #45 from rentalcustard/violence
skade Sep 10, 2017
40d1a2c
Remove "in public spaces"
skade Sep 10, 2017
34c8d30
Merge pull request #136 from rubyberlin/remove-public-spaces
skade Sep 10, 2017
584a82d
Fix on ruby 2.4
skade Sep 10, 2017
012544f
Merge branch 'master' of github.com:rubyberlin/code-of-conduct
skade Sep 10, 2017
4d0288f
Add creative commons sharealike 4.0 International version in EN and DE
Sep 10, 2017
ea74bf6
Merge pull request #140 from rubyberlin/update/creative-commons-attri…
skade Sep 10, 2017
4568cb1
Remove the term "public spaces" in the French version
lucaspinto Sep 12, 2017
ab6c3fe
Add "Licence and attribution" paragraph to the French version.
lucaspinto Sep 12, 2017
d27ce72
Add Málaga Python Meetup (#144)
amatellanes Sep 14, 2017
2546493
Added "License and attribution" section to Italian translation
10ko Sep 17, 2017
ede2f9c
Removed "Public spaces"
10ko Sep 17, 2017
0c1057f
Added orginariamente to make the sentence sound better
10ko Sep 17, 2017
aa96f34
Merge pull request #143 from rubyberlin/actualiser-licence
1000miles Sep 18, 2017
e08e335
Remove german term for public spaces
Sep 18, 2017
c63320c
Updated License section to link to the Italian version of CC
10ko Sep 20, 2017
88ceef1
Added missing License name
10ko Sep 20, 2017
9ecb802
Add ThoughtWorks Tech Talks NYC Meetup (#149)
giupan Sep 21, 2017
47779e2
Merge pull request #148 from rubyberlin/update/remove-public-space-te…
1000miles Sep 21, 2017
46077e6
Merge pull request #142 from rubyberlin/enlever-espace-public
1000miles Sep 21, 2017
6c98456
Merge pull request #145 from 10ko/update/remove-public-spaces-IT
1000miles Sep 21, 2017
f3b9511
Merge pull request #146 from 10ko/update/creative-commons-attribution-IT
1000miles Sep 21, 2017
9d32a40
Removed "espacios publicos" from the spanish translation
catalanojuan Sep 26, 2017
5aff895
Use the word "descapacidad" instead of "capacidad"
catalanojuan Sep 26, 2017
ce0cdfd
Added link to Creative commons license reference in spanish version
catalanojuan Sep 26, 2017
c927ff8
Merge pull request #152 from catalanojuan/patch-1
Oct 1, 2017
2c5da4a
Merge pull request #153 from catalanojuan/changed-to-discapacidad
Oct 1, 2017
88a3cd6
Add C++ Edinburgh to supporters (#156)
TartanLlama Oct 10, 2017
bbd4a17
Add contacts to React Day Berlin section
robhrt7 Oct 12, 2017
7272a41
Added C++ User Group Munich
ComicSansMS Oct 22, 2017
b931078
Merge pull request #158 from ComicSansMS/master
hagenburger Oct 22, 2017
7c51c00
add BeeScalaConf
c05m1x Oct 22, 2017
3baa2da
Merge pull request #159 from c05m1x/master
hagenburger Oct 23, 2017
3702581
Merge pull request #157 from operatino/patch-2
skade Oct 23, 2017
b496e73
feat(add meetup): add SinnerSchrader Hamburg meetup
kotzendekrabbe Nov 6, 2017
5c2be2c
Merge pull request #160 from sinnerschrader/master
hagenburger Nov 6, 2017
69e747f
Add PyLight Meetup to supporters.json
Nov 25, 2017
633bd07
Merge pull request #162 from PyLightMeetup/add-org
hagenburger Nov 25, 2017
1dc400b
Merge pull request #154 from catalanojuan/fixed-creative-commons-lice…
chastell Nov 26, 2017
8955d97
add RubyUnconf Hamburg
halfbyte Jan 10, 2018
b1b9764
Merge pull request #163 from rughh/rubyunconf-hamburg
skade Jan 10, 2018
7b08eaf
Update supporters.json
lpassig Feb 1, 2018
3a0f671
Merge pull request #165 from lpassig/lpassig-AzureMeetupMunich
hagenburger Feb 1, 2018
3dfde5d
Add the Malmö.rb user group as Supporters
olleolleolle Feb 9, 2018
882ae1a
Merge pull request #166 from olleolleolle/patch-1
hagenburger Feb 9, 2018
5a72ee5
Add filterclub.hu
nemeth Feb 20, 2018
bfb20de
Add React.NotAConf as a supporter
janettt Feb 24, 2018
9f12ddb
Move React.NotAConf to the end of the list
janettt Feb 24, 2018
7fc4021
Add Berlin Buzzwords and FOSS Backstage
tthePB Feb 26, 2018
1b391c1
Add Berlin Buzzwords & FOSS Backstage
tthePB Feb 26, 2018
6ce44fb
Update supporters.json
tthePB Feb 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update supporters.json
  • Loading branch information
@tthePB
tthePB authored Feb 26, 2018
commit 6ce44fb8f8fd901cd92fb9297e8e28d007acf85d
16 changes: 8 additions & 8 deletions data/supporters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,13 +1657,13 @@
"contacts": [
{
"name": "Ekaterina Klykova",
"email": "ekl@newthinking.de"
"phone": "+493092105978"
"email": "ekl@newthinking.de",
"phone": "+49 3092105978"
},
{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please align the curly braces below each other for the beauty of it:

       },
       {

"name": "Paul Berschick",
"email": "pbe@newthinking.de"
"phone": "+493092105977"
"email": "pbe@newthinking.de",
"phone": "+49 3092105977"
},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only add a comma, when another opening { is following. The last item in JSON must not have a comma (in JavaScript this would be allowed though).

]
},
Expand All @@ -1676,13 +1676,13 @@
"contacts": [
{
"name": "Ekaterina Klykova",
"email": "ekl@newthinking.de"
"phone": "+493092105978"
"email": "ekl@newthinking.de",
"phone": "+49 3092105978"
},
{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

"name": "Paul Berschick",
"email": "pbe@newthinking.de"
"phone": "+493092105977"
"email": "pbe@newthinking.de",
"phone": "+49 3092105977"
},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

]
}
Expand Down