Merge branch 'Part-DB:master' into preview-image-size-in-tables

VERSION

@@ -1 +1 @@
-1.12.0
+1.12.1

composer.json

@@ -21,7 +21,7 @@
         "doctrine/doctrine-bundle": "^2.0",
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.16",
-        "dompdf/dompdf": "dev-master#c9cf4be933e2406a51990bd4eb9e70612e790cc0 as v2.0.4",
+        "dompdf/dompdf": "^v3.0.0",
         "erusev/parsedown": "^1.7",
         "florianv/swap": "^4.0",
         "florianv/swap-bundle": "dev-master",

phpunit.xml.dist

@@ -13,7 +13,7 @@
     <server name="SHELL_VERBOSITY" value="-1"/>
     <server name="SYMFONY_PHPUNIT_REMOVE" value=""/>
     <server name="SYMFONY_PHPUNIT_VERSION" value="9.5"/>
-    <ini name="memory_limit" value="512M"/>
+    <ini name="memory_limit" value="1G"/>
     <ini name="display_errors" value="1"/>
   </php>
   <coverage processUncoveredFiles="true">

templates/base.html.twig

@@ -115,7 +115,7 @@
     </button>
 
     {# Must be outside of the sidebar or it will be hidden too #}
-    <button class="btn btn-outline-dark btn-sm p-0 d-md-block d-none" type="button" id="sidebar-toggle-button" title="{% trans %}sidebar.big.toggle{% endtrans %}"
+    <button class="btn btn-outline-secondary btn-sm p-0 d-md-block d-none" type="button" id="sidebar-toggle-button" title="{% trans %}sidebar.big.toggle{% endtrans %}"
             {{ stimulus_controller('common/hide_sidebar') }} {{ stimulus_action('common/hide_sidebar', 'toggleSidebar') }}>
         <i class="fas fa-angle-left"></i>
     </button>

translations/messages.en.xlf

@@ -3587,7 +3587,7 @@ Sub elements will be moved upwards.</target>
       <segment state="translated">
         <source>tfa_google.disable.confirm_message</source>
         <target>If you disable the Authenticator App, all backup codes will be deleted, so you may need to reprint them.&lt;br&gt;
-Also note that without two-factor authentication your account is not as well protected against attackers!</target>
+Also note that without two-factor authentication, your account is no longer as well protected against attackers!</target>
       </segment>
     </unit>
     <unit id="VYOAO2c" name="tfa_google.disabled_message">
@@ -3617,7 +3617,7 @@ Also note that without two-factor authentication your account is not as well pro
       </notes>
       <segment state="translated">
         <source>tfa_google.step.scan</source>
-        <target>Scan the adjoining QR Code with the app or enter the data manually</target>
+        <target>Scan the adjacent QR Code with the app or enter the data manually</target>
       </segment>
     </unit>
     <unit id="A9Ex8CO" name="tfa_google.step.input_code">

translations/security.nl.xlf

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0" srcLang="en" trgLang="nl">
+  <file id="security.en">
+    <unit id="aazoCks" name="user.login_error.user_disabled">
+      <segment state="translated">
+        <source>user.login_error.user_disabled</source>
+        <target>Uw account is gedeactiveerd! Neem contact op met een beheerder indien dit incorrect is.</target>
+      </segment>
+    </unit>
+    <unit id="Dpb9AmY" name="saml.error.cannot_login_local_user_per_saml">
+      <segment state="translated">
+        <source>saml.error.cannot_login_local_user_per_saml</source>
+        <target>U kunt niet inloggen als lokale gebruiker met SSO! Gebruik uw lokale wachtwoord.</target>
+      </segment>
+    </unit>
+  </file>
+</xliff>