Merge pull request #2 from monero-project/master
Update to current
| ... | ... | @@ -2,26 +2,58 @@ |
| merchants: | ||
| - name: "#monero-otc (OTC)" | ||
| url: https://webchat.freenode.net?channels=%23monero-otc | ||
| - name: Bitsquare (decentralized) | ||
| url: https://bitsquare.io/ | ||
| - name: BitMEX | ||
| url: https://www.bitmex.com/app/trade/XMR7D | ||
| - name: Bittrex | ||
| url: https://www.bittrex.com/Market/Index?MarketName=BTC-XMR | ||
| - name: Bter | ||
| url: https://bter.com/ | ||
| - name: CoinCut (OTC) | ||
| url: https://www.coincut.com | ||
| - name: Cryptopia | ||
| url: https://www.cryptopia.co.nz/Exchange?market=XMR_BTC | ||
| - name: Livecoin (BTC and USD trading pairs) | ||
| url: https://www.livecoin.net | ||
| - name: LiteBit (Bankwire/GiroPay/iDeal/SOFORT) | ||
| url: https://www.litebit.eu/en/buy/monero | ||
| - name: MoneroDirect (Euro only) | ||
| url: https://monerodirect.com | ||
| - name: Poloniex | ||
| url: https://poloniex.com/exchange/btc_xmr | ||
| - name: ShapeShift (Instant) | ||
| url: https://shapeshift.io/ | ||
| - name: Tux Exchange | ||
| url: https://www.tuxexchange.com/trade?coin=XMR&market=BTC | ||
| - name: Bitfinex (XMRUSD, XMRBTC) | ||
| url: https://www.bitfinex.com/ | ||
| - name: Alfacashier | ||
| url: https://www.alfacashier.com/ | ||
| - category: Block Explorers | ||
| merchants: | ||
| - name: ChainRadar | ||
| url: http://chainradar.com/xmr/blocks | ||
| - name: MoneroBlocks | ||
| url: http://moneroblocks.info | ||
| - name: MoneroExplorer | ||
| url: https://explorer.xmr.my/ | ||
| - name: Moneroworld Blockchain Explorer | ||
| url: http://explore.moneroworld.com/ | ||
| - category: Payment Gateways | ||
| merchants: | ||
| - name: Monero Merchants | ||
| url: https://monero-merchants.com | ||
| - name: Paybee (Private Beta) | ||
| url: https://payb.ee/ | ||
| - category: Libraries and Helpers | ||
| merchants: | ||
| - name: monero-nodejs (Node.js) | ||
| url: https://github.com/PsychicCat/monero-nodejs | ||
| - name: python-monero (Python) | ||
| url: https://github.com/tippero/python-monero | ||
| - name: pymonero (Python) | ||
| url: https://github.com/Monero-Monitor/pymonero | ||
| - name: moneronjs (NodeJS) | ||
| url: https://github.com/netmonk/moneronjs | ||
| - name: MoneroApi.Net (.NET) | ||
| ... | ... | @@ -30,8 +62,12 @@ |
| url: https://github.com/TheKoziTwo/xmr-integration | ||
| - name: PHP-Monero (PHP) | ||
| url: https://github.com/MalMen/PHP-Monero | ||
| - name: Monero-PHP (PHP) | ||
| url: https://github.com/PsychicCat/monero-php | ||
| - category: Tools | ||
| merchants: | ||
| - name: nestorgames | ||
| url: http://www.nestorgames.com | ||
| - name: ForkGuard Network Monitoring | ||
| url: http://forkguard.com | ||
| - name: MoneroBase Price Charts and Tools | ||
| ... | ... | @@ -42,22 +78,44 @@ |
| url: http://moneroprice.com/ | ||
| - name: Offline Monero address generator | ||
| url: https://moneroaddress.org/ | ||
| - name: Monero Monitor for Chrome | ||
| url: https://chrome.google.com/webstore/detail/monero-monitor/ojekadcfnkkihlleaafggfgbggdckpgo | ||
| - category: Services | ||
| merchants: | ||
| - name: California Fintech Network | ||
| url: https://www.californiafintech.org/plans/ | ||
| - name: Infield Loan Services - Atlanta, Construction Consulting, Contract review, Feasibility, Funds Escrow | ||
| url: mailto:[email protected] | ||
| - name: CryptoEscrow Escrow Service | ||
| url: http://www.cryptoescrow.eu | ||
| - name: Cryptostorm VPN | ||
| url: https://cryptostorm.is/ | ||
| - name: Esperanto lessons from Kaja | ||
| url: mailto:[email protected] | ||
| - name: Farmer ALP, LLC, Arizona | ||
| url: mailto:[email protected] | ||
| - name: Guitar Music Theory course w/ 30% XMR discount | ||
| url: http://www.guitartheoryrevolution.info/blog/guitar-theory-revolution-store/ | ||
| - name: MyMonero Web-based Wallet | ||
| url: https://mymonero.com | ||
| - name: Pradeep Atluri, Psychiatrist, New York | ||
| url: http://dr.mindsci.com/ | ||
| - name: Web Developer - Stefanos | ||
| url: http://www.stefanosioannou.com/web-development-monero-accepted | ||
| - name: XMR.link OpenAlias Registry | ||
| url: https://www.xmr.link/ | ||
| - name: XMR.to Monero to Bitcoin Payment Service | ||
| url: https://xmr.to | ||
| - category: Goods | ||
| merchants: | ||
| - name: CryptoMercado - coffee and snacks | ||
| url: https://www.cryptomercado.com/ | ||
| - name: Cryptonic Physical Monero & Bitcoin coins | ||
| url: https://cryptonic.net | ||
| - name: Fine Art from Jeanine King ~ Artwork of Home/Archtecture, Pets, Potraits, Caricatures ~ International Shipping | ||
| url: http://art2unlimited.webs.com/ | ||
| - name: Digital gift cards | ||
| url: https://giftoff.com/ | ||
| - category: Entertainment | ||
| merchants: | ||
| - name: Crypto Kingdom | ||
| ... | ... | @@ -65,4 +123,6 @@ |
| - name: MoneroDice | ||
| url: https://monerodice.net | ||
| - name: SafeDice | ||
| url: https://safedice.com | ||
| \ No newline at end of file | ||
| url: https://safedice.com | ||
| - name: Crypto Games | ||
| url: https://www.crypto-games.net/ |
| ... | ... | @@ -2,6 +2,7 @@ |
| <div class="container"> | ||
| <p> | ||
| <strong style="color: #ffffff;">[ <a href="/legal/terms">{% t global.terms %}</a> | <a href="/legal/privacy">{% t global.privacy %}</a> | <a href="/legal/copyright">{% t global.copyright %}</a> ]</strong> | ||
| <strong style="color: #ffffff;">[ <a href="https://github.com/monero-project/monero-site/edit/master/{{ page.path }}">{%t global.edit %}</a> ]</strong> | ||
| <a href="https://getmonero.org/feed.xml"><i class="fa fa-2x fa-rss-square"></i></a> | ||
| <a href="mailto:[email protected]"><i class="fa fa-2x fa-envelope-square"></i></a> | ||
| </p> | ||
| ... | ... | @@ -13,7 +14,7 @@ |
| <script src="//static.getmonero.org/scripts.js"></script> | ||
| <script type="text/javascript"> | ||
| $(document).ready(function(){ | ||
| $('[data-toggle="tooltip"]').tooltip(); | ||
| $('[data-toggle="tooltip"]').tooltip(); | ||
| }); | ||
| (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ | ||
| ... | ... |