merge branch from master

.circleci/config.yml

@@ -123,8 +123,8 @@ workflows:
                 dockerfile: Dockerfile
                 extra-build-args: "--target phraseanet-fpm"
                 region: AWS_DEFAULT_REGION
-                repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet"
+                repo: "phraseanet-fpm"
-                tag: "alpha-0.1"
+                tag: "${CIRCLE_BRANCH}"
             - aws-ecr/build_and_push_image:
                 account-url: AWS_ACCOUNT_URL
                 aws-access-key-id: AWS_ACCESS_KEY_ID
@@ -134,8 +134,8 @@ workflows:
                 dockerfile: Dockerfile
                 extra-build-args: "--target phraseanet-nginx"
                 region: AWS_DEFAULT_REGION
-                repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet-nginx"
+                repo: "phraseanet-nginx"
-                tag: "alpha-0.1"
+                tag: "${CIRCLE_BRANCH}"
             - aws-ecr/build_and_push_image:
                 account-url: AWS_ACCOUNT_URL
                 aws-access-key-id: AWS_ACCESS_KEY_ID
@@ -145,5 +145,5 @@ workflows:
                 dockerfile: Dockerfile
                 extra-build-args: "--target phraseanet-worker"
                 region: AWS_DEFAULT_REGION
-                repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet"
+                repo: "phraseanet-worker"
-                tag: "alpha-0.1"
+                tag: "${CIRCLE_BRANCH}"

README.md

@@ -72,3 +72,7 @@ It will build and tag the following images :
     local/phraseanet-worker:<TAG>
     local/phraseanet-fpm:<TAG>
     local/phraseanet-nginx:<TAG>
+
+# Deploy the application
+
+Once the images are built, you can deploy the entire phraseanet stack using the repository : https://github.com/alchemy-fr/phraseanet-docker and follow the instruction inside its `README.md` file.

grammar/query.pp

@@ -128,7 +128,7 @@ key:
   | quoted_string()
 
 group:
-    ::space::? ::parenthese_:: primary() ::_parenthese:: ::space::?
+    ::space::? ::parenthese_:: ::space::? primary() ::space::? ::_parenthese:: ::space::?
 
 
 // Thesaurus terms

lib/conf.d/data_templates/DublinCore.xml

@@ -79,7 +79,7 @@
                 <size>748</size>
                 <mediatype>video</mediatype>
                 <writeDatas>yes</writeDatas>
-                <acodec>libfaac</acodec>
+                <acodec>libmp3lame</acodec>
                 <vcodec>libx264</vcodec>
                 <devices>screen</devices>
                 <bitrate>1000</bitrate>

lib/conf.d/data_templates/en-simple.xml

@@ -79,7 +79,7 @@
                 <size>748</size>
                 <mediatype>video</mediatype>
                 <writeDatas>yes</writeDatas>
-                <acodec>libfaac</acodec>
+                <acodec>libmp3lame</acodec>
                 <vcodec>libx264</vcodec>
                 <devices>screen</devices>
                 <bitrate>1000</bitrate>

lib/conf.d/data_templates/fr-simple.xml

@@ -79,7 +79,7 @@
                 <size>748</size>
                 <mediatype>video</mediatype>
                 <writeDatas>yes</writeDatas>
-                <acodec>libfaac</acodec>
+                <acodec>libmp3lame</acodec>
                 <vcodec>libx264</vcodec>
                 <devices>screen</devices>
                 <bitrate>1000</bitrate>

resources/locales/messages.de.xlf

@@ -3435,6 +3435,11 @@
         <target state="translated">Allgemeine Einstellungen</target>
         <jms:reference-file line="87">web/admin/dashboard.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="05db1e4e974fff47ae67bae1309fb4edd9b0a053" resname="Generate-cterms">
+        <source>Generate-cterms</source>
+        <target state="new">Generate-cterms</target>
+        <jms:reference-file line="267">admin/fields/templates.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="9f1b4c9f85fcbbf355fdd3c97210173b63551aa6" resname="Generates a flexpaper flash file" approved="yes">
         <source>Generates a flexpaper flash file</source>
         <target state="translated">Erstellt eine Flexpaper Flash Datei</target>
