Compare revisions

53d54a7c · c916dd1a · 2ec66ef9 · e44d6fd3 · 0ae10cf2 · c7133b96
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
+image: ruby:2.5
+stages:
+  - build
+
+variables:
+  LANG: "C.UTF-8"
+
+before_script:
+  - gem install bundler
+
+build_site:
+  stage: build
+  only:
+    - master
+  script:
+    - bundle install
+    - bundle exec jekyll build 
--- a/.gitlab/issue_templates/Merchant.md
+++ b/.gitlab/issue_templates/Merchant.md
+#### What's the name of your business?
+
+<!-- Write here -->
+
+#### What's the URL of the website?
+
+<!-- Write here. Referral links and/or trackers are not accepted -->
+
+#### Write a brief description of your business/service (max 50 characters)
+
+<!-- Write here. This text will be displayed on the Merchant page. Keep it short -->
+
+#### Enter the URL where a Monero mention can be found
+
+<!-- Be aware of the fact that to be listed, you must specify somewhere on your website that you accept Monero. -->
+
+https://
+
+#### How do you accept Monero? *(choose only one option)*
+
+- [ ] Monero integrations *(github.com/monero-integrations)*
+- [ ] Globee
+- [ ] Native wallet
+- [ ] Other payment gateaway (Coinpayments, Morphtoken, etc. *Please specify*)
+
+#### How would you categorize your business? *(choose only one option)*
+
+- [ ] Exchange
+- [ ] Block Explorer
+- [ ] Payment Gateway
+- [ ] Library and Helper
+- [ ] Tool
+- [ ] Service
+- [ ] Goods
+- [ ] Entertainment
+
+#### Comment
+
+<!-- Write here any additional comment -->
--- a/Gemfile.lock
+++ b/Gemfile.lock
 GEM
  remote: https://rubygems.org/
  specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
    builder (3.2.3)
    colorator (1.1.0)
-    ffi (1.9.18)
+    concurrent-ruby (1.1.5)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    ffi (1.11.3)
    forwardable-extended (2.6.0)
-    jekyll (3.5.2)
+    http_parser.rb (0.6.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (3.8.6)
      addressable (~> 2.4)
      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 0.7)
      jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 1.14)
      liquid (~> 4.0)
      mercenary (~> 0.3.3)
      pathutil (~> 0.9)
-      rouge (~> 1.7)
+      rouge (>= 1.7, < 4)
      safe_yaml (~> 1.0)
    jekyll-multiple-languages-plugin (1.5.1)
      jekyll (>= 2.0, < 4.0)
    jekyll-paginate (1.1.0)
-    jekyll-sass-converter (1.5.0)
+    jekyll-sass-converter (1.5.2)
      sass (~> 3.4)
-    jekyll-watch (1.5.0)
-      listen (~> 3.0, < 3.1)
-    kramdown (1.14.0)
-    liquid (4.0.0)
-    listen (3.0.8)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    kramdown (1.17.0)
+    liquid (4.0.3)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
    mercenary (0.3.6)
-    pathutil (0.14.0)
+    pathutil (0.16.2)
      forwardable-extended (~> 2.6)
