Merge remote-tracking branch 'upstream/develop' into dkru/cypress-test-case-17-lock-hide-features
Kruchinin
5 years ago
commit
418f3168ea
@ -1,5 +1,16 @@
|
||||
{% load i18n %}{% autoescape off %} {% blocktrans %}You're receiving this email because you requested a password reset
|
||||
for your user account at {{ site_name }}.{% endblocktrans %} {% trans "Please go to the following page and choose a new
|
||||
password:" %} {% block reset_link %} {{ protocol }}://{{ domain }}/auth/password/reset/confirm?uid={{ uid }}&token={{
|
||||
token }} {% endblock %} {% trans "Your username, in case you've forgotten:" %} {{ user.get_username }} {% trans "Thanks
|
||||
for using our site!" %} {% blocktrans %}The {{ site_name }} team{% endblocktrans %} {% endautoescape %}
|
||||
{% load i18n %}{% autoescape off %}
|
||||
{% blocktrans %}
|
||||
You're receiving this email because you requested a password reset for your user account at {{ site_name }}.
|
||||
{% endblocktrans %}
|
||||
|
||||
{% trans "Please go to the following page and choose a new password:" %}
|
||||
{% block reset_link %}
|
||||
{{ protocol }}://{{ domain }}/auth/password/reset/confirm?uid={{ uid }}&token={{ token }}
|
||||
{% endblock %}
|
||||
{% trans "Your username, in case you've forgotten:" %} {{ user.get_username }}
|
||||
|
||||
{% trans "Thanks for using our site!" %}
|
||||
|
||||
{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
|
||||
|
||||
{% endautoescape %}
|
||||
|
||||
@ -1,7 +1,14 @@
|
||||
<!--
|
||||
Copyright (C) 2018 Intel Corporation
|
||||
Copyright (C) 2018-2020 Intel Corporation
|
||||
|
||||
SPDX-License-Identifier: MIT
|
||||
-->
|
||||
{% extends 'documentation/base_page.html' %} {% block title %} CVAT User Guide {% endblock %} {% block content %} {{
|
||||
user_guide }} {% endblock %}
|
||||
{% extends 'documentation/base_page.html' %}
|
||||
|
||||
{% block title %}
|
||||
CVAT User Guide
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{{ user_guide }}
|
||||
{% endblock %}
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
<!--
|
||||
Copyright (C) 2018 Intel Corporation
|
||||
Copyright (C) 2018-2020 Intel Corporation
|
||||
|
||||
SPDX-License-Identifier: MIT
|
||||
-->
|
||||
{% extends 'documentation/base_page.html' %} {% block title %} CVAT XML format {% endblock %} {% block content %} {{
|
||||
xml_format }} {% endblock %}
|
||||
{% extends 'documentation/base_page.html' %}
|
||||
{% block title %} CVAT XML format {% endblock %}
|
||||
{% block content %} {{ xml_format }} {% endblock %}
|
||||
|
||||
Loading…
Reference in New Issue