@@ -3572,6 +3577,16 @@
         <target state="translated">Gast, sie müssen authentifizieren, um die Dateien herunterzuladen.</target>
         <jms:reference-file line="88">web/common/dialog_export.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="771d30c668093219776b418dc5d3475682457167" resname="Gui-editable">
+        <source>Gui-editable</source>
+        <target state="new">Gui-editable</target>
+        <jms:reference-file line="196">admin/fields/templates.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="c3ccdd44c467c7149733d19a40e0068ddb00ab25" resname="Gui-visible">
+        <source>Gui-visible</source>
+        <target state="new">Gui-visible</target>
+        <jms:reference-file line="204">admin/fields/templates.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="6bc9ceaf6239215199222552fbbe96c17a549705" resname="HD Download" approved="yes">
         <source>HD Download</source>
         <target state="translated">HD Download</target>

resources/locales/messages.en.xlf

@@ -3435,6 +3435,11 @@
         <target state="translated">General settings</target>
         <jms:reference-file line="87">web/admin/dashboard.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="05db1e4e974fff47ae67bae1309fb4edd9b0a053" resname="Generate-cterms">
+        <source>Generate-cterms</source>
+        <target state="new">Generate-cterms</target>
+        <jms:reference-file line="267">admin/fields/templates.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="9f1b4c9f85fcbbf355fdd3c97210173b63551aa6" resname="Generates a flexpaper flash file" approved="yes">
         <source>Generates a flexpaper flash file</source>
         <target state="translated">Creates a flexpaper flash file</target>
@@ -3572,6 +3577,16 @@
         <target state="translated">You must be authenticated to have the right to download.</target>
         <jms:reference-file line="88">web/common/dialog_export.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="771d30c668093219776b418dc5d3475682457167" resname="Gui-editable">
+        <source>Gui-editable</source>
+        <target state="new">Gui-editable</target>
+        <jms:reference-file line="196">admin/fields/templates.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="c3ccdd44c467c7149733d19a40e0068ddb00ab25" resname="Gui-visible">
+        <source>Gui-visible</source>
+        <target state="new">Gui-visible</target>
+        <jms:reference-file line="204">admin/fields/templates.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="6bc9ceaf6239215199222552fbbe96c17a549705" resname="HD Download" approved="yes">
         <source>HD Download</source>
         <target state="translated">Document Download</target>

resources/locales/messages.fr.xlf

@@ -3432,6 +3432,11 @@
         <target state="translated">Paramètres généraux</target>
         <jms:reference-file line="87">web/admin/dashboard.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="05db1e4e974fff47ae67bae1309fb4edd9b0a053" resname="Generate-cterms">
+        <source>Generate-cterms</source>
+        <target state="new">Generate-cterms</target>
+        <jms:reference-file line="267">admin/fields/templates.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="9f1b4c9f85fcbbf355fdd3c97210173b63551aa6" resname="Generates a flexpaper flash file" approved="yes">
         <source>Generates a flexpaper flash file</source>
         <target state="translated">Générer un fichier flexpaper flash</target>
@@ -3569,6 +3574,16 @@
         <target state="translated">Vous devez vous authentifier pour télécharger.</target>
         <jms:reference-file line="88">web/common/dialog_export.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="771d30c668093219776b418dc5d3475682457167" resname="Gui-editable">
+        <source>Gui-editable</source>
+        <target state="new">Gui-editable</target>
+        <jms:reference-file line="196">admin/fields/templates.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="c3ccdd44c467c7149733d19a40e0068ddb00ab25" resname="Gui-visible">
+        <source>Gui-visible</source>
+        <target state="new">Gui-visible</target>
+        <jms:reference-file line="204">admin/fields/templates.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="6bc9ceaf6239215199222552fbbe96c17a549705" resname="HD Download" approved="yes">
         <source>HD Download</source>
         <target state="translated">Téléchargement HD</target>

resources/locales/messages.nl.xlf

@@ -3442,6 +3442,11 @@
         <target state="translated">Algemene instellingen</target>
         <jms:reference-file line="87">web/admin/dashboard.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="05db1e4e974fff47ae67bae1309fb4edd9b0a053" resname="Generate-cterms">
+        <source>Generate-cterms</source>
+        <target state="new">Generate-cterms</target>
+        <jms:reference-file line="267">admin/fields/templates.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="9f1b4c9f85fcbbf355fdd3c97210173b63551aa6" resname="Generates a flexpaper flash file" approved="yes">
         <source>Generates a flexpaper flash file</source>
         <target state="translated">Genereerd een flexpaper flash file</target>
