diff --git a/_events.yml b/_events.yml index f790cfbb..a282b6a8 100644 --- a/_events.yml +++ b/_events.yml @@ -198,6 +198,14 @@ country: "Canada" link: "https://blockchainforum.ca/" +- date: 2017-06-25 + title: "An Introduction to Cryptocurrencies & the Blockchain" + venue: "Holiday Inn Express" + address: "Birmingham Road, Wall Island, WS14 0QP" + city: "Lichfield" + country: "United Kingdom" + link: "https://www.eventbrite.co.uk/e/an-introduction-to-cryptocurrencies-bitcoin-ethereum-the-blockchain-tickets-35404136726" + - date: 2017-06-26 title: "Money 2020 Europe" venue: "Bella Center" @@ -230,6 +238,22 @@ country: "The Netherlands" link: "http://amsterdam.keynote.ae/" +- date: 2017-07-20 + title: "P2PFISY2017" + venue: "University College London" + address: "Gower Street" + city: "London" + country: "United Kingdom" + link: "http://www.p2pfisy.com" + +- date: 2017-07-22 + title: "State of Digital Money 2017" + venue: "Cross Campus Downtown Los Angeles" + address: "800 Wilshire Blvd, 90017" + city: "Los Angeles, CA" + country: "United States" + link: "http://stateofdigitalmoney.com/" + - date: 2017-09-12 title: "The Advanced Digital Innovation Summit" venue: "McCarthy Tetrault" diff --git a/_templates/community.html b/_templates/community.html index adcaa757..d76cf2ad 100644 --- a/_templates/community.html +++ b/_templates/community.html @@ -191,18 +191,32 @@ id: community Bitcoin Društvo Slovenije

+
+

Spanish flagSpain

+

+ Avalbit +

+

Swedish flagSweden

Svenska Bitcoinföreningen

+ +

Swiss flagSwitzerland

Bitcoin Association Switzerland

+
+

Venezuelan flagVenezuela

+

+ Fundación Bitcoin de Venezuela +

+
diff --git a/_templates/exchanges.html b/_templates/exchanges.html index 1729cac8..2ba2c942 100644 --- a/_templates/exchanges.html +++ b/_templates/exchanges.html @@ -29,6 +29,17 @@ id: exchanges Local Bitcoins
Xapo

+ +
+

EU flagEurope

+

+ AnyCoin Direct
+ Bitcoin.de
+ BitPanda
+ BL3P
+ Paymium
+ The Rock Trading +

Argentinan flagArgentina

@@ -37,6 +48,8 @@ id: exchanges SatoshiTango

+ +

Australian flagAustralia

@@ -47,8 +60,6 @@ id: exchanges HardBlock

-
-

Brazilian flagBrazil

@@ -56,19 +67,36 @@ id: exchanges Mercado Bitcoin

+
+

Cambodian flagCambodia

+

+ Bitcoin Cambodia +

+
+
+

Canadian flagCanada

+ Bitaccess
Canadian Bitcoins
QuickBT

-
+

Chinese flagChina

- BTCC + BTCC
+ Huobi
+ OKCoin

+
+

Costa Rican flagCosta Rica

+

+ BitMae +

+
@@ -97,9 +125,10 @@ id: exchanges

Indonesian flagIndonesia

- Bitcoin Indonesia + Bitcoin Indonesia
+ Luno

-
+

Israeli flagIsrael

@@ -111,7 +140,6 @@ id: exchanges

Italian flagItaly

Postebit
- The Rock Trading

@@ -124,6 +152,12 @@ id: exchanges Coincheck

+
+

Malaysian flagMalaysia

+

+ Luno +

+

Mexican flagMexico

@@ -131,14 +165,20 @@ id: exchanges Volabit

-
-

Saudi Arabian flagSaudi Arabia

-

- BitOasis -

-
+
+

Nigerian flagNigeria

+

+ Luno +

+
+
+

Singaporean flagSingapore

+

+ Luno +

+

South African flagSouth Africa

@@ -146,6 +186,8 @@ id: exchanges Luno

+
+

South Korean flagSouth Korea

@@ -155,11 +197,17 @@ id: exchanges

-

Turkish flagTurkey

+

Ukraine flagUkraine

- BTCTurk + Kuna

-
+
+
+

United Arab Emirates flagUnited Arab Emirates

+

+ BitOasis +

+
@@ -176,9 +224,16 @@ id: exchanges Coinbase
Gemini

+
+
+

Venezuelan flagVenezuela

+

+ Cryptobuyer +

+ diff --git a/img/flags/CR.png b/img/flags/CR.png new file mode 100644 index 00000000..95206cfb Binary files /dev/null and b/img/flags/CR.png differ diff --git a/img/flags/ES.png b/img/flags/ES.png new file mode 100644 index 00000000..bef0a456 Binary files /dev/null and b/img/flags/ES.png differ diff --git a/img/flags/KH.png b/img/flags/KH.png new file mode 100644 index 00000000..7cb4b231 Binary files /dev/null and b/img/flags/KH.png differ diff --git a/img/flags/MY.png b/img/flags/MY.png new file mode 100644 index 00000000..9280e983 Binary files /dev/null and b/img/flags/MY.png differ diff --git a/img/flags/NG.png b/img/flags/NG.png new file mode 100644 index 00000000..600a9788 Binary files /dev/null and b/img/flags/NG.png differ diff --git a/img/flags/SG.png b/img/flags/SG.png new file mode 100644 index 00000000..37e9609b Binary files /dev/null and b/img/flags/SG.png differ diff --git a/img/flags/UAE.png b/img/flags/UAE.png new file mode 100644 index 00000000..1a7bc79a Binary files /dev/null and b/img/flags/UAE.png differ diff --git a/img/flags/VE.png b/img/flags/VE.png new file mode 100644 index 00000000..82818894 Binary files /dev/null and b/img/flags/VE.png differ