Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query

This commit is contained in:
Harrys
2019-03-01 09:20:49 +04:00
5 changed files with 26 additions and 24 deletions

4
Vagrantfile vendored
View File

@@ -35,7 +35,7 @@ else if which('ifconfig')
end end
$php = [ "5.6", "7.0", "7.1", "7.2" ] $php = [ "5.6", "7.0", "7.1", "7.2" ]
$phpVersion = ENV['phpversion'] ? ENV['phpversion'] : "5.6"; $phpVersion = ENV['phpversion'] ? ENV['phpversion'] : "7.0";
unless Vagrant.has_plugin?('vagrant-hostmanager') unless Vagrant.has_plugin?('vagrant-hostmanager')
raise "vagrant-hostmanager is not installed! Please run\n vagrant plugin install vagrant-hostmanager\n\n" raise "vagrant-hostmanager is not installed! Please run\n vagrant plugin install vagrant-hostmanager\n\n"
@@ -166,4 +166,4 @@ Vagrant.configure("2") do |config|
config.vm.synced_folder "./", "/vagrant" config.vm.synced_folder "./", "/vagrant"
end end
end end

12
composer.lock generated
View File

@@ -131,16 +131,16 @@
}, },
{ {
"name": "alchemy/embed-bundle", "name": "alchemy/embed-bundle",
"version": "0.3.7", "version": "0.3.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/alchemy-fr/embed-bundle.git", "url": "https://github.com/alchemy-fr/embed-bundle.git",
"reference": "ce7408c7a47387eed3df2a743577d6e0e25f991f" "reference": "8a9699bc51e2b2997ccfd357bb2892f3702c33ef"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/ce7408c7a47387eed3df2a743577d6e0e25f991f", "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/8a9699bc51e2b2997ccfd357bb2892f3702c33ef",
"reference": "ce7408c7a47387eed3df2a743577d6e0e25f991f", "reference": "8a9699bc51e2b2997ccfd357bb2892f3702c33ef",
"shasum": "" "shasum": ""
}, },
"require-dev": { "require-dev": {
@@ -178,10 +178,10 @@
], ],
"description": "Embed resources bundle", "description": "Embed resources bundle",
"support": { "support": {
"source": "https://github.com/alchemy-fr/embed-bundle/tree/0.3.7", "source": "https://github.com/alchemy-fr/embed-bundle/tree/0.3.8",
"issues": "https://github.com/alchemy-fr/embed-bundle/issues" "issues": "https://github.com/alchemy-fr/embed-bundle/issues"
}, },
"time": "2017-05-30T13:18:21+00:00" "time": "2019-01-11T10:35:41+00:00"
}, },
{ {
"name": "alchemy/geonames-api-consumer", "name": "alchemy/geonames-api-consumer",

View File

@@ -89,6 +89,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
const TYPE_AUDIO_MP3 = 'AUDIO_MP3'; const TYPE_AUDIO_MP3 = 'AUDIO_MP3';
const TYPE_IMAGE = 'IMAGE'; const TYPE_IMAGE = 'IMAGE';
const TYPE_NO_PLAYER = 'UNKNOWN'; const TYPE_NO_PLAYER = 'UNKNOWN';
const TYPE_PDF = 'PDF';
/* /*
* Technical datas types constants * Technical datas types constants
@@ -407,6 +408,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
{ {
static $types = [ static $types = [
'application/x-shockwave-flash' => self::TYPE_FLEXPAPER, 'application/x-shockwave-flash' => self::TYPE_FLEXPAPER,
'application/pdf' => self::TYPE_PDF,
'audio/mp3' => self::TYPE_AUDIO_MP3, 'audio/mp3' => self::TYPE_AUDIO_MP3,
'audio/mpeg' => self::TYPE_AUDIO_MP3, 'audio/mpeg' => self::TYPE_AUDIO_MP3,
'image/gif' => self::TYPE_IMAGE, 'image/gif' => self::TYPE_IMAGE,

View File

@@ -577,9 +577,9 @@
<target state="translated">Accès aux sous résolutions</target> <target state="translated">Accès aux sous résolutions</target>
<jms:reference-file line="351">web/admin/editusers.html.twig</jms:reference-file> <jms:reference-file line="351">web/admin/editusers.html.twig</jms:reference-file>
</trans-unit> </trans-unit>
<trans-unit id="322d1ea01506ec9e0344d8cd25dd10808d427343" resname="Access to the above bases constitutes acceptance of the following Terms of Use (TOU)." approved="yes"> <trans-unit id="322d1ea01506ec9e0344d8cd25dd10808d427343" resname="Access to the above bases constitutes acceptance of the following Terms of Use (TOU)." approved="no">
<source>Access to the above bases constitutes acceptance of the following Terms of Use (TOU).</source> <source>Access to the above bases constitutes acceptance of the following Terms of Use (TOU).</source>
<target state="translated">Pour accéder aux bases ci-dessus, vous devez d'abord accepter les conditions générales d'utilisation.</target> <target state="needs-translation">L'accès aux ressources de cette base implique l'acceptation des Conditions générales d'utilisation suivantes :</target>
<jms:reference-file line="19">web/account/access.html.twig</jms:reference-file> <jms:reference-file line="19">web/account/access.html.twig</jms:reference-file>
</trans-unit> </trans-unit>
<trans-unit id="9db7fb32c517586a4123d511613b492d910aecaa" resname="Access user have readonly access" approved="yes"> <trans-unit id="9db7fb32c517586a4123d511613b492d910aecaa" resname="Access user have readonly access" approved="yes">
@@ -636,7 +636,7 @@
</trans-unit> </trans-unit>
<trans-unit id="c4a4f00323184bd750ee72b5c05e6e17d1584bfd" resname="Activate highlight" approved="yes"> <trans-unit id="c4a4f00323184bd750ee72b5c05e6e17d1584bfd" resname="Activate highlight" approved="yes">
<source>Activate highlight</source> <source>Activate highlight</source>
<target state="translated">Activer le surlignage</target> <target state="translated">Activer le surlignage (beta). Impacte les performances de recherche</target>
<jms:reference-file line="90">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file> <jms:reference-file line="90">SearchEngine/Elastic/ElasticsearchSettingsFormType.php</jms:reference-file>
<jms:reference-file line="682">web/setup/step2.html.twig</jms:reference-file> <jms:reference-file line="682">web/setup/step2.html.twig</jms:reference-file>
</trans-unit> </trans-unit>
@@ -853,9 +853,9 @@
<jms:reference-file line="229">actions/Feedback/list.html.twig</jms:reference-file> <jms:reference-file line="229">actions/Feedback/list.html.twig</jms:reference-file>
<jms:reference-file line="239">actions/Feedback/list.html.twig</jms:reference-file> <jms:reference-file line="239">actions/Feedback/list.html.twig</jms:reference-file>
</trans-unit> </trans-unit>
<trans-unit id="cff1e86ef3cd4771d8b9a289d1e75a465d5b48a7" resname="All these conditions"> <trans-unit id="cff1e86ef3cd4771d8b9a289d1e75a465d5b48a7" resname="All these conditions" approved="yes">
<source>All these conditions</source> <source>All these conditions</source>
<target state="new">All these conditions</target> <target state="translated">Toutes les conditions</target>
<jms:reference-file line="398">web/prod/index.html.twig</jms:reference-file> <jms:reference-file line="398">web/prod/index.html.twig</jms:reference-file>
</trans-unit> </trans-unit>
<trans-unit id="4f5920cee28837f31429fd82f7bc5a335272a436" resname="All values" approved="yes"> <trans-unit id="4f5920cee28837f31429fd82f7bc5a335272a436" resname="All values" approved="yes">
@@ -1315,9 +1315,9 @@
<target state="translated">OBSOLETE Autoriser *Phraseanet Navigator*</target> <target state="translated">OBSOLETE Autoriser *Phraseanet Navigator*</target>
<jms:reference-file line="27">Form/Configuration/APIClientsFormType.php</jms:reference-file> <jms:reference-file line="27">Form/Configuration/APIClientsFormType.php</jms:reference-file>
</trans-unit> </trans-unit>
<trans-unit id="b85de40822e66ce4309b94ccad5bb731f2a89373" resname="Authorize Adobe cc Plugin to connect."> <trans-unit id="b85de40822e66ce4309b94ccad5bb731f2a89373" resname="Authorize Adobe cc Plugin to connect." approved="yes">
<source>Authorize Adobe cc Plugin to connect.</source> <source>Authorize Adobe cc Plugin to connect.</source>
<target state="new">Authorize Adobe cc Plugin to connect.</target> <target state="translated">Autoriser la connexion du plugin Adobe CC</target>
<jms:reference-file line="36">Form/Configuration/APIClientsFormType.php</jms:reference-file> <jms:reference-file line="36">Form/Configuration/APIClientsFormType.php</jms:reference-file>
</trans-unit> </trans-unit>
<trans-unit id="6e1ead524b95ba3b45281df7ba45d2addbbf1a79" resname="Authorize Microsoft Office Plugin to connect." approved="yes"> <trans-unit id="6e1ead524b95ba3b45281df7ba45d2addbbf1a79" resname="Authorize Microsoft Office Plugin to connect." approved="yes">
@@ -1939,9 +1939,9 @@
<target state="translated">Consulter en ligne les prérequis et la configuration du serveur Web</target> <target state="translated">Consulter en ligne les prérequis et la configuration du serveur Web</target>
<jms:reference-file line="311">web/setup/step2.html.twig</jms:reference-file> <jms:reference-file line="311">web/setup/step2.html.twig</jms:reference-file>
</trans-unit> </trans-unit>
<trans-unit id="33e15d008d511f3101566a2e25203ef2a3f605a0" resname="Contains"> <trans-unit id="33e15d008d511f3101566a2e25203ef2a3f605a0" resname="Contains" approved="yes">
<source>Contains</source> <source>Contains</source>
<target state="new">Contains</target> <target state="translated">Contient</target>
<jms:reference-file line="417">web/prod/index.html.twig</jms:reference-file> <jms:reference-file line="417">web/prod/index.html.twig</jms:reference-file>
</trans-unit> </trans-unit>
<trans-unit id="34326e71e2592544dedcb84077a6317dc5a5e700" resname="Continuer ?" approved="yes"> <trans-unit id="34326e71e2592544dedcb84077a6317dc5a5e700" resname="Continuer ?" approved="yes">
@@ -5912,9 +5912,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
<target state="translated">Voir les résultats de la demande de validation</target> <target state="translated">Voir les résultats de la demande de validation</target>
<jms:reference-file line="81">Notification/Mail/MailInfoValidationDone.php</jms:reference-file> <jms:reference-file line="81">Notification/Mail/MailInfoValidationDone.php</jms:reference-file>
</trans-unit> </trans-unit>
<trans-unit id="fd6294adde442e65458da9640beeafed76f7f66a" resname="Select a field"> <trans-unit id="fd6294adde442e65458da9640beeafed76f7f66a" resname="Select a field" approved="yes">
<source>Select a field</source> <source>Select a field</source>
<target state="new">Select a field</target> <target state="translated">Choisir un champ</target>
<jms:reference-file line="409">web/prod/index.html.twig</jms:reference-file> <jms:reference-file line="409">web/prod/index.html.twig</jms:reference-file>
</trans-unit> </trans-unit>
<trans-unit id="68679be6d90db68ca5ceebaded92d5d83de8761c" resname="Select a list on the left and edit it !" approved="yes"> <trans-unit id="68679be6d90db68ca5ceebaded92d5d83de8761c" resname="Select a list on the left and edit it !" approved="yes">
@@ -7196,9 +7196,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
<target state="translated">Suggestion d'utilisateurs</target> <target state="translated">Suggestion d'utilisateurs</target>
<jms:reference-file line="149">prod/actions/Push.html.twig</jms:reference-file> <jms:reference-file line="149">prod/actions/Push.html.twig</jms:reference-file>
</trans-unit> </trans-unit>
<trans-unit id="a56fad2f92979e0171b42bbc51ff5657d17ceb91" resname="Utilisation prevue:"> <trans-unit id="a56fad2f92979e0171b42bbc51ff5657d17ceb91" resname="Utilisation prevue:" approved="yes">
<source>Utilisation prevue:</source> <source>Utilisation prevue:</source>
<target state="needs-translation">Utilisation prévue:</target> <target state="translated">Utilisation prévue :</target>
<jms:reference-file line="250">prod/orders/order_item.html.twig</jms:reference-file> <jms:reference-file line="250">prod/orders/order_item.html.twig</jms:reference-file>
</trans-unit> </trans-unit>
<trans-unit id="3b3e9155f69edf73caab337bf5f64231188b1e48" resname="VALIDATION" approved="yes"> <trans-unit id="3b3e9155f69edf73caab337bf5f64231188b1e48" resname="VALIDATION" approved="yes">
@@ -10984,9 +10984,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<target state="translated">Vous ne possédez pas les autorisations d'accès requises sur les documents pour effectuer cette action.</target> <target state="translated">Vous ne possédez pas les autorisations d'accès requises sur les documents pour effectuer cette action.</target>
<jms:reference-file line="35">Controller/Prod/MoveCollectionController.php</jms:reference-file> <jms:reference-file line="35">Controller/Prod/MoveCollectionController.php</jms:reference-file>
</trans-unit> </trans-unit>
<trans-unit id="ef27ad74061e0e15683e84dec7f5559f7797637f" resname="prod::advancesearch:tooltips:datefield_restriction_explanation"> <trans-unit id="ef27ad74061e0e15683e84dec7f5559f7797637f" resname="prod::advancesearch:tooltips:datefield_restriction_explanation" approved="no">
<source>prod::advancesearch:tooltips:datefield_restriction_explanation</source> <source>prod::advancesearch:tooltips:datefield_restriction_explanation</source>
<target state="new">prod::advancesearch:tooltips:datefield_restriction_explanation</target> <target state="needs-translation">Limiter l'affichage des résultats à des dates</target>
<jms:reference-file line="447">web/prod/index.html.twig</jms:reference-file> <jms:reference-file line="447">web/prod/index.html.twig</jms:reference-file>
</trans-unit> </trans-unit>
<trans-unit id="fa55093d5fb1dfe235a46f8b4fecad5d36d3f250" resname="prod::advancesearch:tooltips:field_restriction_explanation"> <trans-unit id="fa55093d5fb1dfe235a46f8b4fecad5d36d3f250" resname="prod::advancesearch:tooltips:field_restriction_explanation">

View File

@@ -19,7 +19,7 @@
src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}" src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
frameborder="0" allowfullscreen></iframe> frameborder="0" allowfullscreen></iframe>
</div> </div>
{% elseif record_type == 'FLEXPAPER' %} {% elseif record_type == 'FLEXPAPER' or record_type == 'PDF' %}
<div id="phraseanet-embed-frame" class="documentTips" <div id="phraseanet-embed-frame" class="documentTips"
data-original-width="{{original_w}}" data-original-width="{{original_w}}"
data-original-height="{{original_h}}" data-original-height="{{original_h}}"