mirror of
https://github.com/monero-project/monero-site.git
synced 2025-01-14 06:44:39 +00:00
Merge branch 'master' of https://github.com/monero-project/monero-site
This commit is contained in:
commit
db0b8209a1
9 changed files with 32 additions and 33 deletions
_data
_includes
community/team
css
downloads
forum-funding-system
resources
|
@ -76,7 +76,6 @@
|
|||
blockchain: freebsd
|
||||
|
||||
- platform: DragonflyBSD, 64-bit
|
||||
id: bsd
|
||||
icon: icon-dragonflybsd
|
||||
cli_url: dragonflybsd64
|
||||
cli_hash: 30e2d50db8e1738a72d3a06ec106c1a3f157de057efad344bd12151b6bbd3019
|
||||
|
@ -87,7 +86,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)
|
||||
|
||||
|
|
|
@ -146,6 +146,10 @@
|
|||
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: 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
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
<div class="container slide-in">
|
||||
<div class="row">
|
||||
<div class="col-xs-12 dropdown text-center nav-item">
|
||||
<label for="drop1">Get Started<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="drop1" type="checkbox">
|
||||
<label for="slidedrop1">Get Started<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="slidedrop1" type="checkbox">
|
||||
<div class="dropdown-content">
|
||||
<a href="/get-started/what-is-monero/">What Is Monero?</a>
|
||||
<a href="/get-started/using/">Using</a>
|
||||
|
@ -26,8 +26,8 @@
|
|||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 dropdown text-center nav-item">
|
||||
<label for="drop2">Recent News<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="drop2" type="checkbox">
|
||||
<label for="slidedrop2">Recent News<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="slidedrop2" type="checkbox">
|
||||
<div class="dropdown-content">
|
||||
<a href="/blog/">All Posts</a>
|
||||
<a href="/blog/tags/monero%20missives.html">Missives</a>
|
||||
|
@ -38,8 +38,8 @@
|
|||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 dropdown text-center nav-item">
|
||||
<label for="drop4">Community<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="drop4" type="checkbox">
|
||||
<label for="slidedrop3">Community<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="slidedrop3" type="checkbox">
|
||||
<div class="dropdown-content">
|
||||
<a href="/community/team/">Team</a>
|
||||
<a href="/community/hangouts/">Hangouts</a>
|
||||
|
@ -51,8 +51,8 @@
|
|||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 dropdown text-center nav-item">
|
||||
<label for="drop3">Resources<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="drop3" type="checkbox">
|
||||
<label for="slidedrop4">Resources<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="slidedrop4" type="checkbox">
|
||||
<div class="dropdown-content">
|
||||
<a href="/resources/about/">About</a>
|
||||
<a href="/resources/roadmap/">Roadmap</a>
|
||||
|
@ -111,8 +111,8 @@
|
|||
<input class="burger-check" id="burger-check" type="checkbox"><label for="burger-check" class="burger"></label>
|
||||
<div class="row between-xs nav-items">
|
||||
<div class="col dropdown nav-item">
|
||||
<label for="drop1">Get Started<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="drop1" type="checkbox">
|
||||
<label for="desktopdrop1">Get Started<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="desktopdrop1" type="checkbox">
|
||||
<div class="dropdown-content">
|
||||
<a href="/get-started/what-is-monero/">What Is Monero?</a>
|
||||
<a href="/get-started/using/">Using</a>
|
||||
|
@ -126,8 +126,8 @@
|
|||
<a href="/downloads/">Downloads</a>
|
||||
</div>
|
||||
<div class="col dropdown nav-item">
|
||||
<label for="drop2">Recent News<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="drop2" type="checkbox">
|
||||
<label for="desktopdrop2">Recent News<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="desktopdrop2" type="checkbox">
|
||||
<div class="dropdown-content">
|
||||
<a href="/blog/">All Posts</a>
|
||||
<a href="/blog/tags/monero%20missives.html">Missives</a>
|
||||
|
@ -136,8 +136,8 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="col dropdown nav-item">
|
||||
<label for="drop4">Community<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="drop4" type="checkbox">
|
||||
<label for="desktopdrop3">Community<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="desktopdrop3" type="checkbox">
|
||||
<div class="dropdown-content">
|
||||
<a href="/community/team/">Team</a>
|
||||
<a href="/community/hangouts/">Hangouts</a>
|
||||
|
@ -147,8 +147,8 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="col dropdown nav-item">
|
||||
<label for="drop3">Resources<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="drop3" type="checkbox">
|
||||
<label for="desktopdrop4">Resources<div class="arrow-down"></div></label>
|
||||
<input class="burger-checkdropdown" id="desktopdrop4" type="checkbox">
|
||||
<div class="dropdown-content">
|
||||
<a href="/resources/about/">About</a>
|
||||
<a href="/resources/roadmap/">Roadmap</a>
|
||||
|
|
|
@ -9,7 +9,7 @@ title: Monero Team
|
|||
<div class="col-xs-12">
|
||||
<div class="tabPanel-widget">
|
||||
<label for="tab-1" tabindex="0"></label>
|
||||
<input id="tab-1" type="radio" name="tabs" aria-hidden="true" checked="true">
|
||||
<input id="tab-1" type="radio" name="tabs" aria-hidden="true" checked>
|
||||
<h2>Core</h2>
|
||||
<div class="tabPanel-content">
|
||||
<div class="row">
|
||||
|
@ -42,7 +42,7 @@ title: Monero Team
|
|||
{%endfor%}
|
||||
</div>
|
||||
</div>
|
||||
<label for="tab-2" tab index="0"></label>
|
||||
<label for="tab-2" tabindex="0"></label>
|
||||
<input id="tab-2" type="radio" name="tabs" aria-hidden="true">
|
||||
<h2>Developers</h2>
|
||||
<div class="tabPanel-content">
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
@ -2376,8 +2374,6 @@ footer {
|
|||
position: absolute;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
height: 435px;
|
||||
height: 27.1875rem;
|
||||
background-color: #4c4c4c;
|
||||
color: #efefef;
|
||||
z-index: 1;
|
||||
|
|
|
@ -72,7 +72,7 @@ Note: the SHA256 hashes are listed by the downloads for convenience, but a GPG-s
|
|||
</h4>
|
||||
</div>
|
||||
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12" markdown="1">
|
||||
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).
|
||||
</div>
|
||||
</div>
|
||||
{% elsif data_downloads.id == "hardware" %}
|
||||
|
|
|
@ -12,7 +12,7 @@ title: Forum Funding System
|
|||
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
|
||||
<div class="tabPanel-widget">
|
||||
<label for="tab-1" tabindex="0"></label>
|
||||
<input id="tab-1" type="radio" name="tabs" aria-hidden="true" checked="true">
|
||||
<input id="tab-1" type="radio" name="tabs" aria-hidden="true" checked>
|
||||
<h2>Ideas</h2>
|
||||
<div class="tabPanel-content">
|
||||
{% for toplevel in site.data.ffs %}
|
||||
|
@ -28,8 +28,8 @@ title: Forum Funding System
|
|||
<p><a href="/forum-funding-system/ideas/" class="btn-link btn-fixed">See all Ideas</a></p>
|
||||
</div>
|
||||
</div>
|
||||
<label for="tab-2" tab index="0"></label>
|
||||
<input id="tab-2" type="radio" name="tabs" aria-h idden="true">
|
||||
<label for="tab-2" tabindex="0"></label>
|
||||
<input id="tab-2" type="radio" name="tabs" aria-hidden="true">
|
||||
<h2>Open Tasks</h2>
|
||||
<div class="tabPanel-content">
|
||||
{% for toplevel in site.data.ffs %}
|
||||
|
|
|
@ -42,8 +42,8 @@ title: Roadmap
|
|||
{%endif%}
|
||||
{%endfor%}
|
||||
</div>
|
||||
<label for="tab-2" tab index="0"></label>
|
||||
<input id="tab-2" type="radio" name="tabs" aria-h idden="true">
|
||||
<label for="tab-2" tabindex="0"></label>
|
||||
<input id="tab-2" type="radio" name="tabs" aria-hidden="true">
|
||||
<h2>2015</h2>
|
||||
<div class="tabPanel-content">
|
||||
{% for toplevel in site.data.roadmap %}
|
||||
|
@ -87,7 +87,7 @@ title: Roadmap
|
|||
{%endfor%}
|
||||
</div>
|
||||
<label for="tab-4" tabindex="0"></label>
|
||||
<input id="tab-4" type="radio" name="tabs" aria-hidden="true" checked="true">
|
||||
<input id="tab-4" type="radio" name="tabs" aria-hidden="true" checked>
|
||||
<h2>2017</h2>
|
||||
<div class="tabPanel-content">
|
||||
{% for toplevel in site.data.roadmap %}
|
||||
|
|
|
@ -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.
|
||||
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.
|
||||
|
|
Loading…
Reference in a new issue