Skip to content
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.

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

Remove "expected behaviour" paragraph #138

Open
wants to merge 88 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 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
750efa3
Remove "expected behaviour" paragraph
skade Sep 10, 2017
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
5 changes: 4 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -133,3 +133,6 @@ DEPENDENCIES
middleman-deploy
middleman-livereload
wdm (~> 0.1.0)

BUNDLED WITH
1.11.2
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading