/bitcoin.org

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

Already on GitHub? Sign in to your account

Update with latest events. #336

Merged
merged 1 commit into from Mar 10, 2014

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@wbnns @saivann
@wbnns
Contributor

wbnns commented Mar 8, 2014

Added/updated the following events:

  • Amsterdam MoneyLab: Coining Alternatives
  • Bitcoin and Cryptocurrency Research Conference
  • Digital Money 2014
  • World Bitcoin Forum 2014
  • Inside Bitcoins London
  • Bitcoin World at Money2020

@saivann saivann and 1 other commented on an outdated diff Mar 8, 2014

_events/2014-03-27-bitcoincryptoresearch.md
@@ -0,0 +1,9 @@
+---
+title: "Bitcoin and Cryptocurrency Research Conference"
+venue: "Friend Center Convocation Room, Princeton University"
+address: "303 Sherrerd Hall"
+city: "Princeton, NJ"
+country: "United States"
+link:
+"https://citp.princeton.edu/event/bitcoin/?utm_source=hootsuite&utm_campaign=hootsuite#overview"
@saivann

saivann Mar 8, 2014

Contributor

FTBFS, needs to be on one line. You have time for it, you can setup jekyll locally to test-build and check if events are properly displayed on the map.

@wbnns

wbnns Mar 10, 2014

Contributor

Fixed, I put the link on Line 7 - I will also setup the local build after this PR so I will catch this next time. :)

@saivann saivann and 1 other commented on an outdated diff Mar 8, 2014

_events/2014-03-21-moneylabcoiningalternatives.md
@@ -0,0 +1,8 @@
+---
+title: "Amsterdam MoneyLab: Coining Alternatives"
+venue: "Lab 111"
+address: "111 Arie Biemondstraat"
+city: "Amsterdam, Noord-Holland"
+country: "The Netherlands"
@saivann

saivann Mar 8, 2014

Contributor

Perhaps just "Netherlands"?

@wbnns

wbnns Mar 10, 2014

Contributor

Updated.

@saivann saivann and 1 other commented on an outdated diff Mar 8, 2014

_events/2014-05-27-digitalmoney.md
@@ -0,0 +1,8 @@
+---
+title: "Digital Money 2014"
+venue: "TBD"
+address: "TBD"
@saivann

saivann Mar 8, 2014

Contributor

I'd vote we don't display this event until there's a venue address, otherwise it will be displayed anywhere on the map.

@wbnns

wbnns Mar 10, 2014

Contributor

Removed.

@saivann saivann commented on the diff Mar 8, 2014

View full changes
_events/2014-09-15-insidebitcoinslondon.md
address: "10 Godliman St"
city: "London"
country: "England"
-link: "http://insidebitcoins.co.uk/?c=bcoinlonbcorg"
@saivann

saivann Mar 8, 2014

Contributor

Not sure about this, but I think they are using this link to see how much traffic they get from bitcoin.org . At least that's how they submitted their event.

@wbnns

wbnns Mar 10, 2014

Contributor

Removed.

saivann added a commit that referenced this pull request Mar 10, 2014

@saivann
Merge pull request #336 from gwb3/update-events 
Update with latest events.
bff77ba

@saivann saivann merged commit bff77ba into bitcoin-dot-org:master Mar 10, 2014

@saivann
Contributor

saivann commented Mar 10, 2014

Thanks!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment