diff --git a/i2p2www/pages/downloads/macros b/i2p2www/pages/downloads/macros index 7eddf7a7..00408760 100644 --- a/i2p2www/pages/downloads/macros +++ b/i2p2www/pages/downloads/macros @@ -2,11 +2,11 @@ {% set i2pinstall_jar_hash = '47c9d361940fc429effd57cc6718d72fde7a66663d5dfbb18fa30aba569b69fc' %} {% set i2psource_hash = 'daaac2b5a5a6b5bbd4b805f76e14f6a7c201dfd7c1cf43c98e182d2e657d1236' %} {% set i2pupdate_hash = '5245609257f80ab2177adc50593db239cc6e24bd9e39378c650a34e031451c01' %} -{% set i2p_android_hash = 'b14e3cc5ea12eb2e8bccb81dd2e86eeea3baba6695eb1a9f4d9053e76aeb131d' %} +{% set i2p_android_hash = 'e5a445cda4e8b2dfc424092c0f2cdebed117dcf0a975b4547c4749e6b9943e06' %} -{% set i2p_android_version = '0.9.22' %} +{% set i2p_android_version = '0.9.25' %} {% set i2p_android_version_kytv = '0.9.22' %} -{% set i2p_android_version_fdroid = '0.9.22' %} +{% set i2p_android_version_fdroid = '0.9.25' %} {% macro package_outer(type, name, icon) -%} @@ -62,8 +62,8 @@ {%- if type == 'android' %} {% trans %}Outside I2P{% endtrans %} ({{ i2p_android_version }}) - - {% trans %}Inside I2P{% endtrans %} ({{ i2p_android_version_kytv }}) + Google Play ({{ i2p_android_version }}) {% trans %}Our F-Droid repository{% endtrans %} ({{ i2p_android_version }}) F-Droid ({{ i2p_android_version_fdroid }}) diff --git a/i2p2www/pages/site/about/media.html b/i2p2www/pages/site/about/media.html index 468aeff1..9009f125 100644 --- a/i2p2www/pages/site/about/media.html +++ b/i2p2www/pages/site/about/media.html @@ -1,6 +1,6 @@ {% extends "global/layout.html" %} {% block title %}{{ _('Presentations on I2P') }}{% endblock %} -{% block lastupdated %}January 2016{% endblock %} +{% block lastupdated %}April 2016{% endblock %} {% block content %}

{% trans papers=site_url('papers') -%} Following are links to presentations, videos, and tutorials about I2P. Links to research papers on I2P are available here. @@ -106,9 +106,11 @@ Blair Dick, University of Abertay, Dundee Ethical Hacking Society, January 25, 2 Toronto, August 15-16, 2015 {%- endtrans %} -

  • {% trans link='https://download.i2p2.de/media/ccc/2015/I2P_Still_alive.pdf' -%} -I2P - Still alive! -echelon, 32C3 Hamburg, December 28, 2015 +
  • {% trans link='https://download.i2p2.de/media/ccc/2015/I2P_Still_alive.pdf', +link2='https://fossil.net2o.de/32c3/doc/trunk/wiki/i2p.md' -%} +I2P - Still alive! (pdf) +(video) +echelon, 32C3 (You Broke the Internet Assembly), Hamburg, December 28, 2015 {%- endtrans %}
  • {% trans link='https://download.i2p2.de/media/rwc/2016/rwc2016-str4d-slides.pdf', diff --git a/i2p2www/pages/site/about/team.html b/i2p2www/pages/site/about/team.html index 8bbef9e6..db4e5ca8 100644 --- a/i2p2www/pages/site/about/team.html +++ b/i2p2www/pages/site/about/team.html @@ -11,7 +11,7 @@ network. - + @@ -58,12 +58,12 @@ network. - + - + @@ -76,9 +76,19 @@ network. + + + + + + + + + + - + @@ -93,7 +103,7 @@ network. - + @@ -103,7 +113,7 @@ network. - + @@ -254,7 +264,7 @@ network. - + diff --git a/i2p2www/pages/site/get-involved/roadmap.html b/i2p2www/pages/site/get-involved/roadmap.html index 027e4ddb..5d03ed19 100644 --- a/i2p2www/pages/site/get-involved/roadmap.html +++ b/i2p2www/pages/site/get-involved/roadmap.html @@ -14,7 +14,7 @@ Note that we do not have a particular target for numbering a release as "1.0". We plan to continue numbering releases as 0.9.x for now. We do not maintain separate unstable and stable branches or releases. We have a single, stable release path. -Our normal release cycle is 6-10 weeks. +Our normal release cycle is 8-10 weeks.

    @@ -70,7 +70,7 @@ Bug fixes, translation updates, geoip updates

    0.9.26

    -

    Target release date: May 2016

    +

    Target release date: Early June 2016

    {{ _('Admin') }}{{ _('Admin') }} {{ _('Project Manager') }} zzz {{ _('point of contact of last resort') }}
    {{ _('Packager; Linux') }}KillYourTVzzz {{ _('Linux (Debian/Ubuntu) distribution packager') }}
    {{ _('Packager; Windows') }}KillYourTVzzz {{ _('Windows installer packager') }}
    eche|on, kytv, str4d {{ _('Backup release managers') }}
    {{ _('Tails Maintainer') }}pr0ng{{ _('Maintain the I2P package in Tails') }}
    {{ _('CI admin') }}[{{ _('vacant') }}]{{ _('Maintain the Continuous Integration infrastructure') }}
    {{ _('Update admin') }}KillYourTV[{{ _('vacant') }}] {{ _('Monitors and recruits in-network update hosts') }}
    Trac adminKillYourTVMeeh {{ _('Manage the project bug tracker') }}
    {{ _('Translation admins') }}eche|on, HungryHobo, KillYourTV, str4d, zzzeche|on, str4d, zzz Admins on Transifex
    {{ _('desktopgui, dijjer port') }}
    KillYourTVzzz {{ _('Debian/Ubuntu Packager and PPA maintainer') }}