diff --git a/README.md b/README.md index b5b655fb..ba0c878d 100644 --- a/README.md +++ b/README.md @@ -193,18 +193,16 @@ Any change in the English text can be done through a pull request on GitHub. If ### Events -Events should be placed in `_events/YYYY-MM-DD-SHORTTITLE.md` and adhere to this format: +Events should be placed in `_events.yml` and adhere to this format: ``` ---- -date: 2014-02-21 -title: "2014 Texas Bitcoin Conference" -venue: "Circuit of the Americas™ - Technology and Conference Center" -address: "9201 Circuit of the Americas Blvd" -city: "Austin, TX" -country: "United States" -link: "http://texasbitcoinconference.com/" ---- +- date: 2014-02-21 + title: "2014 Texas Bitcoin Conference" + venue: "Circuit of the Americas™ - Technology and Conference Center" + address: "9201 Circuit of the Americas Blvd" + city: "Austin, TX" + country: "United States" + link: "http://texasbitcoinconference.com/" ``` ### Release Notes diff --git a/_events.yml b/_events.yml new file mode 100644 index 00000000..20ba8525 --- /dev/null +++ b/_events.yml @@ -0,0 +1,144 @@ +- date: 2014-11-18 + title: "Cryptocurrencies: The Challenges & Opportunities Ahead" + venue: swissnex Boston + address: 420 Broadway + city: Cambridge, MA + country: United States + link: http://goo.gl/EdzG2r + +- date: 2014-11-20 + title: "Inside Bitcoins Paris" + venue: "Espaces Cap 15" + address: "1/13 Quai de Grenelle, 75015 PARIS" + city: "Paris" + country: "France" + link: "http://insidebitcoins.fr/?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibpar" + +- date: 2014-11-21 + title: "Bangkok Bitcoin Expo" + venue: "Queen Sirikit National Convention Center (QSNCC)" + address: "60 New Rachadapisek Road, Klongtoey, + Bangkok 10110, Thailand" + city: "Bangkok" + country: "Thailand" + link: "http://bangkok-bitcoin-expo.com/" + +- date: 2014-11-22 + title: "Bitcoin - Evoluzione in corso | Tecnologie all'orizzonte e presentazione ATM opensource" + venue: "Working Capital Accelerator - Bologna" + address: "Via Guglielmo Oberdan, 22" + city: "Bologna" + country: "Italy" + link: "http://smappo.com/event/5464d148d5c75_bitcoin-evoluzione-in-corso-tecnologie-all-orizzonte-e-presentazione-atm-opensource.html" + +- date: 2014-11-27 + title: "REBIT2014" + venue: "Centro Direzionale “Il Volo”" + address: "Largo Giambellino, 18" + city: "Reggio Emilia" + country: "Italy" + link: "http://rebit2014.it" + +- date: 2014-11-28 + title: "2014 Internet Finance Innovation CEO Summit (IFICS)—Global Bitcoin Summit" + venue: "Cyberport Hong Kong" + address: "100 Cyberport Road" + city: "Hong Kong" + country: "Hong Kong" + link: http://www.globalbtcsummit.com/ + +- date: 2014-11-29 + title: "The Bitcoin Forum: Investire nel Futuro" + venue: "Hotel Coronado" + address: "Via Francesco Borromini 10" + city: "Mendrisio" + country: "Switzerland" + link: "http://www.rischiocalcolato.it/the-bitcoin-forum" + +- date: 2014-11-29 + title: "Bitcoin-South 2014" + venue: "Millennium hotel" + address: "32 Frankton Rd" + city: "Queenstown" + country: "New Zealand" + link: "http://bitcoinsouth.co" + +- date: 2014-12-04 + title: "Bitcoin Conference Saint Petersburg" + venue: "Creative claster ArtMuze" + address: "Line 13, building 70-72" + city: "Saint Petersburg" + country: "Russia" + link: "http://bitcoinconf.spb.ru/en" + +- date: 2014-12-06 + title: "CoinWisdom Sofia" + venue: "Hotel Expo" + address: "149 Tsarigradsko Shosse" + city: "Sofia" + country: "Bulgaria" + link: "https://coinwisdomsofia.com/" + +- date: 2014-12-06 + title: "laBITconf 2014" + venue: "Rio Othon Palace" + address: "Avenida Atlantica 3264, Copacabana" + city: "Rio de Janeiro" + country: "Brazil" + link: "http://labitconf.com/" + +- date: 2014-12-11 + title: "Dubai Bitcoin Conference" + venue: "Dubai International Financial Center" + address: "Dubai International Financial Center" + city: "Dubai" + country: "United Arab Emirates" + link: "http://dubaibitcoinconference.com/" + +- date: 2014-12-12 + title: "Inside Bitcoins Seoul" + venue: "Korea International Exhibition Center (KINTEX)" + address: "2600, Daehwa-dong, Ilsanseo-gu, Goyang-si, Gyeonggi-do" + city: "Goyang-si" + country: "South Korea" + link: "http://insidebitcoins.com/seoul?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibseoul" + +- date: 2015-01-16 + title: "The North American Bitcoin Conference" + venue: "Miami Beach Convention Centre" + address: "3001 Convention Centre Drive" + city: "Miami Beach, FL" + country: "United States" + link: "http://www.btcmiami.com" + +- date: 2015-01-29 + title: "Inside Bitcoins Singapore" + venue: "Suntec Singapore Convention & Exhibition Centre" + address: "1 Raffles Boulevard, Suntec City, Singapore" + city: "Singapore" + country: "Singapore" + link: "http://insidebitcoins.com/singapore/2015?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibsg" + +- date: 2015-01-29 + title: "P2P Financial Systems 2015" + venue: "Deutsche Bundesbank" + address: "Taunusanlage 5" + city: "Frankfurt am Main" + country: "Germany" + link: "https://www.ecurex.com/p2pfisy/" + +- date: 2015-03-14 + title: "Let the bit drop" + venue: "Stadium" + address: "Windsor Park, Bath Rd" + city: "Roseau" + country: "Commonwealth of Dominica" + link: "http://www.letthebitdrop.com/" + +- date: 2015-03-28 + title: "Texas Bitcoin Conference" + venue: "Moody Theater" + address: "310 W Willie Nelson Blvd" + city: "Austin, TX" + country: "United States" + link: "http://texasbitcoinconference.com/conferences/austin2015" diff --git a/_events/2014-11-18-futureofmoney.md b/_events/2014-11-18-futureofmoney.md deleted file mode 100644 index b8bd78ae..00000000 --- a/_events/2014-11-18-futureofmoney.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-11-18 -title: "Cryptocurrencies: The Challenges & Opportunities Ahead" -venue: swissnex Boston -address: 420 Broadway -city: Cambridge, MA -country: United States -link: http://goo.gl/EdzG2r ---- diff --git a/_events/2014-11-20-insidebitcoinsparis.md b/_events/2014-11-20-insidebitcoinsparis.md deleted file mode 100644 index c8d1ff5d..00000000 --- a/_events/2014-11-20-insidebitcoinsparis.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-11-20 -title: "Inside Bitcoins Paris" -venue: "Espaces Cap 15" -address: "1/13 Quai de Grenelle, 75015 PARIS" -city: "Paris" -country: "France" -link: "http://insidebitcoins.fr/?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibpar" ---- \ No newline at end of file diff --git a/_events/2014-11-21-bangkokexpo.md b/_events/2014-11-21-bangkokexpo.md deleted file mode 100644 index 99427567..00000000 --- a/_events/2014-11-21-bangkokexpo.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -date: 2014-11-21 -title: "Bangkok Bitcoin Expo" -venue: "Queen Sirikit National Convention Center (QSNCC)" -address: "60 New Rachadapisek Road, Klongtoey, -Bangkok 10110, Thailand" -city: "Bangkok" -country: "Thailand" -link: "http://bangkok-bitcoin-expo.com/" ---- diff --git a/_events/2014-11-22-evoluzioneincorso.md b/_events/2014-11-22-evoluzioneincorso.md deleted file mode 100644 index a2b7e66e..00000000 --- a/_events/2014-11-22-evoluzioneincorso.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-11-22 -title: "Bitcoin - Evoluzione in corso | Tecnologie all'orizzonte e presentazione ATM opensource" -venue: "Working Capital Accelerator - Bologna" -address: "Via Guglielmo Oberdan, 22" -city: "Bologna" -country: "Italy" -link: "http://smappo.com/event/5464d148d5c75_bitcoin-evoluzione-in-corso-tecnologie-all-orizzonte-e-presentazione-atm-opensource.html" ---- diff --git a/_events/2014-11-27-rebit.md b/_events/2014-11-27-rebit.md deleted file mode 100644 index 6d654be2..00000000 --- a/_events/2014-11-27-rebit.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-11-27 -title: "REBIT2014" -venue: "Centro Direzionale “Il Volo”" -address: "Largo Giambellino, 18" -city: "Reggio Emilia" -country: "Italy" -link: "http://rebit2014.it" ---- diff --git a/_events/2014-11-28-globalbitcoinsubmit.md b/_events/2014-11-28-globalbitcoinsubmit.md deleted file mode 100644 index 105d72b2..00000000 --- a/_events/2014-11-28-globalbitcoinsubmit.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-11-28 -title: "2014 Internet Finance Innovation CEO Summit (IFICS)—Global Bitcoin Summit" -venue: "Cyberport Hong Kong" -address: "100 Cyberport Road" -city: "Hong Kong" -country: "Hong Kong" -link: http://www.globalbtcsummit.com/ ---- diff --git a/_events/2014-11-29-bitcoinforum.md b/_events/2014-11-29-bitcoinforum.md deleted file mode 100644 index 2f682fb5..00000000 --- a/_events/2014-11-29-bitcoinforum.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-11-29 -title: "The Bitcoin Forum: Investire nel Futuro" -venue: "Hotel Coronado" -address: "Via Francesco Borromini 10" -city: "Mendrisio" -country: "Switzerland" -link: "http://www.rischiocalcolato.it/the-bitcoin-forum" ---- diff --git a/_events/2014-11-29-bitcoinsouth.md b/_events/2014-11-29-bitcoinsouth.md deleted file mode 100644 index e08834da..00000000 --- a/_events/2014-11-29-bitcoinsouth.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-11-29 -title: "Bitcoin-South 2014" -venue: "Millennium hotel" -address: "32 Frankton Rd" -city: "Queenstown" -country: "New Zealand" -link: "http://bitcoinsouth.co" ---- diff --git a/_events/2014-12-04-stpetersburg.md b/_events/2014-12-04-stpetersburg.md deleted file mode 100644 index 018c68a4..00000000 --- a/_events/2014-12-04-stpetersburg.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-12-04 -title: "Bitcoin Conference Saint Petersburg" -venue: "Creative claster ArtMuze" -address: "Line 13, building 70-72" -city: "Saint Petersburg" -country: "Russia" -link: "http://bitcoinconf.spb.ru/en" ---- diff --git a/_events/2014-12-06-coinwisdom.md b/_events/2014-12-06-coinwisdom.md deleted file mode 100644 index 4027d000..00000000 --- a/_events/2014-12-06-coinwisdom.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-12-06 -title: "CoinWisdom Sofia" -venue: "Hotel Expo" -address: "149 Tsarigradsko Shosse" -city: "Sofia" -country: "Bulgaria" -link: "https://coinwisdomsofia.com/" ---- diff --git a/_events/2014-12-06-labitconf.md b/_events/2014-12-06-labitconf.md deleted file mode 100644 index 05aba7d3..00000000 --- a/_events/2014-12-06-labitconf.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-12-06 -title: "laBITconf 2014" -venue: "Rio Othon Palace" -address: "Avenida Atlantica 3264, Copacabana" -city: "Rio de Janeiro" -country: "Brazil" -link: "http://labitconf.com/" ---- diff --git a/_events/2014-12-11-dubaibitcoinconference.md b/_events/2014-12-11-dubaibitcoinconference.md deleted file mode 100644 index 3784b1c1..00000000 --- a/_events/2014-12-11-dubaibitcoinconference.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-12-11 -title: "Dubai Bitcoin Conference" -venue: "Dubai International Financial Center" -address: "Dubai International Financial Center" -city: "Dubai" -country: "United Arab Emirates" -link: "http://dubaibitcoinconference.com/" ---- diff --git a/_events/2014-12-12-insidebitcoinsseoul.md b/_events/2014-12-12-insidebitcoinsseoul.md deleted file mode 100644 index 9cb25d3b..00000000 --- a/_events/2014-12-12-insidebitcoinsseoul.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2014-12-12 -title: "Inside Bitcoins Seoul" -venue: "Korea International Exhibition Center (KINTEX)" -address: "2600, Daehwa-dong, Ilsanseo-gu, Goyang-si, Gyeonggi-do" -city: "Goyang-si" -country: "South Korea" -link: "http://insidebitcoins.com/seoul?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibseoul" ---- \ No newline at end of file diff --git a/_events/2015-01-16-northamericanconference.md b/_events/2015-01-16-northamericanconference.md deleted file mode 100644 index 6a9224b4..00000000 --- a/_events/2015-01-16-northamericanconference.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2015-01-16 -title: "The North American Bitcoin Conference" -venue: "Miami Beach Convention Centre" -address: "3001 Convention Centre Drive" -city: "Miami Beach, FL" -country: "United States" -link: "http://www.btcmiami.com" ---- diff --git a/_events/2015-01-29-insidebitcoinssingapore.md b/_events/2015-01-29-insidebitcoinssingapore.md deleted file mode 100644 index 7b0524c5..00000000 --- a/_events/2015-01-29-insidebitcoinssingapore.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2015-01-29 -title: "Inside Bitcoins Singapore" -venue: "Suntec Singapore Convention & Exhibition Centre" -address: "1 Raffles Boulevard, Suntec City, Singapore" -city: "Singapore" -country: "Singapore" -link: "http://insidebitcoins.com/singapore/2015?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibsg" ---- \ No newline at end of file diff --git a/_events/2015-01-29-p2pfinancial.md b/_events/2015-01-29-p2pfinancial.md deleted file mode 100644 index 5226d2ff..00000000 --- a/_events/2015-01-29-p2pfinancial.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2015-01-29 -title: "P2P Financial Systems 2015" -venue: "Deutsche Bundesbank" -address: "Taunusanlage 5" -city: "Frankfurt am Main" -country: "Germany" -link: "https://www.ecurex.com/p2pfisy/" ---- diff --git a/_events/2015-03-14-letthebitdrop.md b/_events/2015-03-14-letthebitdrop.md deleted file mode 100644 index b9b88ee2..00000000 --- a/_events/2015-03-14-letthebitdrop.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2015-03-14 -title: "Let the bit drop" -venue: "Stadium" -address: "Windsor Park, Bath Rd" -city: "Roseau" -country: "Commonwealth of Dominica" -link: "http://www.letthebitdrop.com/" ---- diff --git a/_events/2015-03-28-texasbitcoin.md b/_events/2015-03-28-texasbitcoin.md deleted file mode 100644 index 1bb0c2f6..00000000 --- a/_events/2015-03-28-texasbitcoin.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -date: 2015-03-28 -title: "Texas Bitcoin Conference" -venue: "Moody Theater" -address: "310 W Willie Nelson Blvd" -city: "Austin, TX" -country: "United States" -link: "http://texasbitcoinconference.com/conferences/austin2015" ---- diff --git a/_plugins/events.rb b/_plugins/events.rb index 6346cf4f..33c26f1f 100644 --- a/_plugins/events.rb +++ b/_plugins/events.rb @@ -92,12 +92,8 @@ module Jekyll def conferences conferences = [] - # Loop in _events/ files - Dir.foreach('_events') do |file| - # Skip events with malformed name - next if file == '.' or file == '..' - # Assign variables - data = YAML.load_file('_events/'+file) + # Loop in _events.yml + YAML.load_file('_events.yml').each do |data| # Skip event if it has started more than five days ago date = data['date'].to_s.split('-') next if Time.new.to_i > (Time.new(date[0].to_i,date[1].to_i,date[2].to_i).to_i + 432000) diff --git a/_templates/events.html b/_templates/events.html index 2eede9e2..c7ad6ad1 100644 --- a/_templates/events.html +++ b/_templates/events.html @@ -43,7 +43,7 @@ map.addLayer(markers); {% filter_for p in site.conferences sort_by:date %}
{% translate meetupgroup %}