-    public_suffix (2.0.5)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rouge (1.11.1)
+    public_suffix (4.0.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rouge (3.14.0)
    rubysl-rexml (2.0.4)
-    safe_yaml (1.0.4)
-    sass (3.5.1)
+    safe_yaml (1.0.5)
+    sass (3.7.4)
      sass-listen (~> 4.0.0)
    sass-listen (4.0.0)
      rb-fsevent (~> 0.9, >= 0.9.4)
@@ -57,4 +67,4 @@ DEPENDENCIES
  rubysl-rexml

 BUNDLED WITH
-   1.15.4
+   1.17.3
--- a/LICENSE
+++ b/LICENSE
+Copyright (c) 2014-2020, The Monero Project
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/README.md
+++ b/README.md
--- a/_config.yml
+++ b/_config.yml
@@ -2,7 +2,7 @@ email: dev@getmonero.org
 name: Monero
 description: Monero is a digital currency that is secure, private, and untraceable.
 keywords: "monero, xmr, bitmonero, cryptocurrency"
-baseurl: ""
+baseurl: "https://getmonero.org"
 url: "https://getmonero.org"

 markdown: kramdown
@@ -13,7 +13,7 @@ kramdown:
    smart_quotes: ["apos", "apos", "quot", "quot"]
    input: GFM

-exclude: ["README.md"]
+exclude: ["README.md", "CONTRIBUTING.md", "LICENSE"]

 # paginate
 paginate: 10
@@ -24,9 +24,10 @@ plugins:
  - jekyll-multiple-languages-plugin

 # jekyll-multiple-languages-plugin settings:
-languages: ["en", "es", "it", "pl", "fr", "ar"]
+languages: ["en", "es", "it", "pl", "fr", "ar", "ru", "de", "nl", "pt-br", "tr", "zh-cn", "zh-tw"]

-exclude_from_localizations: ["img", "css", "fonts", "media", "404", "feed.xml", "404", "meta", "forum-funding-system", "_posts", "legal"]
+
+exclude_from_localizations: ["img", "css", "fonts", "media", "404", "feed.xml", "404", "meta", "forum-funding-system", "_posts", "legal", "blog"]




--- a/_config/nginx.conf
+++ b/_config/nginx.conf
 # This is included as an example of a config file that works for the site. This is important so that anyone can re-host it in the event of something going wrong with the main site.
 # The main takeaways from this config file are the redirects, everything is relatively bog standard.

+server {
+    listen       80;
+
+    # Specify this vhost's domain name
+    server_name dlsrc.getmonero.org downloads.getmonero.orgdlsrc.monero.mu downloads.monero.mu downloads.monero.cc;
+    return 301 https://$server_name$request_uri;
+}
 server {
    listen       80;
    listen       443 ssl http2;
@@ -13,7 +20,7 @@ server {
    ssl_prefer_server_ciphers   on;

    # Specify this vhost's domain name
-    server_name updates.getmonero.org downloads.getmonero.org downloads.monero.cc;
+    server_name updates.getmonero.org dlsrc.getmonero.org downloads.getmonero.org updates.monero.mu dlsrc.monero.mu downloads.monero.mu downloads.monero.cc;
    root /var/www/downloads.getmonero.org/webroot;
    index index.php index.html index.htm;

@@ -55,72 +62,58 @@ server {
    }
    # End of general restrictions

-    rewrite ^/home / permanent;
-    rewrite ^/knowledge-base / permanent;
-    rewrite ^/knowledge-base/projects /resources/merchants/ permanent;
-    rewrite ^/knowledge-base/user-guides /resources/user-guides/ permanent;
-    rewrite ^/knowledge-base/developer-guides /resources/developer-guides/ permanent;
-    rewrite ^/knowledge-base/moneropedia /resources/moneropedia/ permanent;
-    rewrite ^/knowledge-base/people /community/team/ permanent;
-    rewrite ^/knowledge-base/open-alias /the-monero-project/ permanent;
-    rewrite ^/knowledge-base/about /resources/about/ permanent;
-    rewrite ^/getting-started/donate /get-started/contributing/ permanent;
-    rewrite ^/getting-started/accepting /get-started/accepting/ permanent;
-    rewrite ^/getting-started/merchants /community/merchants/ permanent;
-    rewrite ^/getting-started/running /get-started/using/ permanent;
-
    # Downloads!
    location /win64 {
-        rewrite ^ /cli/monero-win-x64-v0.11.1.0.zip redirect;
+        rewrite ^ /cli/monero-win-x64-v0.13.0.2.zip redirect;
    }

    location /win32 {
-        rewrite ^ /cli/monero-win-x86-v0.11.1.0.zip redirect;
+        rewrite ^ /cli/monero-win-x86-v0.13.0.2.zip redirect;
    }

    location /mac64 {
-        rewrite ^ /cli/monero-mac-x64-v0.11.1.0.tar.bz2 redirect;
+        rewrite ^ /cli/monero-mac-x64-v0.13.0.2.tar.bz2 redirect;
    }

    location /linux64 {
-        rewrite ^ /cli/monero-linux-x64-v0.11.1.0.tar.bz2 redirect;
+        rewrite ^ /cli/monero-linux-x64-v0.13.0.2.tar.bz2 redirect;
    }

    location /linux32 {
-        rewrite ^ /cli/monero-linux-x86-v0.11.1.0.tar.bz2 redirect;
+        rewrite ^ /cli/monero-linux-x86-v0.13.0.2.tar.bz2 redirect;
    }

    location /linuxarm7 {
-        rewrite ^ /cli/monero-linux-armv7-v0.11.1.0.tar.bz2 redirect;
+        rewrite ^ /cli/monero-linux-armv7-v0.13.0.2.tar.bz2 redirect;
    }

    location /linuxarm8 {
-        rewrite ^ /cli/monero-linux-armv8-v0.11.1.0.tar.bz2 redirect;
+        rewrite ^ /cli/monero-linux-armv8-v0.13.0.2.tar.bz2 redirect;
    }

    location /freebsd64 {
-        rewrite ^ /cli/monero-freebsd-x64-v0.11.1.0.tar.bz2 redirect;
+        rewrite ^ /cli/monero-freebsd-x64-v0.13.0.2.tar.bz2 redirect;
    }

    location /dragonflybsd64 {
-        rewrite ^ /cli/monero-dragonflybsd-x64-v0.11.1.0.tar.bz2 redirect;
+        rewrite ^ /cli/monero-dragonflybsd-x64-v0.13.0.2.tar.bz2 redirect;
    }
-    
+
    # GUI downloads
    location /gui/win64 {
-        rewrite ^ /gui/monero-gui-win-x64-v0.11.1.0.zip redirect;
+        rewrite ^ /gui/monero-gui-win-x64-v0.13.0.2.zip redirect;
    }

    location /gui/mac64 {
-        rewrite ^ /gui/monero-gui-mac-x64-v0.11.1.0.tar.bz2 redirect;
+        rewrite ^ /gui/monero-gui-mac-x64-v0.13.0.2.tar.bz2 redirect;
    }

    location /gui/linux64 {
-        rewrite ^ /gui/monero-gui-linux-x64-v0.11.1.0.tar.bz2 redirect;
+        rewrite ^ /gui/monero-gui-linux-x64-v0.13.0.2.tar.bz2 redirect;
    }

    location /gui/linux32 {
-        rewrite ^ /gui/monero-gui-linux-x86-v0.11.1.0.tar.bz2 redirect;
+        rewrite ^ /gui/monero-gui-linux-x86-v0.13.0.2.tar.bz2 redirect;
    }

    # Other download redirects
@@ -235,8 +228,15 @@ server {
    location / {
        try_files $uri $uri/ $uri.php $uri.htm $uri.html =404;
        index index.html index.htm index.php;
+#    	post_action @download_complete;
    }

+#    location @download_complete {
+#	resolver 8.8.8.8;
+#	proxy_pass http://statcounter.monero.cc/stat_counter.php?zz=yy&status=$request_completion&uri=$uri&remote_addr=$remote_addr&http_x_forwarded_for=$http_x_forwarded_for&body_bytes_sent=$body_bytes_sent&request_time=$request_time&scheme=$scheme&server_name=$server_name&http_user_agent=$http_user_agent;
+#	internal;
+#    }
+
    # Block for processing PHP files
    # Specifically matches URIs ending in .php
    location ~ \.php$ {
@@ -254,4 +254,4 @@ server {
        fastcgi_pass phpfpm;
    }

-}
+}
\ No newline at end of file
--- a/_data/downloads.yml
+++ b/_data/downloads.yml
- platform: Windows, 64-bit
-  id: windows
-  icon: icon-windows
-  cli_url: win64
-  cli_hash: 5c06097acebf643857672e673258d16d66a71de504377399b7407318f9887ee3s
-  gui_url: win64
-  gui_hash: 947efb72418d9ee60ccb0a2afa1f85553fa6a777a0a4e0f89f353592c84e00dc
-  cli_version: 0.12.3.0
-  gui_version: 0.12.3.0
-  tag: Lithium Luna
-  blockchain: win
+gui:
+- version: "0.15.0.4 - Carbon Chamaeleon"
+  downloads:
+   - platform: Windows 64-bit (Installer)
+     hash: 874ebbfcf79d09c60e2d85d09e5b8b971066c6355dfc2a5eca6d109d32e45ddb
+     link: https://downloads.getmonero.org/gui/win64install
+     icon: icon-windows
+     vers: 
+   - platform: Windows 64-bit (Zip)
+     hash: 9b61fa807c66ebe3010869d1fa926fe033a2c82e6e660ca8acb75a8fba0248a0
+     link: https://downloads.getmonero.org/gui/win64
+     icon: icon-windows
+     vers: 
+   - platform: Mac OS X 64-bit
+     hash: 9b0164cd90345c5fd4014a6bc8258465c2e5aae7c527c7f64a2d795830db7ae4
+     link: https://downloads.getmonero.org/gui/mac64
+     icon: icon-apple
+     vers: 
+   - platform: Linux 64-bit
+     hash: 2d105c792b46ec03739d39aaa6db3801f268e074814ab26e3824435f954c6a1c
+     link: https://downloads.getmonero.org/gui/linux64
+     icon: icon-linux
+     vers: 
+   - platform: Source Code
+     link: https://github.com/monero-project/monero-gui
+     icon: icon-github
+     

- platform: Windows, 32-bit
-  icon: icon-windows
-  cli_url: win32
-  cli_hash: 4a1718e75e2467f9a4b02b5c342b702999c97b1c0f8a1cdd5a63d7c2b21f849a
-  version: 0.12.2.0
-  tag: Lithium Luna
-  blockchain: win
-
- platform: Mac OS X, 64-bit
-  id: mac
-  icon: icon-apple
-  cli_url: mac64
-  cli_hash: 39d40e2001ca9948f434637c28b3933c0d79c66e2db07ffc4274711ab2d2ae66
-  gui_url: mac64
-  gui_hash: 90a9fa02e7bcef653b034f8a0365f16ec96cd553791546df2200a3c2591d5104
-  cli_version: 0.12.3.0
-  gui_version: 0.12.3.0
-  tag: Lithium Luna
-  blockchain: mac
-
- platform: Linux, 64-bit
-  id: linux
-  icon: icon-linux
-  cli_url: linux64
-  cli_hash: 72fe937aa2832a0079767914c27671436768ff3c486597c3353a8567d9547487
-  gui_url: linux64
-  gui_hash: dcf0a103589b8e71cdb8298dec96610f9f50b25e8f48afef5186d4c460a4ecae
-  cli_version: 0.12.3.0
-  gui_version: 0.12.3.0
-  tag: Lithium Luna
-  blockchain: linux
-
- platform: Linux, 32-bit
-  icon: icon-linux
-  cli_url: linux32
-  cli_hash: 41d68f66a43098754de0d2ead0eaeb125fc7eb05ecf3eb6a48c96ce6874052f3
-  gui_url: linux32
-  gui_hash: 6858519657add070aeedb03a22d4661ec1b868acdd0b3437fe45e6b640ea4e3b
-  cli_version: 0.12.3.0
-  gui_version: 0.12.3.0
-  tag: Lithium Luna
-  blockchain: linux
-
- platform: ARMv7
-  id: arm
-  icon: icon-arm
-  cli_url: linuxarm7
-  cli_hash: 839bddb01214acb8f7bc12181b206e1e8d99314337addef7ba850b15c32dc685
-  version: 0.12.3.0
-  tag: Lithium Luna
-  blockchain: arm
-
- platform: ARMv8
-  id: arm
-  icon: icon-arm
-  cli_url: linuxarm8
-  cli_hash: a6e994dc9fcec7259b656752a6fc0f9686bad47da9deec0f50398718cd9b9be8
-  version: 0.12.3.0
-  tag: Lithium Luna
-  blockchain: arm
-
- platform: Source Code & Blockchain
-  id: source
-  icon: icon-github
-  cli_url: https://github.com/monero-project/monero
-  cli_hash: source
-  version: Bleeding edge (possibly unstable)
-  
- platform: Mobile & Light Wallets
-  id: mobilelight
-  
- platform: Hardware Wallets
-  id: hardware
+cli:
+- version: "0.15.0.5 - Carbon Chamaeleon"
+  downloads:
+   - platform: Windows 64-bit
+     hash: 0286e21552d3fedfedbc7c7aba2f34c370ad4c21007a75fb67ac87994c5cec5a
+     link: https://downloads.getmonero.org/cli/win64
+     icon: icon-windows
+     vers: 
+   - platform: Windows 32-bit
+     hash: bdcc5af964b6271bbf05609edfc49093b690f15031b748dfb43ffe991ae9cc6e
+     link: https://downloads.getmonero.org/cli/win32
+     icon: icon-windows
+     vers:
+   - platform: Mac OS X 64-bit
+     hash: 8ef04398350b8de68e21da236801f276cf662641e03dc067f6e865180f9853f6
+     link: https://downloads.getmonero.org/cli/mac64
+     icon: icon-apple
+     vers:
+   - platform: Linux 64-bit
+     hash: 6cae57cdfc89d85c612980c6a71a0483bbfc1b0f56bbb30e87e933e7ba6fc7e7
+     link: https://downloads.getmonero.org/cli/linux64
+     icon: icon-linux
+     vers: 
+   - platform: Linux 32-bit
+     hash: fd2c32fc3efa47b2feda6526b0a2df4e1acc7325ec205a25d7947fbc843b24df
+     link: https://downloads.getmonero.org/cli/linux6432
+     icon: icon-linux
+     vers:
+   - platform: Linux ARMv8
+     hash: 04e73cf72f37f0bbdfa757c9bb5df2117aee473632a917041077da3c05169743
+     link: https://downloads.getmonero.org/cli/linuxarm8
+     icon: icon-linux
+     vers:
+   - platform: Linux ARMv7
+     hash: a23402ccf5ac432306fe263fae660646206ecb9d2aec3cfacb25afce34794067
+     link: https://downloads.getmonero.org/cli/linuxarm7
+     icon: icon-linux
+     vers:
+   - platform: Android ARMv8
+     hash: ceccc11723c4dff3cef420b37bc795850b74a8e71d23d44aa26faf5cd8fcc0e6
+     link: https://downloads.getmonero.org/cli/monero-android-armv8-v0.15.0.0.tar.bz2
+     icon: icon-android
+     vers:
+   - platform: Android ARMv7
+     hash: 52e46ead674275ed446e261795b2cde19e65f7098ce62902bfa275e67f9f10f7
+     link: https://downloads.getmonero.org/cli/monero-android-armv7-v0.15.0.0.tar.bz2
+     icon: icon-android
+     vers:
+   - platform: FreeBSD 64-bit
+     hash: b0ea91c4d0f68d8d85ba15ed537bdd81589fa796f88d96aec451543f87b9fdb7
+     link: https://downloads.getmonero.org/cli/freebsd64
+     icon: icon-freebsd
+     vers:
--- a/_data/ffs.yml
+++ b/_data/ffs.yml
- stage: Ideas
-  proposals:
-    - name: Fake. Nothing here yet. Check WiP and Completed Proposals.
-      url: #
-      summary: This is for the best ideas ever!
-      author: rehrar
-      
- stage: Open Tasks
-  proposals:
-    - name: Fake. Nothing here yet. Check WiP and Completed Proposals.
-      url: #
-      summary: This is for the best ideas ever!
-      author: rehrar
-      
- stage: Funding Required
-  proposals:
-    - name: Monero Bounty For HackerOne
-      url: /forum-funding-system/proposals/monero-bounty-hackerone.html
-      summary: we need dedicated funds to satisfy bounty for Monero and all Monero sub-projects on hackerone.com/monero
-      author: anonimal
-      
- stage: Work in Progress
-  proposals:
-    
- stage: Completed Proposals
-  proposals:
-    - name: Documentation and cleanup of source code 
-      url: /forum-funding-system/proposals/documentation-cleanup.html
-      summary: Clean up and properly document (doxygen) the monero source code
-      author: tewinget
-    - name: What is Monero? is produced and open-sourced
-      url: /forum-funding-system/proposals/whatismonero-produced.html
-      summary: Make an introduction video to Monero.
-      author: savandra
-    - name: Improving Developer Guides to include Simplewallet examples and Bitmonerod methods and examples
-      url: /forum-funding-system/proposals/improve-devguides-simplewallet.html
-      summary: Add examples to Developer Guides
-      author: bigredmachine
-    - name: A continuation for all purpose programming of what needs to get done in monero
-      url: /forum-funding-system/proposals/mooo-continuation-programming.html
-      summary: moneromooo continue coding for Monero
-      author: moneromooo
-    - name: Create End-User Kovri documentation
-      url: /forum-funding-system/proposals/kovri-end-user-docs.html
-      summary: The idea is to create user-friendly non-technical Kovri documentation.
-      author: anonimal
-    - name: fluffypony's Conference Circuit Jan 2017 Edition
-      url: /forum-funding-system/proposals/fp-conference-2017.html
-      summary: Cover fluffypony's expenses for January Monero speaking
-      author: fluffypony
-    - name: The official Qt GUI Project
-      url: /forum-funding-system/proposals/official-qt-gui.html
-      summary: Funding for the creation of the GUI
-      author: othe
-    - name: Justin's Local Meetup Talks Proposal 1
-      url: /forum-funding-system/proposals/justin-local-meetups-1.html
-      summary: Cover sgp's travel expenses for Monero speaking
-      author: samsunggalaxyplayer
-    - name: Justin's Local Meetup Talks Proposal 2
-      url: /forum-funding-system/proposals/justin-local-meetups-2.html
-      summary: Cover sgp's other travel expenses for Monero speaking
-      author: samsunggalaxyplayer
-    - name: More mooo coding goodness
-      url: /forum-funding-system/proposals/more-mooo-coding-goodness.html
-      summary: Moneromooo coding October 2016
-      author: moneromooo
-    - name: Funding for a Monero subforum on the largest chinese BTC forum 8BTC
-      url: /forum-funding-system/proposals/monero-subforum-8btc.html
-      summary: Make subforum on China's largest Bitcoin forum 8BTC
-      author: firperfect
-    - name: Additional GUI Developer
-      url: /forum-funding-system/proposals/additional-gui-dev.html
-      summary: Hire Jaquee as an additional GUI developer
-      author: Jaquee
-    - name: Getmonero.org Redesign
-      url: /forum-funding-system/proposals/getmonero-redesign.html
-      summary: Redesign the official getmonero.org website to make it more accessible and aesthetically pleasing.
-      author: rehrar
-    - name: Release of new/updated pool software
-      url: /forum-funding-system/proposals/release-pool-software.html
-      summary: An updated pool for usage within the XMR community
-      author: Snipa22
-    - name: Monero integrations with web apps
-      url: /forum-funding-system/proposals/monero-integrations.html
-      summary: Make open-source payment gateways for Monero on popular web apps
-      author: serhack
\ No newline at end of file
--- a/_data/lang/ar/footer-1.yml
+++ b/_data/lang/ar/footer-1.yml
@@ -43,7 +43,7 @@
  - name: Open Alias
    url: https://openalias.org/
  - name: مشروع كوفري
-    url: https://getkovri.org/
+    url: https://kovri.io/
  - name: مختبر بحث مونيرو
    url: resources/research-lab/
  - name: عدّه الصّحافه لمونيرو

--- a/_data/lang/ar/footer-2.yml
+++ b/_data/lang/ar/footer-2.yml
 - name: قانوني
  url: legal
 - name: شفره المصدر
-  url: https://github.com/monero-project
- name: المواصفات التقنيه
-  url: technical-specs/
+  url: https://repo.getmonero.org
--- a/_data/lang/ar/navigation.yml
+++ b/_data/lang/ar/navigation.yml
@@ -16,14 +16,16 @@
  url: downloads/
 - title: آخر الأخبار
  subfolderitems:
-    - page: جميع المشاركات
-      url: blog
-    - page: خطابات
-      url: blog/tags/monero%20missives.html
-    - page: سجل الإجتماعات
-      url: blog/tags/dev%20diaries.html
+    - page: Urgent
+      url: blog/tags/urgent.html
    - page: الإصدارات
      url: blog/tags/releases.html
+    - page: Community
+      url: blog/tags/community.html
+    - page: سجل الإجتماعات
+      url: blog/tags/dev%20diaries.html
+    - page: جميع المشاركات
+      url: blog
 - title: المجتمع
  subfolderitems:
  - page: الفريق

--- a/_data/lang/ar/roadmap.yml
+++ b/_data/lang/ar/roadmap.yml
- year: 2014
-  accomplishments:
+year_2014:
+- month: April
+  completed:
    - name: تم إنشاء المشروع علي Bitcointalk
-      date: 2014-04-18
-      status: completed
-    - name: تغيير الإسم من بيت مونيرو إلي مونيرو
-      date: 2014-04-23
-      status: completed
-    - name: تم التعافي من هجمه اسبام
-      date: 2014-09-04
-      status: completed
-    - name: تم نشر أول ورقتين بحث لمختبر بحث مونيرو
-      date: 2014-09-12
-      status: completed
-    - name: تم نشر الورقه البحثيه الثالثه لمختبر بحث مونيرو
-      date: 2014-09-25
-      status: completed
-    - name: 0.8.8.6 نشر الإصدار رقم
-      date: 2014-12-08
-      status: completed
- year: 2015
-  accomplishments:
-    - name: الورقه البحثيه الرابعه لمختبر بحث مونيرو
-      date: 2015-01-26
-      status: completed
- year: 2016
-  accomplishments:
-    - name: 0.9.0 نشر الإصدار رقم
-      date: 2016-01-01
-      status: completed
-    - name: الورقه البحثيه الخامسه لمختبر البحث
-      date: 2016-02-10
-      status: completed
-    - name: تحديث للشبكه لإستخدام 3 كأقل عدد لحجم الحلقات اللازم لكل المعاملات
-      date: 2016-03-22
-      status: completed
-    - name: 0.10.0 نشر الإصدار رقم
-      date: 2016-09-18
-      status: completed
-    - name: تحديث للشبكه لفصل معامله الاساس الي عده فئات
-      date: 2016-09-21
-      status: completed
-    - name: 0.10.1 نشر الإصدار
-      date: 2016-12-14
-      status: completed
-    - name: الإصدار التجريبي الاول للواجهه الرسوميه الرسميه
-      date: 2016-12-22
-      status: completed
- year: 2017
-  accomplishments:
-    - name: تحديث الشبكه للسماح بمعاملات الحقل السريه
-      date: 2017-01-05
-      status: completed
-    - name: 0.10.2 الإصدار رقم , تم معالجه ثغيره خطيره
-      date: 2017-02-22
-      status: completed
-    - name: 0.10.3.1 الإصدار رقم
-      date: 2017-03-27
-      status: completed
-    - name: تحديث للشبكه لتعديل أقل حجم للكتل و خوارزميه الرسوم الديناميكية
-      date: 2017-04-15
-      status: completed
-    - name: إعاده تصميم الموقع
-      date: 2017-07-04
-      status: completed
-    - name: 0.11.0.0 إصدار رقم
-      date: 2017-09-07
-      status: completed
-    - name: الكتل الرقيقه
-      date: 2017-09-07
-      status: completed
-    - name: نهايه المرحله التجريبيه للواجهه الرسوميه
-      date: 2017-09-10
-      status: completed
-    - name: تحديث للشبكه لإستخدام 5 كأقل عدد لحجم الحلقات اللازم و إلزام معاملات الحقل السريه لكل المعاملات
-      date: 2017-09-15
-      status: completed
+    - name: Renamed from Bitmonero to Monero
+- month: September
+  completed:
+    - name: Recovered from a spam attack
+    - name: Monero Research Lab Papers 1 and 2 published
+    - name: Monero Research Lab Paper 3 published
+- month: December
+  completed:
+    - name: 0.8.8.6 released
+year_2015:
+- month: January
+  completed:
+    - name: Monero Research Lab Paper 4 published
+year_2016:
+- month: January
+  completed:
+    - name: 0.9.0 Hydrogen Helix released
+- month: February
+  completed:
+    - name: Monero Research Lab Paper 5 published
+- month: March
+  completed:
+    - name: Network Upgrade to require minimum ringsize of 3 on all transactions
+- month: September
+  completed:
+    - name: 0.10.0 Wolfram Warptangent released
+    - name: Network Upgrade to split coinbase into denominations
+- month: December
+  completed:
+    - name: 0.10.1 Wolfram Warptangent released
+    - name: Official GUI Beta 1 released
+year_2017:
+- month: January
+  completed:
+    - name: Network Upgrade to enable RingCT transactions
+- month: February
+  completed:
+    - name: 0.10.2 released; critical vulnerability patched
+- month: March
+  completed:
+    - name: 0.10.3.1 Wolfram Warptangent released
+- month: April
+  completed:
+    - name: Network Upgrade to adjust minimum blocksize and dynamic fee algorithm
+- month: July
+  completed:
+    - name: Website redesigned
+- month: September
+  completed:
+    - name: 0.11.0.0 Helium Hydra released
+    - name: Fluffy blocks
+    - name: GUI out of beta
+    - name: Network Upgrade to increase minimum ringsize to 5 and require RingCT transactions
+    - name: GUI 0.11.0.0 Helium Hydra released
    - name: 0MQ/ZeroMQ
-      date: September, 2017
-      status: completed
-    - name: العناوين الفرعيه
-      date: October, 2017
-      status: completed
-    - name: ثنائيه التوقيع (multisig)
-      date: December, 2017
-      status: completed
- year: 2018
-  accomplishments:
-    - name: تقنيه إثبات العمل جديده CryptoNoteV7
-      date: 2018-04-06
-      status: completed
-    - name: تحديث للشبكه لإستخدام 7 كأقل عدد لحجم الحلقات اللازم, دمح ثنائيه التوقيع , العناوين الفرعيه , وتغيير تقنيه إثبات العمل
-      date: 2018-04-06
-      status: completed
-    - name: ترجمه الموقع إلي الفرنسيه والبولنديه
-      date: 2018-04-24
-      status: completed
-    - name: إعاده تصميم نظام التمويل بالمنتدي
-      date:
-      status: ongoing
-    - name: نظام "مدي التأكيد" أكثر كفأً لمعاملات الحقل السري لتقليل حجم المعاملات
-      date:
-      status: upcoming
-    - name: الإصدار الأول لمشروع كوفري
-      date:
-      status: upcoming
- year: 2019
-  accomplishments:
-    - name: حلول الطبقه الثانيه للسرعه و قابليه التوسع
-      date:
-      status: upcoming
-    - name: أوراق بحثيه إضافيه لمختبر بحث مونيرو
-      date:
-      status: upcoming
+- month: October
+  completed:
+    - name: Subaddresses
+    - name: Monero Research Lab Paper 6 published
+    - name: 0.11.1.0 Helium Hydra released
+    - name: GUI 0.11.1.0 Helium Hydra released
+- month: December
+  completed:
+    - name: Multi-signatures (multisig)
+year_2018:
+- month: March
+  completed:
+    - name: 0.12.0.0 Lithium Luna released
+- month: April
+  completed:
+    - name: GUI 0.12.0.0 Lithium Luna released
+    - name: New Proof of Work CryptoNightV2
+    - name: Network upgrade to increase minimal ringsize to 7, integrate multisig, subaddresses, and change PoW algo
+    - name: Getmonero.org Localization in French and Polish
+- month: May
+  completed:
+    - name: 0.12.1.0 Lithium Luna released
+- month: June
+  completed:
+    - name: Ledger Hardware Wallets Support
+    - name: 0.12.2.0 Lithium Luna released
+- month: July
+  completed:
+    - name: 0.12.3.0 Lithium Luna released
+    - name: GUI 0.12.3.0 Lithium Luna released
+- month: August
+  completed:
+    - name: Kovri alpha release
+    - name: Getmonero.org Moneropedia open for Localization
+    - name: Getmonero.org Localization in Arabic
+- month: October
+  completed:
+    - name: 0.13.0.2 Beryllium Bullet released
+    - name: GUI 0.13.0.3 Beryllium Bullet released
+    - name: New Proof of Work CryptoNightV3
+    - name: Implementation of Bulletproofs to reduce transaction sizes
+    - name: Network upgrade to increase minimal ringsize to 11, integrate Bulletproofs, update fees calculation algorithm, and change PoW algo
+    - name: 0.13.0.4 Beryllium Bullet released
+- month: Nobember
+  completed:
+    - name: Monero Research Lab Papers 8 and 9 published
+    - name: GUI 0.13.0.4 Beryllium Bullet released
+    - name: Monero Research Lab Paper 7 published
+- month: December
+  completed:
+    - name: Monero Research Lab Paper 10 published
+    - name: Implementation of Monero Messaging System (MMS) to automate multisig wallets information exchange
+year_2019:
+- month: February
+  completed:
+    - name: Getmonero.org Localization in German
+    - name: 0.14.0.0 Boron Butterfly released
+- month: March
+  completed:
+    - name: GUI 0.14.0.0 Boron Butterfly released
+    - name: New Community Crowdfunding System (CCS) to replace the Forum Funding System (FFS)
+    - name: 0.14.0.2 Boron Butterfly released
+    - name: New Proof of Work CryptoNightR
+    - name: Getmonero.org Localization in Brazilian-Portuguese and Dutch
+- month: May
+  completed:
+    - name: "DLSAG: Non-Interactive Refund Transactions For Interoperable Payment Channels in Monero"
+- month: July
+  completed:
+    - name: Blockchain pruning
+    - name: Trezor model T support
+    - name: Ledger Nano X support
+    - name: Tor & I2P CLI wallet integration
+    - name: Multisig Messaging System
+- month: October
+  completed:
+    - name: "Localization platform change: from Pootle to Weblate"
+- month: November
+  completed:
+    - name: "Localization platform change: from Pootle to Weblate"
+    - name: Pay for service system using mining (RPC-Pay)
+    - name: IPv6 support
+    - name: Standalone (long) payment ID support removed
+    - name: GUI automatic remote nodes discovering and switching option
+    - name: New Proof of Work RandomX
+year_2020:
+- month: February
+  completed:
+    - name: Getmonero translatable on Weblate
+- month: March
+  completed:
+    - name: GUI 0.15.0.4 released
+- month: Coming Soon
+  ongoing: 
+    - name: Onion address for Getmonero.org
+    - name: Implementation of the Dandelion++ protocol
+    - name: Wallet scanning speedups (support for supercop ASM)
+    - name: Concise linkable spontaneous anonymous group (CLSAG) signatures
+    - name: "Triptych: logarithmic-sized linkable ring signatures with applications"
+    - name: "Kastelo: open source hardware wallet"
+  upcoming:
+    - name: Second-layer solutions for speed and scalability
+future:
+- month: Coming Soon
+  upcoming:
+    - name: Return addresses
\ No newline at end of file
--- a/_data/lang/de/footer-1.yml
+++ b/_data/lang/de/footer-1.yml
+- title: Ressourcen
+  subfolderitems:
+  - name: Über Monero
+    url: resources/about/
+  - name: Moneropedia
+    url: resources/moneropedia/
+  - name: Anleitungen für Entwickler
+    url: resources/developer-guides/
+  - name: Anleitungen für Nutzer
+    url: resources/user-guides/
+  - name: Bibliothek
+    url: library
+  - name: RSS-Feed
+    url: https://getmonero.org/feed.xml
+- title: IRC-Channels
+  subfolderitems:
+  - name: monero
+    url: irc://chat.freenode.net/#monero
+  - name: monero-dev
+    url: irc://chat.freenode.net/#monero-dev
+  - name: monero-markets
+    url: irc://chat.freenode.net/#monero-markets
+  - name: monero-pools
+    url: irc://chat.freenode.net/#monero-pools
+  - name: monero-community
+    url: irc://chat.freenode.net/#monero-community
+  - name: monero-translations
+    url: irc://chat.freenode.net/#monero-translations
+  - name: monero-hardware
+    url: irc://chat.freenode.net/#monero-hardware
+- title: Community
+  subfolderitems:
+  - name: Reddit
+    url: https://reddit.com/r/monero
+  - name: Stack Exchange
+    url: https://monero.stackexchange.com/
+  - name: Thread auf BitcoinTalk
+    url: https://bitcointalk.org/index.php?topic=583449.0
+  - name: Mattermost-Chat
+    url: https://mattermost.getmonero.org/
+  - name: Telegram-Chat
+    url: https://telegram.me/bitmonero
+- title: Das Monero-Projekt
+  subfolderitems:
+  - name: OpenAlias
+    url: https://openalias.org/
+  - name: Kovri
+    url: https://kovri.io/
+  - name: Monero Research Lab
+    url: resources/research-lab/
+  - name: Monero-Presseunterlagen
+    url: press-kit
--- a/_data/lang/de/footer-2.yml
+++ b/_data/lang/de/footer-2.yml
+- name: Rechtliches
+  url: legal
+- name: Quellcode
+  url: https://repo.getmonero.org
--- a/_data/lang/template/navigation.yml
+++ b/_data/lang/template/navigation.yml
- title: Get Started
-  subfolderitems:
-  - page: What is Monero?
-    url: get-started/what-is-monero
-  - page: Using
-    url: get-started/using
-  - page: Accepting
-    url: get-started/accepting
-  - page: Contributing
-    url: get-started/contributing
-  - page: Mining
-    url: get-started/mining
-  - page: FAQ
-    url: get-started/faq
- title: Downloads
-  url: downloads/
- title: Recent News
-  subfolderitems:
-    - page: All Posts
-      url: blog
-    - page: Missives
-      url: blog/tags/monero%20missives.html
-    - page: Meeting Logs
-      url: blog/tags/dev%20diaries.html
-    - page: Releases
-      url: blog/tags/releases.html
- title: Community
-  subfolderitems:
-  - page: Team
-    url: community/team
-  - page: Hangouts
-    url: community/hangouts
-  - page: Sponsorships
-    url: community/sponsorships
-  - page: Merchants
-    url: community/merchants
- title: Resources
-  subfolderitems:
-  - page: About
-    url: resources/about
-  - page: Roadmap
-    url: resources/roadmap
-  - page: Research Lab
-    url: resources/research-lab
-  - page: Moneropedia
-    url: resources/moneropedia
-  - page: User Guides
-    url: resources/user-guides
-  - page: Developer Guides
-    url: resources/developer-guides
-  - page: Technical Specs
-    url: technical-specs
-  - page: Library
-    url: library
\ No newline at end of file
+- title: Einstieg
+  subfolderitems:
+  - page: Was ist Monero?
+    url: get-started/what-is-monero
+  - page: Nutzen
+    url: get-started/using
+  - page: Akzeptieren
+    url: get-started/accepting
+  - page: Unterstützen
+    url: get-started/contributing
+  - page: Mining
+    url: get-started/mining
+  - page: Häufig gestellte Fragen
+    url: get-started/faq
+- title: Downloads
+  url: downloads/
+- title: Neuigkeiten
+  subfolderitems:
+    - page: Dringend
+      url: blog/tags/urgent.html
+    - page: Versionen
+      url: blog/tags/releases.html
+    - page: Gemeinschaft
+      url: blog/tags/community.html
+    - page: Protokolle
+      url: blog/tags/dev%20diaries.html
+    - page: Alle Einträge
+      url: blog
+- title: Community
+  subfolderitems:
+  - page: Team
+    url: community/team
+  - page: Hangouts
+    url: community/hangouts
+  - page: Sponsoren
+    url: community/sponsorships
+  - page: Händler
+    url: community/merchants
+- title: Ressourcen
+  subfolderitems:
+  - page: Über
+    url: resources/about
+  - page: Roadmap
+    url: resources/roadmap
+  - page: Research Lab
+    url: resources/research-lab
+  - page: Moneropedia
+    url: resources/moneropedia
+  - page: Anleitungen für Nutzer
+    url: resources/user-guides
+  - page: Anleitungen für Entwickler
+    url: resources/developer-guides
+  - page: Technische Spezifikationen
+    url: technical-specs
+  - page: Bibliothek
+    url: library
+  - page: Press Kit
+    url: press-kit
\ No newline at end of file
--- a/_data/lang/de/roadmap.yml
+++ b/_data/lang/de/roadmap.yml
+year_2014:
+- month: April
+  completed:
+    - name: Veröffentlicht auf Bitcointalk
+    - name: Umbenennung von Bitmonero zu Monero
+- month: September
+  completed:
+    - name: Erholung von einer Spamattacke
+    - name: „Monero Research Lab“-Papers 1 und 2 veröffentlicht
+    - name: „Monero Research Lab“-Paper 3 veröffentlicht
+- month: December
+  completed:
+    - name: 0.8.8.6 veröffentlicht
+year_2015:
+- month: January
+  completed:
+    - name: „Monero Research Lab“-Paper 4 veröffentlicht
+year_2016:
+- month: January
+  completed:
+    - name: 0.9.0 Hydrogen Helix veröffentlicht
+- month: February
+  completed:
+    - name: „Monero Research Lab“-Paper 5 veröffentlicht
+- month: March
+  completed:
+    - name: Netzwerkupgrade, das eine minimale Ringgröße von 3 für alle Transaktionen voraussetzt
+- month: September
+  completed:
+    - name: 0.10.0 Wolfram Warptangent veröffentlicht
+    - name: Netzwerkupgrade um ungleiche Transaktionsbeträge unter den Ringen zu ermöglichen
+- month: December
+  completed:
+    - name: 0.10.1 Wolfram Warptangent veröffentlicht
+    - name: Offizielle GUI Beta 1 veröffentlicht
+year_2017:
+- month: January
+  completed:
+    - name: Netzwerkupgrade, um RingCT Transaktionen zu ermöglichen
+- month: February
+  completed:
+    - name: 0.10.2 veröffentlicht; kritische Schwachstelle gepatcht
+- month: March
+  completed:
+    - name: 0.10.3.1 Wolfram Warptangent veröffentlicht
+- month: April
+  completed:
+    - name: Netzwerkupgrade, das die kleinstmögliche Blockgröße und den dynamischen Gebührenalgorithmus anpasst
+- month: July
+  completed:
+    - name: Webseite neu gestaltet
+- month: September
+  completed:
+    - name: 0.11.0.0 Helium Hydra veröffentlicht
+    - name: Fluffy blocks
+    - name: Betaphase der GUI beendet
+    - name: Netzwerkupgrade, das die minimale Ringgröße auf 5 anhebt und RingCT voraussetzt
+    - name: GUI 0.11.0.0 Helium Hydra veröffentlicht
+    - name: 0MQ/ZeroMQ
+- month: October
+  completed:
+    - name: Subadressen
+    - name: „Monero Research Lab“-Paper 6 veröffentlicht
+    - name: 0.11.1.0 Helium Hydra veröffentlicht
+    - name: GUI 0.11.1.0 Helium Hydra veröffentlicht
+- month: December
+  completed:
+    - name: Mehrfachsignaturen (multisig)
+year_2018:
+- month: March
+  completed:
+    - name: 0.12.0.0 Lithium Luna veröffentlicht
+- month: April
+  completed:
+    - name: GUI 0.12.0.0 Lithium Luna veröffentlicht
+    - name: Neuer PoW CryptoNightV2
+    - name: Netzwerkupgrade, das die minimale Ringgröße auf 7 erhöht, Mehrfachsignaturen und Subadressen integriert und den PoW-Algorithmus ändert
+    - name: "Getmonero.org: Übersetzungen in Französisch und Polnisch"
+- month: May
+  completed:
+    - name: 0.12.1.0 Lithium Luna veröffentlicht
+- month: June
+  completed:
+    - name: Hardware-Wallets von Ledger werden unterstützt
+    - name: 0.12.2.0 Lithium Luna veröffentlicht
+- month: July
+  completed:
+    - name: 0.12.3.0 Lithium Luna veröffentlicht
+    - name: GUI 0.12.3.0 Lithium Luna veröffentlicht
+- month: August
+  completed:
+    - name: Kovri Alpha veröffentlicht
+    - name: Getmonero.org Moneropedia open for Localization
+    - name: "Getmonero.org: Übersetzungen in Arabisch"
+- month: October
+  completed:
+    - name: 0.13.0.2 Beryllium Bullet veröffentlicht
+    - name: GUI 0.13.0.3 Beryllium Bullet veröffentlicht
+    - name: Neuer PoW CryptoNightV3
+    - name: Implementation von BulletProofs anstelle von RingCT, um Transaktionsgrößen zu verringern
+    - name: Network upgrade to increase minimal ringsize to 11, integrate Bulletproofs, update fees calculation algorithm, and change PoW algo
+    - name: 0.13.0.4 Beryllium Bullet veröffentlicht
+- month: Nobember
+  completed:
+    - name: „Monero Research Lab“-Papers 8 und 9 veröffentlicht
+    - name: GUI 0.13.0.4 Beryllium Bullet veröffentlicht
+    - name: „Monero Research Lab“-Paper 7 veröffentlicht
+- month: December
+  completed:
+    - name: „Monero Research Lab“-Paper 10 veröffentlicht
+    - name: Implementation of Monero Messaging System (MMS) to automate multisig wallets information exchange
+year_2019:
+- month: February
+  completed:
+    - name: Getmonero.org Localization in German
+    - name: 0.14.0.0 Boron Butterfly released
+- month: March
+  completed:
+    - name: GUI 0.14.0.0 Boron Butterfly released
+    - name: New Community Crowdfunding System (CCS) to replace the Forum Funding System (FFS)
+    - name: 0.14.0.2 Boron Butterfly released
+    - name: New Proof of Work CryptoNightR
+    - name: Getmonero.org Localization in Brazilian-Portuguese and Dutch
+- month: May
+  completed:
+    - name: "DLSAG: Non-Interactive Refund Transactions For Interoperable Payment Channels in Monero"
+- month: July
+  completed:
+    - name: Blockchain pruning
+    - name: Trezor model T support
+    - name: Ledger Nano X support
+    - name: Tor & I2P CLI wallet integration
+    - name: Multisig Messaging System
+- month: October
+  completed:
+    - name: "Localization platform change: from Pootle to Weblate"
+- month: November
+  completed:
+    - name: "Localization platform change: from Pootle to Weblate"
+    - name: Pay for service system using mining (RPC-Pay)
+    - name: IPv6 support
+    - name: Standalone (long) payment ID support removed
+    - name: GUI automatic remote nodes discovering and switching option
+    - name: New Proof of Work RandomX
+year_2020:
+- month: February
+  completed:
+    - name: Getmonero translatable on Weblate
+- month: March
+  completed:
+    - name: GUI 0.15.0.4 released
+- month: Coming Soon
+  ongoing: 
+    - name: Onion address for Getmonero.org
+    - name: Implementation of the Dandelion++ protocol
+    - name: Wallet scanning speedups (support for supercop ASM)
+    - name: Concise linkable spontaneous anonymous group (CLSAG) signatures
+    - name: "Triptych: logarithmic-sized linkable ring signatures with applications"
+    - name: "Kastelo: open source hardware wallet"
+  upcoming:
+    - name: Second-layer solutions for speed and scalability
+future:
+- month: Coming Soon
+  upcoming:
+    - name: Return addresses
\ No newline at end of file
--- a/_data/lang/en/footer-1.yml
+++ b/_data/lang/en/footer-1.yml
@@ -11,7 +11,7 @@
  - name: Library
    url: library
  - name: RSS Feed
-    url: https://getmonero.org/feed.xml
+    url: rss
 - title: IRC Channels
  subfolderitems:
  - name: monero
@@ -45,7 +45,7 @@
  - name: Open Alias
    url: https://openalias.org/
  - name: Kovri
-    url: https://getkovri.org/
+    url: https://kovri.io/
  - name: Monero Research Lab
    url: resources/research-lab/
  - name: Monero Press Kit

--- a/_data/lang/en/footer-2.yml
+++ b/_data/lang/en/footer-2.yml
 - name: Legal
  url: legal
 - name: Source Code
-  url: https://github.com/monero-project
- name: Technical Specs
-  url: technical-specs/
\ No newline at end of file
+  url: https://repo.getmonero.org
--- a/_data/lang/en/navigation.yml
+++ b/_data/lang/en/navigation.yml
@@ -16,14 +16,16 @@
  url: downloads/
 - title: Recent News
  subfolderitems:
-    - page: All Posts
-      url: blog
-    - page: Missives
-      url: blog/tags/monero%20missives.html
-    - page: Meeting Logs
-      url: blog/tags/dev%20diaries.html
+    - page: Urgent
+      url: blog/tags/urgent.html
    - page: Releases
      url: blog/tags/releases.html
+    - page: Community
+      url: blog/tags/community.html
+    - page: Meeting Logs
+      url: blog/tags/dev%20diaries.html
+    - page: All Posts
+      url: blog
 - title: Community
  subfolderitems:
  - page: Team
@@ -48,7 +50,7 @@
    url: resources/user-guides
  - page: Developer Guides
    url: resources/developer-guides
-  - page: Technical Specs
-    url: technical-specs
  - page: Library
-    url: library
\ No newline at end of file
+    url: library
+  - page: Press Kit
+    url: press-kit
No results found