Commit e45fdea2 authored by Hermann Krumrey's avatar Hermann Krumrey
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request namibsun/python/bundesliga-tippspiel!25
parents f9785643 d0f799db
Loading
Loading
Loading
Loading
+2 −0
Changes for CHANGELOG: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
V 1.1.0:
  - Activated Telegram Reminder
V 1.0.4:
  - Only test on master and develop branches
V 1.0.3:
+2 −1
Changes for bundesliga_tippspiel/templates/info/stats.html: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -48,16 +48,17 @@ along with bundesliga-tippspiel. If not, see <http://www.gnu.org/licenses/>.
        </div>
    </div>

    {% set unit="%" %}
    <div class="row">
        <div class="col-md-6">
            <h3>Punkte/Tipp</h3>
            {% set leaderboard=average_ranking %}
            {% set unit="Punkte/Tipp" %}
            {% include "components/ranking_table.html" %}
        </div>
        <div class="col-md-6">
            <h3>Teilnahme</h3>
            {% set leaderboard=participation_ranking %}
            {% set unit="%" %}
            {% include "components/ranking_table.html" %}
        </div>
    </div>
+9 −5
Changes for bundesliga_tippspiel/templates/profile/profile.html: 9 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -100,20 +100,24 @@ along with bundesliga-tippspiel. If not, see <http://www.gnu.org/licenses/>.

    <hr>

    <!--h2>Telegram Erinnerungen</h2>
    <h2>Telegram Erinnerungen</h2>

    Um Erinnerungen für Telegram zu aktivieren, schicke die folgende Nachricht
    an den hk-tippspiel Bot:
    Um Erinnerungen für Telegram zu erhalten, schicke die folgende Nachricht
    an den hk-tippspiel Bot
    <!--suppress SpellCheckingInspection, HtmlUnknownTarget -->
    (<a href="https://t.me/hk_tippspiel_bot">t.me/hk_tippspiel_bot</a>):

    <br>
    <br>

    /register {{ current_user.id }}
    /register benutzername passwort

    <br>
    <br>

    Anschließend kannst du den Zeitpunkt der Erinnerungen adjustieren und/oder
    die Erinnerungen wieder deaktivieren. Schicke für weitere Informationen die
    Nachricht "/help" an den Bot.-->
    Nachricht "/help" an den Bot.>

    <hr>

+1 −1
Changes for version: 1 added line, 1 removed line.
Original line number Diff line number Diff line
1.0.4
 No newline at end of file
1.1.0
 No newline at end of file