diff --git a/_data/events.yml b/_data/events.yml index 3cb09a44..e0745523 100644 --- a/_data/events.yml +++ b/_data/events.yml @@ -1,5 +1,3 @@ -- event: Monero Meetup (Dublin, Ireland) - June 26th, 2017 - where: J.W. Sweetman Craft Brewery, 1-2 Burgh Quay, Dublin 2, Dublin, Ireland - when: 7:00 PM - Monday, June 26, 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. - link: https://www.meetup.com/Bitcoin-Dublin/events/240152422/ \ No newline at end of file +- event: Monero Meetup (Minneapolis, Minnesota) - October 20th, 2017 + where: University of Minnesota Campus (Room TBD) + when: 5PM CST, October 20, 2017 \ No newline at end of file diff --git a/_data/merchants.yml b/_data/merchants.yml index a142e7f8..8ada0635 100644 --- a/_data/merchants.yml +++ b/_data/merchants.yml @@ -1,4 +1,5 @@ - category: Exchanges + id: exchanges merchants: - name: "#monero-otc (OTC)" url: https://webchat.freenode.net?channels=%23monero-otc @@ -45,6 +46,7 @@ - name: Tux Exchange url: https://www.tuxexchange.com/trade?coin=XMR&market=BTC - category: Block Explorers + id: block-explorers merchants: - name: ChainRadar url: http://chainradar.com/xmr/blocks @@ -57,6 +59,7 @@ - name: xmrchain.net url: https://xmrchain.net/ - category: Payment Gateways + id: payment-gateways merchants: - name: GloBee url: https://globee.com/ @@ -67,6 +70,7 @@ - name: Monero WooCommerce Extension (PHP) url: https://github.com/monero-integrations/monerowp - category: Libraries and Helpers + id: libraries merchants: - name: Monero Integrations (eCommerce plugins) url: http://monerointegrations.com/ @@ -91,6 +95,7 @@ - name: Monero Utilities (golang) url: https://github.com/paxos-bankchain/moneroutil - category: Tools + id: tools merchants: - name: Atesti Data Timestamping url: http://atesti.mooo.com:8081 @@ -109,6 +114,7 @@ - name: Offline Monero address generator url: https://moneroaddress.org/ - category: Services + id: services merchants: - name: AirVPN url: https://airvpn.org/ @@ -163,6 +169,7 @@ - name: XMR.to Monero to Bitcoin Payment Service url: https://xmr.to/ - category: Goods + id: goods merchants: - name: All For Crypto url: https://allforcrypto.com @@ -191,6 +198,7 @@ - name: Xusah Boutique url: https://xusah.boutique/ - category: Entertainment + id: entertainment merchants: - name: Crypto Games url: https://www.crypto-games.net/ diff --git a/_data/roadmap.yml b/_data/roadmap.yml index f6286d03..4852b209 100644 --- a/_data/roadmap.yml +++ b/_data/roadmap.yml @@ -76,6 +76,9 @@ date: 2017-09-15 status: completed - name: 0MQ/ZeroMQ + date: September, 2017 + status: completed + - name: Fluffy blocks date: status: ongoing - name: GUI port to android diff --git a/css/custom.css b/css/custom.css index 490fc63b..33c40f07 100644 --- a/css/custom.css +++ b/css/custom.css @@ -3223,12 +3223,12 @@ footer { .hangouts .social-icon.reddit { background-image: url(../img/monero-spritesheet.png); - background-position: -128px -76px; + background-position: -128px -96px; } .hangouts .social-icon.reddit:hover { background-image: url(../img/monero-spritesheet.png); - background-position: -176px -76px; + background-position: -176px -96px; } .hangouts .social-icon.facebook { diff --git a/get-started/accepting/index.md b/get-started/accepting/index.md index 010ab0b2..9b6935eb 100644 --- a/get-started/accepting/index.md +++ b/get-started/accepting/index.md @@ -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". -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 diff --git a/get-started/using/index.md b/get-started/using/index.md index a06321d5..3049fb60 100644 --- a/get-started/using/index.md +++ b/get-started/using/index.md @@ -63,7 +63,7 @@ title: Using Monero
-

Monero may be purchased on an exchange with fiat or other cryptocurrencies. An alternate way of acquiring Monero is via mining, the computationally-complex process whereby transactions are immutably recorded on the blockchain.

+

Monero may be purchased on an exchange with fiat or other cryptocurrencies. An alternate way of acquiring Monero is via mining, the computationally-complex process whereby transactions are immutably recorded on the blockchain.

diff --git a/get-started/what-is-monero/index.md b/get-started/what-is-monero/index.md index 00a51b87..cd4b6380 100644 --- a/get-started/what-is-monero/index.md +++ b/get-started/what-is-monero/index.md @@ -6,7 +6,6 @@ title: "What Is Monero (XMR)?"
-
diff --git a/press-kit/index.md b/press-kit/index.md new file mode 100644 index 00000000..ee69f523 --- /dev/null +++ b/press-kit/index.md @@ -0,0 +1,23 @@ +--- +layout: default +title: "Press Kit" +--- + +
+
+
+
+
+
+

Monero Press Kit

+
+
+
+ +
+
+
+
+
+
+