From 6534d552d4dafbe02e01c39b2f2b5ed6b763b0ad Mon Sep 17 00:00:00 2001 From: MaxXor Date: Mon, 16 Oct 2017 09:12:34 +0200 Subject: [PATCH 1/9] Fix duplicate drop ids --- _includes/header.html | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 5b1ba01f..14c316af 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -5,8 +5,8 @@
- - + +
What Is Monero? Using @@ -26,8 +26,8 @@
- - + +
All Posts Missives @@ -38,8 +38,8 @@
- - + +
Team Hangouts @@ -51,8 +51,8 @@
- - + +
About Roadmap @@ -111,8 +111,8 @@
- - + +
What Is Monero? Using @@ -126,8 +126,8 @@ Downloads
- - + +
All Posts Missives @@ -136,8 +136,8 @@
- - + +
Team Hangouts @@ -147,8 +147,8 @@
- - + +
About Roadmap From 3383b1b0f628f36ebfb5a68136026e479b14ad0c Mon Sep 17 00:00:00 2001 From: MaxXor Date: Tue, 17 Oct 2017 13:15:00 +0200 Subject: [PATCH 2/9] Fix blockchain bootstrap url and duplicate bsd id --- _data/downloads.yml | 1 - downloads/index.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/_data/downloads.yml b/_data/downloads.yml index f82734dc..a747b210 100644 --- a/_data/downloads.yml +++ b/_data/downloads.yml @@ -76,7 +76,6 @@ blockchain: freebsd - platform: DragonflyBSD, 64-bit - id: bsd icon: icon-dragonflybsd cli_url: dragonflybsd64 cli_hash: c25c0f603ca5c96cb5963aaa2905edff390b7a97f654106911ffad8639deee7c diff --git a/downloads/index.md b/downloads/index.md index e094af5c..649ad7c8 100644 --- a/downloads/index.md +++ b/downloads/index.md @@ -72,7 +72,7 @@ Note: the SHA256 hashes are listed by the downloads for convenience, but a GPG-s
-If you'd prefer to use a blockchain bootstrap, instead of syncing from scratch, you can [use this link for the most current bootstrap](https:////downloads.getmonero.org/blockchain.raw). It is typically much faster to sync from scratch, however, and it also takes a lot less RAM (import is very greedy). +If you'd prefer to use a blockchain bootstrap, instead of syncing from scratch, you can [use this link for the most current bootstrap](https://downloads.getmonero.org/blockchain.raw). It is typically much faster to sync from scratch, however, and it also takes a lot less RAM (import is very greedy).
{% elsif data_downloads.id == "hardware" %} From f8c6c5bcdcde5ec3bd83597c5b4db72880f6befa Mon Sep 17 00:00:00 2001 From: MaxXor Date: Tue, 17 Oct 2017 13:19:24 +0200 Subject: [PATCH 3/9] Fix several html errors --- community/team/index.md | 4 ++-- forum-funding-system/index.md | 6 +++--- resources/roadmap/index.md | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/community/team/index.md b/community/team/index.md index d172c4f2..706d682b 100644 --- a/community/team/index.md +++ b/community/team/index.md @@ -9,7 +9,7 @@ title: Monero Team
- +

Core

@@ -46,7 +46,7 @@ title: Monero Team {%endfor%}
- +

Developers

diff --git a/forum-funding-system/index.md b/forum-funding-system/index.md index 92f50a79..29a15dd6 100644 --- a/forum-funding-system/index.md +++ b/forum-funding-system/index.md @@ -12,7 +12,7 @@ title: Forum Funding System
- +

Ideas

{% for toplevel in site.data.ffs %} @@ -28,8 +28,8 @@ title: Forum Funding System

See all Ideas

- - + +

Open Tasks

{% for toplevel in site.data.ffs %} diff --git a/resources/roadmap/index.md b/resources/roadmap/index.md index e35ac310..b768d9ac 100644 --- a/resources/roadmap/index.md +++ b/resources/roadmap/index.md @@ -42,8 +42,8 @@ title: Roadmap {%endif%} {%endfor%}
- - + +

2015

{% for toplevel in site.data.roadmap %} @@ -87,7 +87,7 @@ title: Roadmap {%endfor%}
- +

2017

{% for toplevel in site.data.roadmap %} From 41ce0420ea487b97f8b092234963f5e305a490a7 Mon Sep 17 00:00:00 2001 From: lancillotto <31243219+lancillotto@users.noreply.github.com> Date: Wed, 18 Oct 2017 20:08:44 +0200 Subject: [PATCH 4/9] Command line correction The command line is missing --generate-from-keys option --- resources/user-guides/restore_from_keys.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/user-guides/restore_from_keys.md b/resources/user-guides/restore_from_keys.md index cd42c668..134ca4be 100644 --- a/resources/user-guides/restore_from_keys.md +++ b/resources/user-guides/restore_from_keys.md @@ -16,10 +16,10 @@ You need to have 3 pieces of data from your wallet, or your .keys file which hol Then run the wallet command: -`./monero-wallet-cli New_Wallet_Name.abc` +`./monero-wallet-cli --generate-from-keys New_Wallet_Name.abc` Next, you'll be asked for the Address, the spendkey, the viewkey, and finally the new password for the re-generated wallet. Running this with the correct parameters will re-generate your wallet files for you and allow you to set a new password. -If you run into any trouble, running `./monero-wallet-cli --help` will show you the options available to you at wallet startup. Once you're inside your wallet, running the `help` command will list the help for the commands available to you within the wallet. \ No newline at end of file +If you run into any trouble, running `./monero-wallet-cli --help` will show you the options available to you at wallet startup. Once you're inside your wallet, running the `help` command will list the help for the commands available to you within the wallet. From 768f6ce162a44c92fccd6d4219c72b3403bd4637 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Sat, 21 Oct 2017 09:32:41 +0100 Subject: [PATCH 5/9] Add KoDDoS.net to merchants.yml --- _data/merchants.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_data/merchants.yml b/_data/merchants.yml index a142e7f8..e8bf0658 100644 --- a/_data/merchants.yml +++ b/_data/merchants.yml @@ -140,6 +140,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: KoDDoS.net - DDoS Protection + url: https://koddos.net - 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 From ecc5f90314e877e00d59062a45e000ca21d4f4b4 Mon Sep 17 00:00:00 2001 From: MaxXor Date: Wed, 25 Oct 2017 18:53:35 +0200 Subject: [PATCH 6/9] Fix image width --- css/custom.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/css/custom.css b/css/custom.css index ee1b6abf..51ff3285 100644 --- a/css/custom.css +++ b/css/custom.css @@ -989,8 +989,6 @@ h1, h2, h3, h4, h5, h6, p {margin: 0; padding: 0;} img, video {max-width: 100%;} -img, video {width: 100%;} - ::-webkit-input-placeholder { color: #AAA; } From 4b30f72838c3fa6fd32c227f27208c78a61bbd0d Mon Sep 17 00:00:00 2001 From: MaxXor Date: Wed, 25 Oct 2017 18:58:25 +0200 Subject: [PATCH 7/9] Fix link to source code on downloads page --- _data/downloads.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/downloads.yml b/_data/downloads.yml index ff65decd..f58b79ed 100644 --- a/_data/downloads.yml +++ b/_data/downloads.yml @@ -87,7 +87,7 @@ - platform: Source Code & Blockchain id: source icon: icon-github - cli_url: https://github.com/monero-project/bitmonero + cli_url: https://github.com/monero-project/monero cli_hash: source version: Bleeding edge (possibly unstable) From 7da996c3500d74386cf73f899c8c51662545a465 Mon Sep 17 00:00:00 2001 From: MaxXor Date: Wed, 25 Oct 2017 19:08:32 +0200 Subject: [PATCH 8/9] Fix grey line below footer --- css/custom.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/css/custom.css b/css/custom.css index ee1b6abf..0a027e64 100644 --- a/css/custom.css +++ b/css/custom.css @@ -2376,8 +2376,6 @@ footer { position: absolute; bottom: 0; width: 100%; - height: 435px; - height: 27.1875rem; background-color: #4c4c4c; color: #efefef; z-index: 1; From 60d125e891283628d9755945de9f406a7d03ba20 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Sun, 22 Oct 2017 12:40:13 +0100 Subject: [PATCH 9/9] Add marcosaguayo.com to merchants.yml Fix #451 --- _data/merchants.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_data/merchants.yml b/_data/merchants.yml index d6d64eb1..38fa1869 100644 --- a/_data/merchants.yml +++ b/_data/merchants.yml @@ -148,6 +148,8 @@ url: mailto:info@loandraw.com - name: KoDDoS.net - DDoS Protection url: https://koddos.net + - name: Marcos Aguayo - Programmer and Web Developer + url: http://marcosaguayo.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