hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-19 07:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-2665_PRod_video_tools_use_preview_ratio_instead_of_document_ratio

Browse Source
This commit is contained in:
Nicolas Maillat
2019-07-22 20:52:48 +02:00
committed by GitHub
parent 1bc208469f c26942a3a5
commit a44ea3dfff
4 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Core/Version.php
View File

@@ -16,7 +16,7 @@ class Version
/** /**
* @var string * @var string
*/ */
private $number = '4.1.0-alpha.14a'; private $number = '4.1.0-alpha.15a';
/** /**
* @var string * @var string

21
lib/conf.d/bases_structure.xml
View File

@@ -1278,6 +1278,27 @@
<field>id</field> <field>id</field>
</fields> </fields>
</index> </index>
<index>
<name>usr_id</name>
<type>INDEX</type>
<fields>
<field>usr_id</field>
</fields>
</index>
<index>
<name>unread</name>
<type>INDEX</type>
<fields>
<field>unread</field>
</fields>
</index>
<index>
<name>created_on</name>
<type>INDEX</type>
<fields>
<field>created_on</field>
</fields>
</index>
</indexes> </indexes>
<engine>InnoDB</engine> <engine>InnoDB</engine>
</table> </table>

2
templates/web/common/index_bootstrap.html.twig
View File

@@ -32,7 +32,7 @@
<script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui.js"></script> <script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui.js"></script>
{% endblock %} {% endblock %}
</head> </head>
<body class="PNB {{ cssfile }}"> <body class="PNB">
<div id="mainContainer" class="PNB"> <div id="mainContainer" class="PNB">
{% include 'common/menubar.html.twig' %} {% include 'common/menubar.html.twig' %}
<div class="PNB" id="mainContent" style="overflow: auto"> <div class="PNB" id="mainContent" style="overflow: auto">

2
templates/web/prod/index.html.twig
View File

@@ -146,7 +146,7 @@
$(document).ready(function(){ $(document).ready(function(){
prodApp.appEvents.emit('workzone.doRemoveWarning', "{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), "warning_on_delete_story") %}true{% else %}false{% endif %}"); prodApp.appEvents.emit('workzone.doRemoveWarning', "{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), "warning_on_delete_story") %}true{% else %}false{% endif %}");
prodApp.appEvents.emit('search.updateFacetData'); prodApp.appEvents.emit('search.updateFacetData');
$('body').addClass('{{ cssfile }}');
}); });
</script> </script>