inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-15 03:25:42 +00:00
Code Activity

Merge remote-tracking branch 'upstream/master' into django-q

Browse Source 
# Conflicts:
#	InvenTree/InvenTree/status.py
#	InvenTree/templates/about.html
This commit is contained in:
Oliver Walters
2021-04-07 22:29:47 +10:00
parent 4a3ca4638c 5e0e364b6c
commit 9c38d67b52
76 changed files with 4616 additions and 2335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
InvenTree/templates/about.html
View File

@ -34,16 +34,20 @@
<td>{% trans "Django Version" %}</td>
<td><a href="https://www.djangoproject.com/">{% django_version %}</a></td>
</tr>
{% inventree_commit_hash as hash %}
{% if hash %}
<tr>
<td><span class='fas fa-code-branch'></span></td>
<td>{% trans "Commit Hash" %}</td>
<td><a href="https://github.com/inventree/InvenTree/commit/{% inventree_commit_hash %}">{% inventree_commit_hash %}</a></td>
<td>{% trans "Commit Hash" %}</td><td>{{ hash }}</td>
</tr>
{% endif %}
{% inventree_commit_date as commit_date %}
{% if commit_date %}
<tr>
<td><span class='fas fa-calendar-alt'></span></td>
<td>{% trans "Commit Date" %}</td>
<td>{% inventree_commit_date %}</td>
<td>{% trans "Commit Date" %}</td><td>{{ commit_date }}</td>
</tr>
{% endif %}
<tr>
<td><span class='fas fa-book'></span></td>
<td>{% trans "InvenTree Documentation" %}</td>
@ -74,4 +78,4 @@
</div>
</div>
</div>
</div>
</div>