hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-11 18:01:10 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/openclassify/openclassify

Browse Source 
 Conflicts:
	addons/default/visiosoft/demodata-module
This commit is contained in:
Diatrex 2019-11-19 10:36:51 +03:00
commit 08a687faeb
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/default/visiosoft/advs-module/resources/views/list/map.twig
View File

@ -1,4 +1,3 @@
{% extends layout('map') %}
{% extends "visiosoft.module.advs::list/list" %}
{% block listContent %}
<div class="category-info">

2
addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig
View File

@ -49,7 +49,7 @@
<div class="panel-heading">
<a data-toggle="collapse" data-parent="#accordion" href="#accordion-three">
<h4 class="panel-title">
{{ trans('visiosoft.module.advs::fields.price.name') }}
{{ trans('visiosoft.module.advs::field.price.name') }}
<span class="pull-right"><i class="fa fa-minus"></i></span>
</h4>
</a>

1
addons/default/visiosoft/advs-module/resources/views/list/table.twig
View File

@ -1,4 +1,3 @@
{% extends layout('table') %}
{% extends "visiosoft.module.advs::list/list" %}
{% block listContent %}

2
addons/default/visiosoft/demodata-module

@ -1 +1 @@
Subproject commit 67f1869058f2a06a66d221a1795b5a2db49c2735
Subproject commit 026073c7ec0447fa505f0534df649f805d4c70f3