From ad84a4458c99e109fff3159fec0778618dae3019 Mon Sep 17 00:00:00 2001 From: Mike Justman Date: Tue, 29 Aug 2017 10:12:54 -0400 Subject: [PATCH 1/6] Update Payb.ee to GloBee Globee is live (previously payb.ee) and at the URL https://globee.com instead of http://payb.ee. closes #281 --- _data/merchants.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/merchants.yml b/_data/merchants.yml index 1367fd34..4d30cc69 100644 --- a/_data/merchants.yml +++ b/_data/merchants.yml @@ -58,8 +58,8 @@ url: https://www.livingroomofsatoshi.com/?sc=xmr - name: Monero Merchants url: https://monero-merchants.com - - name: Paybee (Private Beta) - url: https://payb.ee/ + - name: GloBee + url: https://globee.com/ - name: Monero WooCommerce Extension (PHP) url: https://github.com/monero-integrations/monerowp - category: Libraries and Helpers From 945934ddb6c397f834077dc09df72211dbe635e3 Mon Sep 17 00:00:00 2001 From: Mike Justman Date: Thu, 31 Aug 2017 10:42:24 -0400 Subject: [PATCH 2/6] clean up merchants.yml - alphabetizes merchants in each category - removes Bit.AC ([company has been disolved](https://beta.companieshouse.gov.uk/company/09986257)) - adds [Monero Integrations](http://monerointegrations.com/) - Moved Elise Hawkins Nutritional Therapy to Services (per comment in #259 already closed) - closes #281 Globee is live (previously payb.ee) and at the URL https://globee.com instead of http://payb.ee. - closes #360 (adds NiceVPS.net; @mattcode55; This PR is likely to break #364 so added here.) - closes #228 (algostrategic.com added in #232 ) - closes #285 (synntechgaming.com added in #286 ) - closes #326 (SilverRound.com added in #328 ) --- _data/merchants.yml | 138 ++++++++++++++++++++++---------------------- 1 file changed, 70 insertions(+), 68 deletions(-) diff --git a/_data/merchants.yml b/_data/merchants.yml index 4d30cc69..eb5191e5 100644 --- a/_data/merchants.yml +++ b/_data/merchants.yml @@ -2,10 +2,16 @@ merchants: - name: "#monero-otc (OTC)" url: https://webchat.freenode.net?channels=%23monero-otc + - name: ArbitrCoin + url: https://arbitrcoin.com + - name: Alfacashier + url: https://www.alfacashier.com/ + - name: Bitfinex (XMRUSD, XMRBTC) + url: https://www.bitfinex.com/ - name: Bitsquare (decentralized) url: https://bitsquare.io/ - name: BitMEX - url: https://www.bitmex.com/app/trade/XMR7D + url: https://www.bitmex.com/app/trade/XMR7D - name: Bittrex url: https://www.bittrex.com/Market/Index?MarketName=BTC-XMR - name: Bter @@ -14,10 +20,16 @@ url: https://www.coincut.com - name: Cryptopia url: https://www.cryptopia.co.nz/Exchange?market=XMR_BTC + - name: Kaiserex + url: https://www.kaiserex.com/ + - name: Kraken (XMRUSD, XMREUR, XMRBTC) + url: https://www.kraken.com/ - 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: Magnetic Exchange + url: https://magneticexchange.com - name: MoneroDirect (Euro only) url: https://monerodirect.com - name: Poloniex @@ -26,20 +38,6 @@ 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/ - - name: Kraken (XMRUSD, XMREUR, XMRBTC) - url: https://www.kraken.com/ - - name: BIT.AC - url: https://bit.ac/ - - name: Kaiserex - url: https://www.kaiserex.com/ - - name: Magnetic Exchange - url: https://magneticexchange.com - - name: ArbitrCoin - url: https://arbitrcoin.com - category: Block Explorers merchants: - name: ChainRadar @@ -53,122 +51,126 @@ - name: xmrchain.net url: https://xmrchain.net/ - category: Payment Gateways - merchants: - - name: Living Room of Satoshi - url: https://www.livingroomofsatoshi.com/?sc=xmr - - name: Monero Merchants - url: https://monero-merchants.com + merchants: - name: GloBee url: https://globee.com/ + - name: Living Room of Satoshi + url: https://www.livingroomofsatoshi.com/?sc=xmr + - name: Monero Merchants + url: https://monero-merchants.com - name: Monero WooCommerce Extension (PHP) url: https://github.com/monero-integrations/monerowp - category: Libraries and Helpers merchants: + - name: Monero Integrations (eCommerce plugins) + url: http://monerointegrations.com/ - name: monero-nodejs (Node.js) url: https://github.com/PsychicCat/monero-nodejs - - name: python-monero (Python) - url: https://github.com/tippero/python-monero - - name: MoneroPy (Python) - url: https://github.com/bigreddmachine/MoneroPy - - name: moneronjs (NodeJS) - url: https://github.com/netmonk/moneronjs - name: MoneroApi.Net (.NET) url: https://github.com/Jojatekok/MoneroApi.Net - - name: xmr-integration (PHP) - 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 + - name: moneronjs (NodeJS) + url: https://github.com/netmonk/moneronjs - name: Monero Payments Library (PHP) url: https://github.com/monero-integrations/monerophp + - name: Monero-PHP (PHP) + url: https://github.com/PsychicCat/monero-php + - name: MoneroPy (Python) + url: https://github.com/bigreddmachine/MoneroPy + - name: PHP-Monero (PHP) + url: https://github.com/MalMen/PHP-Monero + - name: python-monero (Python) + url: https://github.com/tippero/python-monero + - name: xmr-integration (PHP) + url: https://github.com/TheKoziTwo/xmr-integration - category: Tools merchants: - - name: nestorgames - url: http://www.nestorgames.com - name: ForkGuard Network Monitoring url: http://forkguard.com - name: MoneroBase Price Charts and Tools url: http://monerobase.com + - name: Monero Monitor for Chrome + url: https://chrome.google.com/webstore/detail/monero-monitor/ojekadcfnkkihlleaafggfgbggdckpgo - name: MoneroPric.es Price Converter url: https://moneropric.es - name: MoneroPrice.com Price Converter url: http://moneroprice.com/ + - name: nestorgames + url: http://www.nestorgames.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: algoStrategic - Internet Marketing and Web Development + url: https://algostrategic.com - name: Azur Samui - Luxury Apartment and Villa Development, Koh, Samui, Thailand url: http://www.azursamui.com - name: California Fintech Network url: https://www.californiafintech.org/plans/ - - name: Infield Loan Services - Atlanta, Construction Consulting, Contract review, Feasibility, Funds Escrow - url: mailto:info@loandraw.com - name: cloakVPN.com url: https://cloakVPN.com - name: Cryptostorm VPN url: https://cryptostorm.is/ + - name: Elise Hawkins Nutritional Therapy + url: www.elisehawkinsnutritionaltherapy.com + - name: Emmanuel Galang, Canada Immigration and Refugee Lawyer + url: https://galanglaw.com/ - name: Esperanto lessons from Kaja url: mailto:kiah.morante@gmail.com - name: Farmer ALP, LLC, Arizona url: mailto:farmeralp@gmail.com + - name: Flokinet.is + url: https://flokinet.is - name: Guitar Music Theory course w/ 30% XMR discount url: http://www.guitartheoryrevolution.info/blog/guitar-theory-revolution-store/ + - name: Infield Loan Services - Atlanta, Construction Consulting, Contract review, Feasibility, Funds Escrow + url: mailto:info@loandraw.com - name: MyMonero Web-based Wallet url: https://mymonero.com + - name: Nerdzy Lawn Care + url: http://www.nerdzy.net + - name: NiceVPS - VPS and web hosting + url: https://nicevps.net/ + - name: Njalla - privacy-aware domain registration + url: https://njal.la/ - name: Pradeep Atluri, Psychiatrist, New York url: http://dr.mindsci.com/ - - name: Simple, no non-sense hosting + - name: Rootbox; Simple, no non-sense hosting url: https://rootbox.host/ + - name: Web Developer - Python with Django web framework + url: http://www.voteforrodneylewis.com - name: Web Developer - Stefanos url: http://www.stefanosioannou.com/web-development-monero-accepted - name: XMR.to Monero to Bitcoin Payment Service - url: https://xmr.to - - name: algoStrategic - Internet Marketing and Web Development - url: https://algostrategic.com - - name: Emmanuel Galang, Canada Immigration and Refugee Lawyer - url: https://galanglaw.com/ - - name: Web Developer - Python with Django web framework - url: http://www.voteforrodneylewis.com - - name: FlokiNET - url: https://flokinet.is - - name: Nerdzy Lawn Care - url: http://www.nerdzy.net - - name: Njalla - privacy-aware domain registration - url: https://njal.la/ + url: xmr.to - category: Goods merchants: + - name: Cellphone and laptop repair online store in Sweden + url: http://www.LagaiPhone.se - 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/ - - name: Mushroom cultures, mushroom growing supplies, seeds - url: https://www.vesp.co/Fungible - - name: Handcrafted goods - url: https://mychain.store/ - - name: Cellphone and laptop repair online store in Sweden - url: http://www.LagaiPhone.se - - name: InvestmentArt - url: http://investmentart.org/ - name: Directvoltage url: http://directvoltage.com - - name: Synntech Gaming - url: https://synntechgaming.com - - name: Elise Hawkins Nutritional Therapy - url: www.elisehawkinsnutritionaltherapy.com + - name: Fine Art from Jeanine King ~ Artwork of Home/Archtecture, Pets, Potraits, Caricatures ~ International Shipping + url: http://art2unlimited.webs.com/ + - name: Handcrafted goods + url: https://mychain.store/ + - name: InvestmentArt + url: http://investmentart.org/ + - name: Mushroom cultures, mushroom growing supplies, seeds + url: https://www.vesp.co/Fungible - name: SilverRound.com - Gold and Silver Dealer url: https://silverround.com/ + - name: Synntech Gaming + url: https://synntechgaming.com - category: Entertainment merchants: + - name: Crypto Games + url: https://www.crypto-games.net/ - name: MoneroDice url: https://monerodice.net - name: SafeDice url: https://safedice.com - - name: Crypto Games - url: https://www.crypto-games.net/ From ded62eb1740020595886ee5ff6dabafaf2dc982e Mon Sep 17 00:00:00 2001 From: Mike Justman Date: Thu, 31 Aug 2017 11:39:10 -0400 Subject: [PATCH 3/6] Update merchants.yml * fixed https for xmr.to * Changed Bitsquare to Bisq.io --- _data/merchants.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_data/merchants.yml b/_data/merchants.yml index 7a3905fc..f48121d8 100644 --- a/_data/merchants.yml +++ b/_data/merchants.yml @@ -8,8 +8,8 @@ url: https://www.alfacashier.com/ - name: Bitfinex (XMRUSD, XMRBTC) url: https://www.bitfinex.com/ - - name: Bitsquare (decentralized) - url: https://bitsquare.io/ + - name: Bisq; decentralized exchange (previously Bitsquare) + url: https://bisq.io/ - name: BitMEX url: https://www.bitmex.com/app/trade/XMR7D - name: Bittrex @@ -141,7 +141,7 @@ - name: Web Developer - Stefanos url: http://www.stefanosioannou.com/web-development-monero-accepted - name: XMR.to Monero to Bitcoin Payment Service - url: xmr.to + url: https://xmr.to/ - category: Goods merchants: - name: Cellphone and laptop repair online store in Sweden @@ -173,4 +173,4 @@ - name: MoneroDice url: https://monerodice.net - name: SafeDice - url: https://safedice.com \ No newline at end of file + url: https://safedice.com From 4bee793b108f0f86271731c8a49dc08170fe0f4c Mon Sep 17 00:00:00 2001 From: Mike Justman Date: Thu, 31 Aug 2017 11:57:52 -0400 Subject: [PATCH 4/6] add MSvB HW Design to Services * add MSvB HW Design to Services closes #375 --- _data/merchants.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_data/merchants.yml b/_data/merchants.yml index f48121d8..25e69d48 100644 --- a/_data/merchants.yml +++ b/_data/merchants.yml @@ -124,6 +124,8 @@ url: http://www.guitartheoryrevolution.info/blog/guitar-theory-revolution-store/ - name: Infield Loan Services - Atlanta, Construction Consulting, Contract review, Feasibility, Funds Escrow url: mailto:info@loandraw.com + - name: MSvB Hardware Design (using a secure element) + url: mailto:monerodev+sitesvcs@encambio.com?subject=Monero%20Services%20Hardware%20Design%20Request - name: MyMonero Web-based Wallet url: https://mymonero.com - name: Nerdzy Lawn Care From f021376787fe2e750ba8fd90207e604c64f85ec2 Mon Sep 17 00:00:00 2001 From: Mike Justman Date: Fri, 8 Sep 2017 12:08:04 -0400 Subject: [PATCH 5/6] Add XMRLotto.com closes #390 --- _data/merchants.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_data/merchants.yml b/_data/merchants.yml index 25e69d48..2200922b 100644 --- a/_data/merchants.yml +++ b/_data/merchants.yml @@ -175,4 +175,6 @@ - name: MoneroDice url: https://monerodice.net - name: SafeDice - url: https://safedice.com + url: https://safedice.comet + - name: XMRLotto.com + url: https://xmrlotto.com From f31a075acd020e226fbfadcd630829ab789ae057 Mon Sep 17 00:00:00 2001 From: Mike Justman Date: Fri, 8 Sep 2017 12:24:03 -0400 Subject: [PATCH 6/6] fix typo - fix typo in safedice.com --- _data/merchants.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/merchants.yml b/_data/merchants.yml index 2200922b..6287ae58 100644 --- a/_data/merchants.yml +++ b/_data/merchants.yml @@ -175,6 +175,6 @@ - name: MoneroDice url: https://monerodice.net - name: SafeDice - url: https://safedice.comet + url: https://safedice.com - name: XMRLotto.com url: https://xmrlotto.com