diff --git a/Vagrantfile b/Vagrantfile index bca737d028..4e71464ef1 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -35,7 +35,7 @@ else if which('ifconfig') end $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') 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" end -end \ No newline at end of file +end diff --git a/composer.lock b/composer.lock index be28149a9e..d9eae9b3ee 100644 --- a/composer.lock +++ b/composer.lock @@ -131,16 +131,16 @@ }, { "name": "alchemy/embed-bundle", - "version": "0.3.7", + "version": "0.3.8", "source": { "type": "git", "url": "https://github.com/alchemy-fr/embed-bundle.git", - "reference": "ce7408c7a47387eed3df2a743577d6e0e25f991f" + "reference": "8a9699bc51e2b2997ccfd357bb2892f3702c33ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/ce7408c7a47387eed3df2a743577d6e0e25f991f", - "reference": "ce7408c7a47387eed3df2a743577d6e0e25f991f", + "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/8a9699bc51e2b2997ccfd357bb2892f3702c33ef", + "reference": "8a9699bc51e2b2997ccfd357bb2892f3702c33ef", "shasum": "" }, "require-dev": { @@ -178,10 +178,10 @@ ], "description": "Embed resources bundle", "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" }, - "time": "2017-05-30T13:18:21+00:00" + "time": "2019-01-11T10:35:41+00:00" }, { "name": "alchemy/geonames-api-consumer", diff --git a/lib/classes/media/subdef.php b/lib/classes/media/subdef.php index 45eaa4cdbe..53b8b290bc 100644 --- a/lib/classes/media/subdef.php +++ b/lib/classes/media/subdef.php @@ -89,6 +89,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface const TYPE_AUDIO_MP3 = 'AUDIO_MP3'; const TYPE_IMAGE = 'IMAGE'; const TYPE_NO_PLAYER = 'UNKNOWN'; + const TYPE_PDF = 'PDF'; /* * Technical datas types constants @@ -407,6 +408,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface { static $types = [ 'application/x-shockwave-flash' => self::TYPE_FLEXPAPER, + 'application/pdf' => self::TYPE_PDF, 'audio/mp3' => self::TYPE_AUDIO_MP3, 'audio/mpeg' => self::TYPE_AUDIO_MP3, 'image/gif' => self::TYPE_IMAGE, diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index fb2161c165..b0123c405e 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -577,9 +577,9 @@ Accès aux sous résolutions web/admin/editusers.html.twig - + Access to the above bases constitutes acceptance of the following Terms of Use (TOU). - Pour accéder aux bases ci-dessus, vous devez d'abord accepter les conditions générales d'utilisation. + L'accès aux ressources de cette base implique l'acceptation des Conditions générales d'utilisation suivantes : web/account/access.html.twig @@ -636,7 +636,7 @@ Activate highlight - Activer le surlignage + Activer le surlignage (beta). Impacte les performances de recherche SearchEngine/Elastic/ElasticsearchSettingsFormType.php web/setup/step2.html.twig @@ -853,9 +853,9 @@ actions/Feedback/list.html.twig actions/Feedback/list.html.twig - + All these conditions - All these conditions + Toutes les conditions web/prod/index.html.twig @@ -1315,9 +1315,9 @@ OBSOLETE Autoriser *Phraseanet Navigator* Form/Configuration/APIClientsFormType.php - + Authorize Adobe cc Plugin to connect. - Authorize Adobe cc Plugin to connect. + Autoriser la connexion du plugin Adobe CC Form/Configuration/APIClientsFormType.php @@ -1939,9 +1939,9 @@ Consulter en ligne les prérequis et la configuration du serveur Web web/setup/step2.html.twig - + Contains - Contains + Contient web/prod/index.html.twig @@ -5912,9 +5912,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Voir les résultats de la demande de validation Notification/Mail/MailInfoValidationDone.php - + Select a field - Select a field + Choisir un champ web/prod/index.html.twig @@ -7196,9 +7196,9 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Suggestion d'utilisateurs prod/actions/Push.html.twig - + Utilisation prevue: - Utilisation prévue: + Utilisation prévue : prod/orders/order_item.html.twig @@ -10984,9 +10984,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Vous ne possédez pas les autorisations d'accès requises sur les documents pour effectuer cette action. Controller/Prod/MoveCollectionController.php - + prod::advancesearch:tooltips:datefield_restriction_explanation - prod::advancesearch:tooltips:datefield_restriction_explanation + Limiter l'affichage des résultats à des dates web/prod/index.html.twig diff --git a/templates/web/common/thumbnail.html.twig b/templates/web/common/thumbnail.html.twig index b6529ec052..45a31dfb05 100644 --- a/templates/web/common/thumbnail.html.twig +++ b/templates/web/common/thumbnail.html.twig @@ -19,7 +19,7 @@ src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}" frameborder="0" allowfullscreen> - {% elseif record_type == 'FLEXPAPER' %} + {% elseif record_type == 'FLEXPAPER' or record_type == 'PDF' %}