diff --git a/_data/downloads.yml b/_data/downloads.yml index 8e62b03a..e6a1803c 100644 --- a/_data/downloads.yml +++ b/_data/downloads.yml @@ -3,18 +3,45 @@ url: /downloads/win64 hash: facbeb2e408cf8b9a46534363eba161dbb047654 version: 0.8.8.6 + blockchain: win + +- platform: Windows, 32-bit + icon: windows.svg + url: /downloads/win32 + hash: none + version: 0.8.8.6 + blockchain: win + - platform: Mac OS X, 64-bit icon: apple.svg url: /downloads/mac64 hash: 7069de92083fb7831b063cc152e8f35508ff61bf version: 0.8.8.6 + blockchain: mac + - platform: Linux, 64-bit icon: linux.svg url: /downloads/linux64 hash: 16f3f55bcfbfae6135cbeda6574f651890a8be64 version: 0.8.8.6 -- platform: Mac OS X, 64-bit + blockchain: linux + +- platform: FreeBSD, 64-bit icon: freebsd.svg url: /downloads/freebsd64 hash: 9fd0005b697e146a26a0bf9e3cd0c89b978f7fbd version: 0.8.8.6 + blockchain: freebsd + +- platform: Raspberry Pi / ARM + icon: arm.svg + url: /downloads/arm + hash: none + version: 0.8.8.6 + blockchain: arm + +- platform: Source Code + icon: github.svg + url: https://github.com/monero-project/bitmonero + hash: source + version: Bleeding edge (possibly unstable) \ No newline at end of file diff --git a/_includes/download.php b/_includes/download.php index d9de4b2c..190bb5ad 100644 --- a/_includes/download.php +++ b/_includes/download.php @@ -6,23 +6,25 @@ function detect_os($useragent){ $uas_os['name'] = "Windows"; $uas_os['code'] = "win"; if(preg_match('/x86_64/i', $useragent) || preg_match('/x86-64/i', $useragent) || preg_match('/Win64/i', $useragent) || preg_match('/x64;/i', $useragent) || preg_match('/amd64/i', $useragent) || preg_match('/WOW64/i', $useragent) || preg_match('/x64_64/i', $useragent)){ - $uas_os['bits'] = "x64"; + $uas_os['bits'] = "64"; } else { - $uas_os['bits'] = "x86"; + $uas_os['bits'] = "32"; } $uas_os['ext'] = "zip"; }elseif (preg_match('/Mac/i', $useragent)){ $uas_os['name'] = "OS X"; $uas_os['code'] = "mac"; - $uas_os['bits'] = "x64"; - $uas_os['ext'] = "tar.bz2"; + $uas_os['bits'] = "64"; }elseif (preg_match('/Linux/i', $useragent)){ $uas_os['name'] = "Linux"; $uas_os['code'] = "linux"; - $uas_os['bits'] = "x64"; - $uas_os['ext'] = "tar.bz2"; + $uas_os['bits'] = "64"; + }elseif (preg_match('/FreeBSD/i', $useragent)){ + $uas_os['name'] = "FreeBSD"; + $uas_os['code'] = "freebsd"; + $uas_os['bits'] = "64"; /* }elseif (preg_match('/CrOS/', $useragent)){ $uas_os['name'] = "Chrome OS"; $uas_os['code'] = "chrome"; @@ -47,8 +49,7 @@ function detect_os($useragent){ }else{ $uas_os['name'] = "Windows"; $uas_os['code'] = "win"; - $uas_os['bits'] = "x32"; - $uas_os['ext'] = "zip"; + $uas_os['bits'] = "32"; } return $uas_os; @@ -60,7 +61,7 @@ $os_array = detect_os($_SERVER['HTTP_USER_AGENT']);

{% t index.monero_for %} - + {% t index.c_download %} diff --git a/downloads/index.md b/downloads/index.md index 70e6442d..129b17d7 100644 --- a/downloads/index.md +++ b/downloads/index.md @@ -9,4 +9,72 @@ icon: "icon_all_downloads" attribution: "" --- -### Work in Progress \ No newline at end of file +### Monero Core + +Monero Core consists of several applications, including bitmonerod (the daemon that maintains the connection to the network) and simplewallet (a Monero account manager application), as well as several other helper applications. + +If you are using Monero Core for the first time you may want to download a blockchain bootstrap to get you started. A link to download the blockchain bootstrap is included in the listings below. + +

+ +{% for data_downloads in site.data.downloads %} + +{% if data_downloads.hash == "source" %} + +
+ +

