diff --git a/Dockerfile b/Dockerfile
index 13daa50724..e900d1aea4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,6 +34,12 @@ RUN apt-get update \
unoconv \
unzip \
xpdf \
+ libreoffice-base-core \
+ libreoffice-impress \
+ libreoffice-calc \
+ libreoffice-math \
+ libreoffice-writer \
+ libreoffice-pdfimport \
&& update-locale "LANG=fr_FR.UTF-8 UTF-8" \
&& dpkg-reconfigure --frontend noninteractive locales \
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php
index c029f2be01..a4971ffaf1 100644
--- a/lib/Alchemy/Phrasea/Core/Version.php
+++ b/lib/Alchemy/Phrasea/Core/Version.php
@@ -17,7 +17,7 @@ class Version
* @var string
*/
- private $number = '4.1.0-alpha.23a';
+ private $number = '4.1.0-alpha.25a';
/**
* @var string
diff --git a/lib/classes/patch/410alpha25a.php b/lib/classes/patch/410alpha25a.php
new file mode 100644
index 0000000000..35b1c5a5d0
--- /dev/null
+++ b/lib/classes/patch/410alpha25a.php
@@ -0,0 +1,82 @@
+release;
+ }
+ /**
+ * {@inheritdoc}
+ */
+ public function concern()
+ {
+ return $this->concern;
+ }
+ /**
+ * {@inheritdoc}
+ */
+ public function require_all_upgrades()
+ {
+ return false;
+ }
+ /**
+ * {@inheritdoc}
+ */
+ public function getDoctrineMigrations()
+ {
+ return [];
+ }
+ /**
+ * {@inheritdoc}
+ */
+ public function apply(base $appbox, Application $app)
+ {
+ /** @var PropertyAccess $conf */
+ $conf = $app['conf'];
+ $oldOptions = $conf->get(['main', 'search-engine', 'options'], []);
+ $newOptions = [];
+ $facets = [];
+ // preserve former settings from conf (tech facets)
+ foreach($oldOptions as $k=>$v) {
+ if(substr($k, -16) === '_aggregate_limit') {
+ // this option is moved under "facets"
+ $k = substr($k, 0, strlen($k)-16); // keep field name
+ $facets['_'.$k] = ['limit' => $v];
+ }
+ else {
+ $newOptions[$k] = $v;
+ }
+ }
+ // add facets for fields
+ foreach($app->getDataboxes() as $databox) {
+ foreach($databox->get_meta_structure() as $field) {
+ $facets[$field->get_name()] = ['limit' => $field->getFacetValuesLimit()];
+ }
+ }
+ // facets in the end of settings
+ $newOptions['facets'] = $facets;
+ $conf->set(['main', 'search-engine', 'options'], $newOptions);
+
+ return true;
+ }
+}
diff --git a/lib/conf.d/bases_structure.xml b/lib/conf.d/bases_structure.xml
index 8cfcd692fd..d1cf4689ac 100644
--- a/lib/conf.d/bases_structure.xml
+++ b/lib/conf.d/bases_structure.xml
@@ -1328,7 +1328,7 @@
host
- char(64)
+ char(255)
@@ -1403,7 +1403,7 @@
label_en
- char(50)
+ char(128)YES
@@ -1411,7 +1411,7 @@
label_fr
- char(50)
+ char(128)YES
@@ -1419,7 +1419,7 @@
label_de
- char(50)
+ char(128)YES
@@ -1427,7 +1427,7 @@
label_nl
- char(50)
+ char(128)YES
diff --git a/package.json b/package.json
index 2d92d90040..70d1fbaddb 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0",
"npm": "^6.0.0",
"npm-modernizr": "^2.8.3",
- "phraseanet-production-client": "0.34.146-d",
+ "phraseanet-production-client": "0.34.149-d",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",
diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf
index 96fff7f659..6d303f8141 100644
--- a/resources/locales/messages.de.xlf
+++ b/resources/locales/messages.de.xlf
@@ -1,6 +1,6 @@
-
+ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
@@ -4905,7 +4905,7 @@
web/account/account.html.twigweb/lightbox/index.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigPar %author%
@@ -6602,7 +6602,7 @@
The URL you used is out of date, please loginDie URL, die Sie benutzt haben, ist nicht mehr gültig. Bitte loggen Sie sich ein
- Phrasea/ControllerProvider/Lightbox.php
+ Phrasea/ControllerProvider/Lightbox.phpThe Youtube servers have received too many calls from the same caller in a short amount of time.
@@ -7337,7 +7337,7 @@
mobile/lightbox/index.html.twigweb/lightbox/index.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigValidations received
@@ -7841,7 +7841,7 @@
You have to give your feedback at least on one document to send a reportSie müssen Ihr Feedback mindestens an einem Dokument geben, um einen Bericht zu senden
- Phrasea/Controller/LightboxController.php
+ Phrasea/Controller/LightboxController.phpYou have to wait for an administrator approval for your access request
@@ -8023,7 +8023,7 @@
web/lightbox/feed.html.twiglightbox/IE6/feed.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigaction : outils
@@ -9431,7 +9431,7 @@
web/lightbox/feed.html.twiglightbox/IE6/feed.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigboutton::tester
@@ -10121,7 +10121,7 @@
Übersichtmobile/lightbox/validate.html.twigweb/lightbox/agreement_box.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twiglightbox::see_less_basket
@@ -10133,6 +10133,48 @@
lightbox::see_more_basketweb/lightbox/index.html.twig
+
+ lightbox:feedback:sendreport:warnwindows:cancel
+ lightbox:feedback:sendreport:warnwindows:cancel
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:message
+ lightbox:feedback:sendreport:warnwindows:message
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:record_approved
+ lightbox:feedback:sendreport:warnwindows:record_approved
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:record_rejected
+ lightbox:feedback:sendreport:warnwindows:record_rejected
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:record_unexpressed
+ lightbox:feedback:sendreport:warnwindows:record_unexpressed
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:title
+ lightbox:feedback:sendreport:warnwindows:title
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:validate
+ lightbox:feedback:sendreport:warnwindows:validate
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+ login:: Changer mon adresse emailmeine E-Mail Adresse ändern
diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf
index c93ab68f91..a5ab91f476 100644
--- a/resources/locales/messages.en.xlf
+++ b/resources/locales/messages.en.xlf
@@ -1,6 +1,6 @@
-
+ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
@@ -4908,7 +4908,7 @@
web/account/account.html.twigweb/lightbox/index.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigPar %author%
@@ -6605,7 +6605,7 @@
The URL you used is out of date, please loginThe URL you used is out of date. Please login.
- Phrasea/ControllerProvider/Lightbox.php
+ Phrasea/ControllerProvider/Lightbox.phpThe Youtube servers have received too many calls from the same caller in a short amount of time.
@@ -7340,7 +7340,7 @@
mobile/lightbox/index.html.twigweb/lightbox/index.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigValidations received
@@ -7844,7 +7844,7 @@
You have to give your feedback at least on one document to send a reportYou have to give at least one document feedback to send a report
- Phrasea/Controller/LightboxController.php
+ Phrasea/Controller/LightboxController.phpYou have to wait for an administrator approval for your access request
@@ -8026,7 +8026,7 @@
web/lightbox/feed.html.twiglightbox/IE6/feed.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigaction : outils
@@ -9434,7 +9434,7 @@
web/lightbox/feed.html.twiglightbox/IE6/feed.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigboutton::tester
@@ -10124,7 +10124,7 @@
Summarymobile/lightbox/validate.html.twigweb/lightbox/agreement_box.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twiglightbox::see_less_basket
@@ -10136,6 +10136,48 @@
See more basketsweb/lightbox/index.html.twig
+
+ lightbox:feedback:sendreport:warnwindows:cancel
+ lightbox:feedback:sendreport:warnwindows:cancel
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:message
+ lightbox:feedback:sendreport:warnwindows:message
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:record_approved
+ lightbox:feedback:sendreport:warnwindows:record_approved
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:record_rejected
+ lightbox:feedback:sendreport:warnwindows:record_rejected
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:record_unexpressed
+ lightbox:feedback:sendreport:warnwindows:record_unexpressed
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:title
+ lightbox:feedback:sendreport:warnwindows:title
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:validate
+ lightbox:feedback:sendreport:warnwindows:validate
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+ login:: Changer mon adresse emailChange my e-mail
diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf
index 7df3cacb5d..3ae907a829 100644
--- a/resources/locales/messages.fr.xlf
+++ b/resources/locales/messages.fr.xlf
@@ -1,6 +1,6 @@
-
+ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
@@ -4905,7 +4905,7 @@
web/account/account.html.twigweb/lightbox/index.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigPar %author%
@@ -6604,7 +6604,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
The URL you used is out of date, please loginL'URL utilisée est périmé. Veuillez vous identifier.
- Phrasea/ControllerProvider/Lightbox.php
+ Phrasea/ControllerProvider/Lightbox.phpThe Youtube servers have received too many calls from the same caller in a short amount of time.
@@ -7339,7 +7339,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
mobile/lightbox/index.html.twigweb/lightbox/index.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigValidations received
@@ -7843,7 +7843,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
You have to give your feedback at least on one document to send a reportVous devez donner au moins un avis pour envoyer un report
- Phrasea/Controller/LightboxController.php
+ Phrasea/Controller/LightboxController.phpYou have to wait for an administrator approval for your access request
@@ -8025,7 +8025,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
web/lightbox/feed.html.twiglightbox/IE6/feed.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigaction : outils
@@ -9434,7 +9434,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
web/lightbox/feed.html.twiglightbox/IE6/feed.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigboutton::tester
@@ -10124,7 +10124,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
Récapitulatifmobile/lightbox/validate.html.twigweb/lightbox/agreement_box.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twiglightbox::see_less_basket
@@ -10136,6 +10136,48 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
Voir plus de paniersweb/lightbox/index.html.twig
+
+ lightbox:feedback:sendreport:warnwindows:cancel
+ lightbox:feedback:sendreport:warnwindows:cancel
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:message
+ lightbox:feedback:sendreport:warnwindows:message
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:record_approved
+ lightbox:feedback:sendreport:warnwindows:record_approved
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:record_rejected
+ lightbox:feedback:sendreport:warnwindows:record_rejected
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:record_unexpressed
+ lightbox:feedback:sendreport:warnwindows:record_unexpressed
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:title
+ lightbox:feedback:sendreport:warnwindows:title
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:validate
+ lightbox:feedback:sendreport:warnwindows:validate
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+ login:: Changer mon adresse emailChanger mon adresse e-mail
diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf
index 939d51832c..933082ae1a 100644
--- a/resources/locales/messages.nl.xlf
+++ b/resources/locales/messages.nl.xlf
@@ -1,6 +1,6 @@
-
+ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
@@ -4915,7 +4915,7 @@
web/account/account.html.twigweb/lightbox/index.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigPar %author%
@@ -6612,7 +6612,7 @@
The URL you used is out of date, please loginDe gebruikte URL is niet meer geldig, gelieve u aan te melden
- Phrasea/ControllerProvider/Lightbox.php
+ Phrasea/ControllerProvider/Lightbox.phpThe Youtube servers have received too many calls from the same caller in a short amount of time.
@@ -7347,7 +7347,7 @@
mobile/lightbox/index.html.twigweb/lightbox/index.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigValidations received
@@ -7851,7 +7851,7 @@
You have to give your feedback at least on one document to send a reportU moet op tenminste één document feedback geven om een rapport te versturen
- Phrasea/Controller/LightboxController.php
+ Phrasea/Controller/LightboxController.phpYou have to wait for an administrator approval for your access request
@@ -8033,7 +8033,7 @@
web/lightbox/feed.html.twiglightbox/IE6/feed.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigaction : outils
@@ -9441,7 +9441,7 @@
web/lightbox/feed.html.twiglightbox/IE6/feed.html.twiglightbox/IE6/validate.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twigboutton::tester
@@ -10131,7 +10131,7 @@
Beknoptmobile/lightbox/validate.html.twigweb/lightbox/agreement_box.html.twig
- web/lightbox/validate.html.twig
+ web/lightbox/validate.html.twiglightbox::see_less_basket
@@ -10143,6 +10143,48 @@
lightbox::see_more_basketweb/lightbox/index.html.twig
+
+ lightbox:feedback:sendreport:warnwindows:cancel
+ lightbox:feedback:sendreport:warnwindows:cancel
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:message
+ lightbox:feedback:sendreport:warnwindows:message
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:record_approved
+ lightbox:feedback:sendreport:warnwindows:record_approved
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:record_rejected
+ lightbox:feedback:sendreport:warnwindows:record_rejected
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:record_unexpressed
+ lightbox:feedback:sendreport:warnwindows:record_unexpressed
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:title
+ lightbox:feedback:sendreport:warnwindows:title
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+
+
+ lightbox:feedback:sendreport:warnwindows:validate
+ lightbox:feedback:sendreport:warnwindows:validate
+ mobile/lightbox/validate.html.twig
+ web/lightbox/validate.html.twig
+ login:: Changer mon adresse emailVerander mijn email adres
diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf
index 11948e705f..33596e5930 100644
--- a/resources/locales/validators.de.xlf
+++ b/resources/locales/validators.de.xlf
@@ -1,6 +1,6 @@
-
+ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf
index 183d040a1a..c0a4fb87ee 100644
--- a/resources/locales/validators.en.xlf
+++ b/resources/locales/validators.en.xlf
@@ -1,6 +1,6 @@
-
+ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf
index b97301f6e4..2dc9b0935b 100644
--- a/resources/locales/validators.fr.xlf
+++ b/resources/locales/validators.fr.xlf
@@ -1,6 +1,6 @@
-
+ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf
index ba3aa9800a..722071bff5 100644
--- a/resources/locales/validators.nl.xlf
+++ b/resources/locales/validators.nl.xlf
@@ -1,6 +1,6 @@
-
+ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
diff --git a/resources/www/lightbox/styles/main-mobile.scss b/resources/www/lightbox/styles/main-mobile.scss
index e9ff61aa43..bc34f81762 100644
--- a/resources/www/lightbox/styles/main-mobile.scss
+++ b/resources/www/lightbox/styles/main-mobile.scss
@@ -543,6 +543,23 @@ hr {
padding: 0 20px;
}
+.modal-footer .btn-primary {
+ color: #fff!important;
+ background-color: #007bff!important;
+ border-color: #007bff!important;
+}
+.modal-header .close {
+ display: inline-block;
+ float: right;
+ width: 25px;
+ opacity: 1;
+ background: #e1e1e1;
+}
+
+.hide {
+ display: none;
+}
+
button.confirm_report {
background: #38c !important;
color: #fff !important;
diff --git a/templates/mobile/common/menubar.html.twig b/templates/mobile/common/menubar.html.twig
index d8190dd5fa..b6e0101500 100644
--- a/templates/mobile/common/menubar.html.twig
+++ b/templates/mobile/common/menubar.html.twig
@@ -13,5 +13,7 @@
{% endif %}
+
+
{% endif %}
diff --git a/templates/mobile/lightbox/index.html.twig b/templates/mobile/lightbox/index.html.twig
index 67f698664f..6bb64d68db 100644
--- a/templates/mobile/lightbox/index.html.twig
+++ b/templates/mobile/lightbox/index.html.twig
@@ -4,10 +4,12 @@
{# #}
+
{% endblock %}
{% block stylesheet %}
+
{% endblock %}
{% block icon %}
@@ -62,7 +64,6 @@
-
{{ 'Back' | trans }}
@@ -99,6 +100,7 @@
{{ 'Validations' | trans }}
{{_self.valid_baskets_length(baskets_collection)}}
+