Verified Commit 5827b461 authored by Diego Salazar's avatar Diego Salazar
Browse files

- Updated events page

- Updated merchants page to include ids
- Updated roadmap
- CSS tweaks and fixes
- Fixed FAQ bug in last question
- Added preliminary press kit page
parent 1013a544
- event: Monero Meetup (Dublin, Ireland) - June 26th, 2017 - event: Monero Meetup (Minneapolis, Minnesota) - October 20th, 2017
where: J.W. Sweetman Craft Brewery, 1-2 Burgh Quay, Dublin 2, Dublin, Ireland where: University of Minnesota Campus (Room TBD)
when: 7:00 PM - Monday, June 26, 2017 when: 5PM CST, October 20, 2017
description: The meeting will cover the history of privacy and fungibility in Bitcoin, discuss several approaches to these problems, and explain how Monero achieves its privacy in detail. Justin will discuss the next steps in development going forward and the limitations compared to other coins. Finally, there will be a Q&A session after the meeting, where he can clear up some final thoughts. \ No newline at end of file
link: https://www.meetup.com/Bitcoin-Dublin/events/240152422/
\ No newline at end of file
- category: Exchanges - category: Exchanges
id: exchanges
merchants: merchants:
- name: "#monero-otc (OTC)" - name: "#monero-otc (OTC)"
url: https://webchat.freenode.net?channels=%23monero-otc url: https://webchat.freenode.net?channels=%23monero-otc
...@@ -45,6 +46,7 @@ ...@@ -45,6 +46,7 @@
- name: Tux Exchange - name: Tux Exchange
url: https://www.tuxexchange.com/trade?coin=XMR&market=BTC url: https://www.tuxexchange.com/trade?coin=XMR&market=BTC
- category: Block Explorers - category: Block Explorers
id: block-explorers
merchants: merchants:
- name: ChainRadar - name: ChainRadar
url: http://chainradar.com/xmr/blocks url: http://chainradar.com/xmr/blocks
...@@ -57,6 +59,7 @@ ...@@ -57,6 +59,7 @@
- name: xmrchain.net - name: xmrchain.net
url: https://xmrchain.net/ url: https://xmrchain.net/
- category: Payment Gateways - category: Payment Gateways
id: payment-gateways
merchants: merchants:
- name: GloBee - name: GloBee
url: https://globee.com/ url: https://globee.com/
...@@ -67,6 +70,7 @@ ...@@ -67,6 +70,7 @@
- name: Monero WooCommerce Extension (PHP) - name: Monero WooCommerce Extension (PHP)
url: https://github.com/monero-integrations/monerowp url: https://github.com/monero-integrations/monerowp
- category: Libraries and Helpers - category: Libraries and Helpers
id: libraries
merchants: merchants:
- name: Monero Integrations (eCommerce plugins) - name: Monero Integrations (eCommerce plugins)
url: http://monerointegrations.com/ url: http://monerointegrations.com/
...@@ -91,6 +95,7 @@ ...@@ -91,6 +95,7 @@
- name: Monero Utilities (golang) - name: Monero Utilities (golang)
url: https://github.com/paxos-bankchain/moneroutil url: https://github.com/paxos-bankchain/moneroutil
- category: Tools - category: Tools
id: tools
merchants: merchants:
- name: Atesti Data Timestamping - name: Atesti Data Timestamping
url: http://atesti.mooo.com:8081 url: http://atesti.mooo.com:8081
...@@ -109,6 +114,7 @@ ...@@ -109,6 +114,7 @@
- name: Offline Monero address generator - name: Offline Monero address generator
url: https://moneroaddress.org/ url: https://moneroaddress.org/
- category: Services - category: Services
id: services
merchants: merchants:
- name: AirVPN - name: AirVPN
url: https://airvpn.org/ url: https://airvpn.org/
...@@ -163,6 +169,7 @@ ...@@ -163,6 +169,7 @@
- name: XMR.to Monero to Bitcoin Payment Service - name: XMR.to Monero to Bitcoin Payment Service
url: https://xmr.to/ url: https://xmr.to/
- category: Goods - category: Goods
id: goods
merchants: merchants:
- name: All For Crypto - name: All For Crypto
url: https://allforcrypto.com url: https://allforcrypto.com
...@@ -191,6 +198,7 @@ ...@@ -191,6 +198,7 @@
- name: Xusah Boutique - name: Xusah Boutique
url: https://xusah.boutique/ url: https://xusah.boutique/
- category: Entertainment - category: Entertainment
id: entertainment
merchants: merchants:
- name: Crypto Games - name: Crypto Games
url: https://www.crypto-games.net/ url: https://www.crypto-games.net/
......
...@@ -76,6 +76,9 @@ ...@@ -76,6 +76,9 @@
date: 2017-09-15 date: 2017-09-15
status: completed status: completed
- name: 0MQ/ZeroMQ - name: 0MQ/ZeroMQ
date: September, 2017
status: completed
- name: Fluffy blocks
date: date:
status: ongoing status: ongoing
- name: GUI port to android - name: GUI port to android
......
...@@ -3223,12 +3223,12 @@ footer { ...@@ -3223,12 +3223,12 @@ footer {
.hangouts .social-icon.reddit { .hangouts .social-icon.reddit {
background-image: url(../img/monero-spritesheet.png); background-image: url(../img/monero-spritesheet.png);
background-position: -128px -76px; background-position: -128px -96px;
} }
.hangouts .social-icon.reddit:hover { .hangouts .social-icon.reddit:hover {
background-image: url(../img/monero-spritesheet.png); background-image: url(../img/monero-spritesheet.png);
background-position: -176px -76px; background-position: -176px -96px;
} }
.hangouts .social-icon.facebook { .hangouts .social-icon.facebook {
......
...@@ -21,7 +21,10 @@ Monero works a little differently to what you may have become accustomed to from ...@@ -21,7 +21,10 @@ Monero works a little differently to what you may have become accustomed to from
However, because Monero has @stealth-addresses there is no need to have separate recipient addresses for each payment or user, and a single @account address can be published. Instead, when receiving payments a merchant will provide the person paying with a "payment ID". However, because Monero has @stealth-addresses there is no need to have separate recipient addresses for each payment or user, and a single @account address can be published. Instead, when receiving payments a merchant will provide the person paying with a "payment ID".
A @payment-ID is a hexadecimal string that is 64 characters long, and is normally randomly created by the merchant. An example of a payment ID is: `666c75666679706f6e7920697320746865206265737420706f6e792065766572` A @payment-ID is a hexadecimal string that is 64 characters long, and is normally randomly created by the merchant. An example of a payment ID is:
```
666c75666679706f6e7920697320746865206265737420706f6e792065766572
```
### Checking for a Payment in monero-wallet-cli ### Checking for a Payment in monero-wallet-cli
......
...@@ -63,7 +63,7 @@ title: Using Monero ...@@ -63,7 +63,7 @@ title: Using Monero
</div> </div>
</div> </div>
<div class="row start-xs"> <div class="row start-xs">
<p>Monero may be purchased on an <a href="/community/merchants/">exchange</a> with fiat or other cryptocurrencies. An alternate way of acquiring Monero is via <a href="https://getmonero.org/get-started/mining/">mining</a>, the computationally-complex process whereby transactions are immutably recorded on the blockchain.</p> <p>Monero may be purchased on an <a href="/community/merchants#exchanges">exchange</a> with fiat or other cryptocurrencies. An alternate way of acquiring Monero is via <a href="https://getmonero.org/get-started/mining/">mining</a>, the computationally-complex process whereby transactions are immutably recorded on the blockchain.</p>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -6,7 +6,6 @@ title: "What Is Monero (XMR)?" ...@@ -6,7 +6,6 @@ title: "What Is Monero (XMR)?"
<div class="site-wrap"> <div class="site-wrap">
<section class="container"> <section class="container">
<div class="row"> <div class="row">
<section class="container about-monero full col-xs-12"> <section class="container about-monero full col-xs-12">
<div class="info-block"> <div class="info-block">
<div class="row center-xs"> <div class="row center-xs">
......
---
layout: default
title: "Press Kit"
---
<div class="site-wrap">
<section class="container">
<div class="row">
<section class="container about-monero full col-xs-12">
<div class="info-block">
<div class="row center-xs">
<div class="col"><h2>Monero Press Kit</h2></div>
</div>
<div class="row middle-xs info-block-row">
<div class="col-xs-6">
<img src="" alt="">
</div>
</div>
</div>
</section>
</div>
</section>
</div>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment