diff --git a/README.md b/README.md index 978e54b0..b3b299d0 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,14 @@ Deploying this website requires Jekyll (3.0+) and the following ruby gems: build Multiple language support will be added soon. +To test changes locally before pushing to git, make sure you have ruby installed on your system, then: + +1. Make sure you have the necessary ruby gems: `gem install builder rubysl-rexml jekyll-paginate jekyll` +2. Navigate to the your local `monero-site` repository. +3. Serve the website: `jekyll serve` +4. Open a browser and go to [http://127.0.0.1:4000](http://127.0.0.1:4000). +5. A basic page list will appear. Click on the part of the site you are working on (ex: `design_goals`) and see your work! + ## License Copyright (c) 2014-2016, The Monero Project diff --git a/_data/donators.yml b/_data/donators.yml index abf3a4f1..aeb350c5 100644 --- a/_data/donators.yml +++ b/_data/donators.yml @@ -12,7 +12,7 @@ - level: 9 name: ajiekceu4 - amount: 10666 + amount: 11666 history: [9th Dan on 2016-02-03, 8th Dan on 2015-11-4, 7th Dan on 2015-08-31, 6th Dan on 2015-05-11] - level: 8 @@ -105,6 +105,7 @@ name: dnaleor amount: 1201.1337 history: [6th Dan 0n 2016-02-03, 5th Dan on 2015-02-23, 4th Dan on 2014-12-17, 3rd Dan on 2014-07-17, 1st Dan on 2014-05-03] + quote: Crypto may offer 'key blinding'. I did some research and it was obscure, but there may be something there. 'Group signatures' may be related. ñ Satoshi Nakamoto, 2010 - level: 5 name: ajiekceu4 @@ -231,6 +232,11 @@ amount: 150 history: [3rd Dan on 2015-05-13, 2nd Dan on 2015-04-03] +- level: 2 + name: Warptangent Memorial Fund + amount: 64 + history: [2nd Dan on 2016-07-19] + - level: 2 name: superresistant amount: 50 @@ -276,6 +282,11 @@ amount: 53 history: [2nd Dan on 2015-12-11, 1st Dan on 2015-01-24, 1st Kyu on 2014-07-24] +- level: 1 + name: anonimal + amount: 45.6 + history: [1st Dan on 2016-12-06] + - level: 1 name: David Latapie amount: 20 @@ -410,3 +421,8 @@ name: Evan Duffield (care of iCEBREAKER) amount: 1 history: [4th Kyu on 2014-11-20] + +- level: -4 + name: TheDashGuy (care of iCEBREAKER) + amount: 1 + history: [4th Kyu on 2016-08-19] diff --git a/_data/downloads.yml b/_data/downloads.yml index 98ee6c4c..e99e52e9 100644 --- a/_data/downloads.yml +++ b/_data/downloads.yml @@ -1,51 +1,59 @@ - platform: Windows, 64-bit icon: windows.svg url: win64 - hash: 303840d7fb997b2f1efc280fd19ba84003ecff85 - version: 0.9.1.0 - tag: Hydrogen Helix + hash: 727a53dd154b61fd653f81da27788077fdf519301c81d3c1eb033c1ff2bf97c6 + version: 0.10.1.0 + tag: Wolfram Warptangent blockchain: win - platform: Windows, 32-bit icon: windows.svg url: win32 - hash: none - version: 0.9.1.0 - tag: Hydrogen Helix + hash: ce77137b33bcaeb59273cb73b86e426e35e6209fb52a7e74fd9432a5a3018041 + version: 0.10.1.0 + tag: Wolfram Warptangent blockchain: win - platform: Mac OS X, 64-bit icon: apple.svg url: mac64 - hash: d6c776878fd3d47f149fc9be4e76cf2d03d5a725 - version: 0.9.1.0 - tag: Hydrogen Helix + hash: 447cebae257864b3706a8622f495bfd9fae780a6b277e1e31ac83bef7bc855c6 + version: 0.10.1.0 + tag: Wolfram Warptangent blockchain: mac - platform: Linux, 64-bit icon: linux.svg url: linux64 - hash: 4149de91c10b56ff091070acca80d233fbd5a797 - version: 0.9.1.0 - tag: Hydrogen Helix + hash: bf09eea27c957e7e2bdd62dac250888b301d4d25abe18d4a5b930fa7477708c7 + version: 0.10.1.0 + tag: Wolfram Warptangent blockchain: linux +- platform: Linux, 32-bit + icon: linux.svg + url: linux32 + hash: 9a18d274970df85d6bc926dc99407959c680c36f19017996be9c758f6c02cf06 + version: 0.10.1.0 + tag: Wolfram Warptangent + blockchain: linux + +- platform: ARMv7 + icon: arm.svg + url: arm + hash: 57221605997a3cd815f2a9689486abbdb124263fff047ca61068900eb7cb1839 + version: 0.10.1.0 + tag: Wolfram Warptangent + blockchain: arm + - platform: FreeBSD, 64-bit icon: freebsd.svg url: freebsd64 - hash: 9fd0005b697e146a26a0bf9e3cd0c89b978f7fbd - version: 0.8.8.6 - tag: Release + hash: 3858d4786b65a37e981b142e9c0f256ac66662314794d05f595c4c30cb5b6ddb + version: 0.10.1.0 + tag: Wolfram Warptangent blockchain: freebsd -- platform: Raspberry Pi / ARM - icon: arm.svg - url: arm - hash: none - version: 0.9.1.0 - tag: Hydrogen Helix - blockchain: arm - - platform: Source Code icon: github.svg url: https://github.com/monero-project/bitmonero diff --git a/_data/merchants.yml b/_data/merchants.yml index a6fe40c3..80752e80 100644 --- a/_data/merchants.yml +++ b/_data/merchants.yml @@ -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:info@loandraw.com - name: CryptoEscrow Escrow Service url: http://www.cryptoescrow.eu + - name: Cryptostorm VPN + url: https://cryptostorm.is/ + - name: Esperanto lessons from Kaja + url: mailto:kiah.morante@gmail.com + - name: Farmer ALP, LLC, Arizona + url: mailto:farmeralp@gmail.com + - 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/ diff --git a/_data/tags.yml b/_data/tags.yml index 044acddf..d9568957 100644 --- a/_data/tags.yml +++ b/_data/tags.yml @@ -22,7 +22,7 @@ - slug: i2p name: i2p -- slug: i2p +- slug: i8n name: Internationalisation - slug: rpc @@ -72,3 +72,6 @@ - slug: 0mq name: ZeroMQ + +- slug: releases + name: Monero Software Releases diff --git a/_includes/footer.html b/_includes/footer.html index e078bc9a..b5e6ffad 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -2,6 +2,7 @@

[ {% t global.terms %} | {% t global.privacy %} | {% t global.copyright %} ] + [ {%t global.edit %} ]

@@ -13,7 +14,7 @@