+ + {{ data_downloads.platform }} + +

+ +Current Version: {{ data_downloads.version }}
+
+Optional: Download a Blockchain Bootstrap from this page

+
+ +
+ +{% elsif data_downloads.hash == "none" %} + +
+ +

+ {{ data_downloads.platform }} +

+ +

+Coming Soon

+
+ +
+ +{% else %} + +
+ +

+ + {{ data_downloads.platform }} + +

+ +Current Version: {{ data_downloads.version }}
+SHA Hash: {{ data_downloads.hash }}
+
+Optional: Download the Blockchain Bootstrap +
+ +
+ +{% endif %} + +{% endfor %} +
+ +### Other Downloads + +- For blockchain bootstraps please use the link for your current platform from the list above. +- For Monero Research Lab publications please visit the [Monero Research Lab section](/research-lab) of this site. +- High resolution and vector copies of the Monero logo [can be downloaded at this link](/downloads/resources/branding.zip). diff --git a/getting-started/donate.md b/getting-started/donate.md index 94073bea..792a0111 100644 --- a/getting-started/donate.md +++ b/getting-started/donate.md @@ -9,4 +9,25 @@ icon: "icon_donations" attribution: "" --- -### Work in Progress \ No newline at end of file +### How this Project is Funded + +Ongoing development of the Monero Project is solely supported by donations and sponsors. At this time the project is vastly underfunded, and thus donations are greatly appreciated. + +### Donating and Sponsoring + +If you would like to make a donation you can do so by using any of the methods below: + +- Donating in Monero: you can send XMR donations to [donate.getmonero.org](monero:46BeWrHpwXmHDpDEUmZBWZfoQpdc6HaERCNmx1pEYL2rAcuwufPN9rXHHtyUA4QVy66qeFQkn6sfK8aHYjA3jk3o1Bv16em?recipient_name=Monero%20Development&tx_description=Donation%20to%20Monero%20Core%20Team), or directly to our Monero donation address - + [46BeWrHpwXmHDpDEUmZBWZfoQpdc6HaERCNmx1pEYL2rAcuwufPN9rXHHtyUA4QVy66qeFQkn6sfK8aHYjA3jk3o1Bv16em](monero:46BeWrHpwXmHDpDEUmZBWZfoQpdc6HaERCNmx1pEYL2rAcuwufPN9rXHHtyUA4QVy66qeFQkn6sfK8aHYjA3jk3o1Bv16em?recipient_name=Monero%20Development&tx_description=Donation%20to%20Monero%20Core%20Team) +- Donating in Bitcoin: you can also send BTC donations to [donate.getmonero.org](bitcoin:1FhnVJi2V1k4MqXm2nHoEbY5LV7FPai7bb?label=Monero%20Development&message=Donation%20to%20Monero%20Core%20Team), or directly to our Bitcoin address: [1FhnVJi2V1k4MqXm2nHoEbY5LV7FPai7bb](bitcoin:1FhnVJi2V1k4MqXm2nHoEbY5LV7FPai7bb?label=Monero%20Development&message=Donation%20to%20Monero%20Core%20Team) +- To donate via credit card, wire transfer, or PayPal, please email the core team at [{{ site.email }}](mailto:{{ site.email }}) + +Sponsorships are also greatly appreciated, including those companies that give us free or reduced-cost access to development hardware, hosting and other services, and software licenses. If you would like to sponsor Monero development in some form, please email the core team at [{{ site.email }}](mailto:{{ site.email }}) + +### Current Sponsors + +Current sponsors include several mining pools that contribute a portion of their fees to development. You can find a list of these pools in [the first post on the Monero thread on Bitcointalk](https://bitcointalk.org/index.php?topic=583449.0). Over and above that, our sponsors include: + +{:.text-center} +[![MyMonero](http://i.imgur.com/xdp7mNG.png)](https://mymonero.com) [![Dome9](http://i.imgur.com/THVVafx.png)](http://dome9.com) [![JetBrains](http://i.imgur.com/2ZkVA29.png)](http://www.jetbrains.com/) + diff --git a/getting-started/merchants.md b/getting-started/merchants.md index 8ff9c6bd..e344e61b 100644 --- a/getting-started/merchants.md +++ b/getting-started/merchants.md @@ -9,4 +9,8 @@ icon: "icon_merchants" attribution: "" --- -### Work in Progress \ No newline at end of file +{:.col-lg-3} +### Exchanges +- asd +- asd +- asd \ No newline at end of file