@@ -3579,6 +3584,16 @@
         <target state="new">Guest, you must be authenticated to have the right to download.</target>
         <jms:reference-file line="88">web/common/dialog_export.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="771d30c668093219776b418dc5d3475682457167" resname="Gui-editable">
+        <source>Gui-editable</source>
+        <target state="new">Gui-editable</target>
+        <jms:reference-file line="196">admin/fields/templates.html.twig</jms:reference-file>
+      </trans-unit>
+      <trans-unit id="c3ccdd44c467c7149733d19a40e0068ddb00ab25" resname="Gui-visible">
+        <source>Gui-visible</source>
+        <target state="new">Gui-visible</target>
+        <jms:reference-file line="204">admin/fields/templates.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="6bc9ceaf6239215199222552fbbe96c17a549705" resname="HD Download">
         <source>HD Download</source>
         <target>HD Download</target>

resources/locales/validators.fr.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2019-11-19T08:49:43Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2019-11-15T08:03:23Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>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.</note>

templates/web/admin/fields/templates.html.twig

@@ -193,7 +193,7 @@
                     <td>
                         <label for="gui_editable" class="checkbox">
                             <input id="gui_editable" type="checkbox" <%= field.gui_editable ? "checked='checked'" : "" %> />
-                            {% trans %}gui_editable{% endtrans %}
+                            {% trans %}Gui-editable{% endtrans %}
                         </label>
                     </td>
                 </tr>
@@ -201,7 +201,7 @@
                     <td>
                         <label for="gui_visible" class="checkbox">
                             <input id="gui_visible" type="checkbox" <%= field.gui_visible ? "checked='checked'" : "" %> />
-                            {% trans %}gui_visible{% endtrans %}
+                            {% trans %}Gui-visible{% endtrans %}
                         </label>
                     </td>
                 </tr>
@@ -264,7 +264,7 @@
                     <td><input id="tbranch" type="text" value="<%= field.tbranch %>"/></td>
                 </tr>
                 <tr>
-                    <td><label for="generate_cterms" class="checkbox">{% trans %}generate_cterms{% endtrans %}</label></td>
+                    <td><label for="generate_cterms" class="checkbox">{% trans %}Generate-cterms{% endtrans %}</label></td>
                     <td><input id="generate_cterms" type="checkbox" <%= field.generate_cterms ? "checked='checked'" : "" %> /></td>
                 </tr>
             </table>

yarn.lock

@@ -3815,9 +3815,9 @@ fsevents@^1.0.0, fsevents@^1.1.2, fsevents@^1.2.7:
     node-pre-gyp "^0.12.0"
 
 fstream@^1.0.0, fstream@^1.0.2:
-  version "1.0.11"
+  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -4049,7 +4049,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
+glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
   integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
@@ -4061,6 +4061,18 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.3:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@~3.1.21:
   version "3.1.21"
   resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
@@ -4166,10 +4178,10 @@ graceful-fs@^3.0.0:
   dependencies:
     natives "^1.1.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~4.1.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
-  version "4.1.15"
+  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
+  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
 graceful-fs@~1.2.0:
   version "1.2.3"
@@ -4181,6 +4193,11 @@ graceful-fs@~2.0.0:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-2.0.3.tgz#7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"
   integrity sha1-fNLNsiiko/Nule+mzBQt59GhNtA=
 
+graceful-fs@~4.1.4:
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
+
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
@@ -4757,7 +4774,12 @@ inherits@1:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
   integrity sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
@@ -6483,9 +6505,9 @@ mitt@^1.1.3:
   integrity sha512-mUDCnVNsAi+eD6qA0HkRkwYczbLHJ49z17BGe2PYRhZL4wpZUFZGJHU7/5tmvohoma+Hdn0Vh/oJTiPEmgSruA==
 
 mixin-deep@^1.2.0:
-  version "1.3.1"
+  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
@@ -8296,9 +8318,9 @@ right-align@^0.1.1:
     align-text "^0.1.1"
 
 rimraf@2, rimraf@^2.2.8, rimraf@^2.5.0, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
-  version "2.6.3"
+  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
   dependencies:
     glob "^7.1.3"