Skip to content

Commit 8865e50

Browse files
author
roadiz-ci
committed
chore: updated branch-alias
1 parent b75cb2b commit 8865e50

19 files changed

Lines changed: 58 additions & 106 deletions

‎composer.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
}
1717
],
1818
"type": "symfony-bundle",
19-
"minimum-stability": "dev",
2019
"prefer-stable": true,
2120
"require": {
2221
"php": ">=8.3",
23-
"roadiz/core-bundle": "2.6.x-dev",
24-
"roadiz/openid": "2.6.x-dev",
22+
"roadiz/core-bundle": "2.6.*",
23+
"roadiz/openid": "2.6.*",
2524
"symfony/framework-bundle": "7.3.*"
2625
},
2726
"require-dev": {
@@ -50,8 +49,8 @@
5049
},
5150
"extra": {
5251
"branch-alias": {
53-
"dev-main": "2.5.x-dev",
54-
"dev-develop": "2.6.x-dev"
52+
"dev-main": "2.6.x-dev",
53+
"dev-develop": "2.7.x-dev"
5554
}
5655
},
5756
"scripts": {

‎templates/node-types-decorators/row.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<td class="mobile-hidden">{{ field }}</td>
1212
<td class="mobile-hidden">{{ ("nodeTypeDecorator.property." ~ item.property.value)|trans() }}</td>
1313
<td class="mobile-hidden">
14-
{% if item.property.value == 'field_universal' or item.property.value == 'field_visible' %}
14+
{% if item.property.value == 'field_universal' or item.property.value == 'field_visible' or item.property.value == 'highlighted' %}
1515
{% if item.value == true %}
1616
<div class="uk-button-status uk-button-check" >
1717
<i class="uk-icon-check"></i>

‎templates/panels/user_panel.html.twig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@
9292
{% if app.debug %}
9393
<p class="dev-mode"><i class="uk-icon-rz-devmode"></i> {% trans %}dev_mode.activated{% endtrans %}</p>
9494
{% endif %}
95-
{% if bags.settings.get('maintenance_mode') %}
96-
<p class="dev-mode"><i class="uk-icon-exclamation-triangle"></i> {% trans %}maintenance_mode.activated{% endtrans %}</p>
97-
{% endif %}
9895
</div>
9996
<footer id="cms-version">
10097
{% if help_external_url is defined and help_external_url %}

‎translations/rozier/messages.en.xlf‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,11 +1191,6 @@
11911191
<source>dev_mode.activated</source>
11921192
<target state="final">Dev mode On</target>
11931193
</trans-unit>
1194-
<trans-unit xml:space="preserve" id="maintenance_mode.activated" approved="yes">
1195-
<source>maintenance_mode.activated</source>
1196-
<target state="final">Maintenance mode On</target>
1197-
<note>Message to notify that site is under maintenance.</note>
1198-
</trans-unit>
11991194
<trans-unit xml:space="preserve" id="300" approved="yes">
12001195
<source>help</source>
12011196
<target state="final">Help</target>
@@ -1949,10 +1944,6 @@
19491944
<source>site_copyright</source>
19501945
<target state="final">Website author name</target>
19511946
</trans-unit>
1952-
<trans-unit xml:space="preserve" id="maintenance_mode" approved="yes">
1953-
<source>maintenance_mode</source>
1954-
<target state="final">Maintenance mode</target>
1955-
</trans-unit>
19561947
<trans-unit xml:space="preserve" id="universal_analytics_id" approved="yes">
19571948
<source>universal_analytics_id</source>
19581949
<target state="final">Universal Analytics ID</target>
@@ -3424,10 +3415,18 @@
34243415
<source>node.tags</source>
34253416
<target state="final">Tags</target>
34263417
</trans-unit>
3418+
<trans-unit xml:space="preserve" id="node-types-decorators">
3419+
<source>node-types-decorators</source>
3420+
<target state="translated">Node-type decorators</target>
3421+
</trans-unit>
34273422
<trans-unit xml:space="preserve" id="nodeType.hiding_nodes" approved="yes">
34283423
<source>nodeType.hiding_nodes</source>
34293424
<target state="final">This type hides its node-tree</target>
34303425
</trans-unit>
3426+
<trans-unit xml:space="preserve" id="nodeType.highlighted">
3427+
<source>nodeType.highlighted</source>
3428+
<target state="translated">Highlighted</target>
3429+
</trans-unit>
34313430
<trans-unit xml:space="preserve" id="nodeType.not_visible" approved="yes">
34323431
<source>nodeType.not_visible</source>
34333432
<target state="final">Invisible node-type</target>

‎translations/rozier/messages.es.xlf‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,11 +1146,6 @@
11461146
<source>dev_mode.activated</source>
11471147
<target state="final">Modo de desarollador activado</target>
11481148
</trans-unit>
1149-
<trans-unit xml:space="preserve" id="maintenance_mode.activated" approved="yes">
1150-
<source>maintenance_mode.activated</source>
1151-
<target state="final">Modo de mantenimineto activado</target>
1152-
<note>Message to notify that site is under maintenance.</note>
1153-
</trans-unit>
11541149
<trans-unit xml:space="preserve" id="300" approved="yes">
11551150
<source>help</source>
11561151
<target state="final">Ayuda</target>
@@ -1896,10 +1891,6 @@
18961891
<source>site_copyright</source>
18971892
<target state="final">Derechos de autor de sitio web</target>
18981893
</trans-unit>
1899-
<trans-unit xml:space="preserve" id="maintenance_mode" approved="yes">
1900-
<source>maintenance_mode</source>
1901-
<target state="final">Modo de mantenimiento</target>
1902-
</trans-unit>
19031894
<trans-unit xml:space="preserve" id="universal_analytics_id" approved="yes">
19041895
<source>universal_analytics_id</source>
19051896
<target state="final">ID de análisis universal</target>

‎translations/rozier/messages.fr.xlf‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,11 +1191,6 @@
11911191
<source>dev_mode.activated</source>
11921192
<target state="final">Mode développement activé</target>
11931193
</trans-unit>
1194-
<trans-unit xml:space="preserve" id="maintenance_mode.activated" approved="yes">
1195-
<source>maintenance_mode.activated</source>
1196-
<target state="final">Mode maintenance activé</target>
1197-
<note>Message to notify that site is under maintenance.</note>
1198-
</trans-unit>
11991194
<trans-unit xml:space="preserve" id="300" approved="yes">
12001195
<source>help</source>
12011196
<target state="final">Aide</target>
@@ -1949,10 +1944,6 @@
19491944
<source>site_copyright</source>
19501945
<target state="final">Copyright du site</target>
19511946
</trans-unit>
1952-
<trans-unit xml:space="preserve" id="maintenance_mode" approved="yes">
1953-
<source>maintenance_mode</source>
1954-
<target state="final">Mode de maintenance</target>
1955-
</trans-unit>
19561947
<trans-unit xml:space="preserve" id="universal_analytics_id" approved="yes">
19571948
<source>universal_analytics_id</source>
19581949
<target state="final">Identifiant de suivi Universal Analytics</target>
@@ -3424,10 +3415,18 @@
34243415
<source>node.tags</source>
34253416
<target state="final">Étiquettes</target>
34263417
</trans-unit>
3418+
<trans-unit xml:space="preserve" id="node-types-decorators">
3419+
<source>node-types-decorators</source>
3420+
<target state="translated">Décorations de type de nœud</target>
3421+
</trans-unit>
34273422
<trans-unit xml:space="preserve" id="nodeType.hiding_nodes" approved="yes">
34283423
<source>nodeType.hiding_nodes</source>
34293424
<target state="final">Type cachant son arborescence</target>
34303425
</trans-unit>
3426+
<trans-unit xml:space="preserve" id="nodeType.highlighted">
3427+
<source>nodeType.highlighted</source>
3428+
<target state="translated">En avant</target>
3429+
</trans-unit>
34313430
<trans-unit xml:space="preserve" id="nodeType.not_visible" approved="yes">
34323431
<source>nodeType.not_visible</source>
34333432
<target state="final">Type de nœud invisible</target>

‎translations/rozier/messages.id.xlf‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,11 +1142,6 @@
11421142
<source>dev_mode.activated</source>
11431143
<target state="final">Mode dev aktif</target>
11441144
</trans-unit>
1145-
<trans-unit xml:space="preserve" id="maintenance_mode.activated" approved="yes">
1146-
<source>maintenance_mode.activated</source>
1147-
<target state="final">Mode perawatan aktif</target>
1148-
<note>Message to notify that site is under maintenance.</note>
1149-
</trans-unit>
11501145
<trans-unit xml:space="preserve" id="300" approved="yes">
11511146
<source>help</source>
11521147
<target state="final">Bantuan</target>
@@ -1884,10 +1879,6 @@
18841879
<source>site_copyright</source>
18851880
<target state="final">Nama penulis situs</target>
18861881
</trans-unit>
1887-
<trans-unit xml:space="preserve" id="maintenance_mode" approved="yes">
1888-
<source>maintenance_mode</source>
1889-
<target state="final">Mode Perawatan</target>
1890-
</trans-unit>
18911882
<trans-unit xml:space="preserve" id="universal_analytics_id" approved="yes">
18921883
<source>universal_analytics_id</source>
18931884
<target state="final">ID Universal Analisis</target>

‎translations/rozier/messages.it.xlf‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,11 +1122,6 @@
11221122
<source>dev_mode.activated</source>
11231123
<target state="final">Modalità sviluppatore attivata</target>
11241124
</trans-unit>
1125-
<trans-unit xml:space="preserve" id="maintenance_mode.activated" approved="yes">
1126-
<source>maintenance_mode.activated</source>
1127-
<target state="final">Modalità restauro attivata</target>
1128-
<note>Message to notify that site is under maintenance.</note>
1129-
</trans-unit>
11301125
<trans-unit xml:space="preserve" id="300" approved="yes">
11311126
<source>help</source>
11321127
<target state="final">Aiuto</target>
@@ -1877,10 +1872,6 @@
18771872
<source>site_copyright</source>
18781873
<target state="final">Copyright del sito</target>
18791874
</trans-unit>
1880-
<trans-unit xml:space="preserve" id="maintenance_mode" approved="yes">
1881-
<source>maintenance_mode</source>
1882-
<target state="final">Modalità di manutenzione</target>
1883-
</trans-unit>
18841875
<trans-unit xml:space="preserve" id="universal_analytics_id" approved="yes">
18851876
<source>universal_analytics_id</source>
18861877
<target state="final">Codice di tracciamento di Universal Analytics</target>

‎translations/rozier/messages.ru.xlf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,10 +1540,6 @@
15401540
<source>site_copyright</source>
15411541
<target state="final">Имя автора</target>
15421542
</trans-unit>
1543-
<trans-unit xml:space="preserve" id="maintenance_mode" approved="yes">
1544-
<source>maintenance_mode</source>
1545-
<target state="final">Режим обслуживания</target>
1546-
</trans-unit>
15471543
<trans-unit xml:space="preserve" id="universal_analytics_id" approved="yes">
15481544
<source>universal_analytics_id</source>
15491545
<target state="final">Идентификатор Universal Analytics</target>

‎translations/rozier/messages.sr.xlf‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,11 +1142,6 @@
11421142
<source>dev_mode.activated</source>
11431143
<target state="final">Укључен мод за програмере</target>
11441144
</trans-unit>
1145-
<trans-unit xml:space="preserve" id="maintenance_mode.activated" approved="yes">
1146-
<source>maintenance_mode.activated</source>
1147-
<target state="final">Укључен мод за одржавање</target>
1148-
<note>Message to notify that site is under maintenance.</note>
1149-
</trans-unit>
11501145
<trans-unit xml:space="preserve" id="300" approved="yes">
11511146
<source>help</source>
11521147
<target state="final">Помоћ</target>
@@ -1896,10 +1891,6 @@
18961891
<source>site_copyright</source>
18971892
<target state="final">Име аутора веб-сајта</target>
18981893
</trans-unit>
1899-
<trans-unit xml:space="preserve" id="maintenance_mode" approved="yes">
1900-
<source>maintenance_mode</source>
1901-
<target state="final">Мод за одржавање</target>
1902-
</trans-unit>
19031894
<trans-unit xml:space="preserve" id="universal_analytics_id" approved="yes">
19041895
<source>universal_analytics_id</source>
19051896
<target state="final">ID за Universal Analytics</target>

0 commit comments

Comments
 (0)