composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 23:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source 
# Conflicts:
#	.doc/itop-version-history.md
This commit is contained in:
Molkobain
2024-06-28 15:08:31 +02:00
parent 012d5e7ae0 0f213b08a6
commit 5334bbb303
18 changed files with 152 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
datamodels/2.x/itop-core-update/templates/SelectUpdateFile.html.twig
View File

@@ -4,9 +4,7 @@
{% UIContentBlock Standard {'aContainerClasses':['ibo-update-core']} %}
{% UITitle ForPage {'sTitle':'iTopUpdate:UI:PageTitle'|dict_s} %}{% EndUITitle %}
<div class="ibo-v-spacer">&nbsp;</div>
{% UIPanel Neutral {sTitle:'iTopUpdate:UI:PageTitle'|dict_s} %}
{% UIContentBlock Standard {'aContainerClasses': ['display_block', 'display-files']} %}
{% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:Status'|dict_s} %}
@@ -101,5 +99,7 @@
{% EndUIContentBlock %}
{% EndUIPanel %}
{% EndUIContentBlock %}
{% endapply %}