Merge branch 'release-2.x'

.travis.yml

@@ -9,14 +9,8 @@ language: php
 
 php:
   - 5.6
-  - 5.5
-  - 5.4
   - 7.0
 
-matrix:
-  allow_failures:
-    - php: 7.0
-
 env:
   global:
     - SYMFONY_ENV=test

README.md

@@ -5,7 +5,7 @@ Step-up Self-Service
 
 ## Requirements
 
- * PHP 5.4+
+ * PHP 5.6+ or PHP7
  * [Composer](https://getcomposer.org/)
  * A web server (Apache, Nginx)
  * Graylog2 (or disable this Monolog handler)
@@ -15,3 +15,5 @@ Step-up Self-Service
 ## Installation
 
 Clone the repository or download the archive to a directory. Install the dependencies by running `composer install`.
+
+Run `app/console mopa:bootstrap:symlink:less` to configure Bootstrap symlinks.

app/Resources/translations/messages.en_GB.xliff

@@ -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="2016-04-29T10:22:50Z" source-language="en" target-language="en_GB" datatype="plaintext" original="not.available">
+  <file date="2016-08-04T12:26:07Z" source-language="en" target-language="en_GB" 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>
@@ -125,7 +125,7 @@
         <target>Remove</target>
       </trans-unit>
       <trans-unit id="e81e43e3bee8ede5bc43425f96030ec09f268e7e" resname="ss.form.ss_send_sms_challenge.button.send_challenge">
-        <jms:reference-file line="51">Form/Type/SendSmsChallengeType.php</jms:reference-file>
+        <jms:reference-file line="52">Form/Type/SendSmsChallengeType.php</jms:reference-file>
         <source>ss.form.ss_send_sms_challenge.button.send_challenge</source>
         <target>Send code</target>
       </trans-unit>
@@ -140,12 +140,12 @@
         <target>Verification code</target>
       </trans-unit>
       <trans-unit id="13bd61d79492403adcd7cc4a71a6b7acbc61216c" resname="ss.form.ss_verify_sms_challenge.button.resend_challenge">
-        <jms:reference-file line="41">Form/Type/VerifySmsChallengeType.php</jms:reference-file>
+        <jms:reference-file line="36">Form/Type/VerifySmsChallengeType.php</jms:reference-file>
         <source>ss.form.ss_verify_sms_challenge.button.resend_challenge</source>
         <target>Send new code</target>
       </trans-unit>
       <trans-unit id="8237b3cb8724d01124f8cc3588bd38db546c51b8" resname="ss.form.ss_verify_sms_challenge.button.verify_challenge">
-        <jms:reference-file line="37">Form/Type/VerifySmsChallengeType.php</jms:reference-file>
+        <jms:reference-file line="41">Form/Type/VerifySmsChallengeType.php</jms:reference-file>
         <source>ss.form.ss_verify_sms_challenge.button.verify_challenge</source>
         <target>Verify</target>
       </trans-unit>
@@ -275,52 +275,70 @@
         <target>Select token</target>
       </trans-unit>
       <trans-unit id="d38c5271077c89a3b39e6ee655e21059dcb1da94" resname="ss.registration.registration_email_sent.label.registration_code">
-        <jms:reference-file line="31">views/Registration/registrationEmailSent.html.twig</jms:reference-file>
+        <jms:reference-file line="31">views/Registration/registrationEmailSentWithRaLocations.html.twig</jms:reference-file>
+        <jms:reference-file line="31">views/Registration/registrationEmailSentWithRas.html.twig</jms:reference-file>
         <source>ss.registration.registration_email_sent.label.registration_code</source>
         <target>Activation code</target>
       </trans-unit>
       <trans-unit id="8324fbb0b4fe0b88092294e3a1f958f0bc02d6da" resname="ss.registration.registration_email_sent.text.activation_instructions">
-        <jms:reference-file line="16">views/Registration/registrationEmailSent.html.twig</jms:reference-file>
+        <jms:reference-file line="16">views/Registration/registrationEmailSentWithRaLocations.html.twig</jms:reference-file>
+        <jms:reference-file line="16">views/Registration/registrationEmailSentWithRas.html.twig</jms:reference-file>
         <source>ss.registration.registration_email_sent.text.activation_instructions</source>
         <target>Visit the location below to get your token activated. Please bring the following:</target>
       </trans-unit>
       <trans-unit id="a83fee04452531e7eba20178cf820677f88db4cf" resname="ss.registration.registration_email_sent.text.activation_instructions_item_1">
-        <jms:reference-file line="19">views/Registration/registrationEmailSent.html.twig</jms:reference-file>
+        <jms:reference-file line="19">views/Registration/registrationEmailSentWithRaLocations.html.twig</jms:reference-file>
+        <jms:reference-file line="19">views/Registration/registrationEmailSentWithRas.html.twig</jms:reference-file>
         <source>ss.registration.registration_email_sent.text.activation_instructions_item_1</source>
         <target>Your token</target>
       </trans-unit>
       <trans-unit id="ebdd61f271ba18583ca0a18fbe9b675c88375b98" resname="ss.registration.registration_email_sent.text.activation_instructions_item_2">
-        <jms:reference-file line="20">views/Registration/registrationEmailSent.html.twig</jms:reference-file>
+        <jms:reference-file line="20">views/Registration/registrationEmailSentWithRaLocations.html.twig</jms:reference-file>
+        <jms:reference-file line="20">views/Registration/registrationEmailSentWithRas.html.twig</jms:reference-file>
         <source>ss.registration.registration_email_sent.text.activation_instructions_item_2</source>
         <target>A valid proof of identity (passport, driver's license or national ID-card)</target>
       </trans-unit>
       <trans-unit id="d608041873dea3059d34724b9a24e4e751ebdffe" resname="ss.registration.registration_email_sent.text.activation_instructions_item_3">
-        <jms:reference-file line="21">views/Registration/registrationEmailSent.html.twig</jms:reference-file>
+        <jms:reference-file line="21">views/Registration/registrationEmailSentWithRaLocations.html.twig</jms:reference-file>
+        <jms:reference-file line="21">views/Registration/registrationEmailSentWithRas.html.twig</jms:reference-file>
         <source>ss.registration.registration_email_sent.text.activation_instructions_item_3</source>
         <target>Your activation code</target>
       </trans-unit>
+      <trans-unit id="63974b83ce6262c68656a606d22f6538742e22c5" resname="ss.registration.registration_email_sent.text.no_ra_locations_for_your_institution">
+        <jms:reference-file line="47">views/Registration/registrationEmailSentWithRaLocations.html.twig</jms:reference-file>
+        <source>ss.registration.registration_email_sent.text.no_ra_locations_for_your_institution</source>
+        <target>There are no locations available within your institution to activate your token. Please contact your helpdesk for support.</target>
+      </trans-unit>
       <trans-unit id="8388ff05103a22d0917788a48ccdc9716a353ac8" resname="ss.registration.registration_email_sent.text.no_ras_for_your_institution">
-        <jms:reference-file line="47">views/Registration/registrationEmailSent.html.twig</jms:reference-file>
+        <jms:reference-file line="47">views/Registration/registrationEmailSentWithRas.html.twig</jms:reference-file>
         <source>ss.registration.registration_email_sent.text.no_ras_for_your_institution</source>
         <target>There are no locations available within your institution to activate your token. Please contact your helpdesk for support.</target>
       </trans-unit>
       <trans-unit id="7c9ea58235246dd0f14a2d6aaed379ad0638d0e7" resname="ss.registration.registration_email_sent.text.registration_code_has_been_sent">
-        <jms:reference-file line="41">views/Registration/registrationEmailSent.html.twig</jms:reference-file>
+        <jms:reference-file line="41">views/Registration/registrationEmailSentWithRaLocations.html.twig</jms:reference-file>
+        <jms:reference-file line="41">views/Registration/registrationEmailSentWithRas.html.twig</jms:reference-file>
         <source>ss.registration.registration_email_sent.text.registration_code_has_been_sent</source>
         <target>An e-mail containing these instructions and your activation code has also been sent to the e-mail address %email%.</target>
       </trans-unit>
       <trans-unit id="9ef48b4bbb1cef4ef12eb3e5146beb743e648752" resname="ss.registration.registration_email_sent.text.thank_you_for_registration">
-        <jms:reference-file line="14">views/Registration/registrationEmailSent.html.twig</jms:reference-file>
+        <jms:reference-file line="14">views/Registration/registrationEmailSentWithRaLocations.html.twig</jms:reference-file>
+        <jms:reference-file line="14">views/Registration/registrationEmailSentWithRas.html.twig</jms:reference-file>
         <source>ss.registration.registration_email_sent.text.thank_you_for_registration</source>
         <target>Thank you for registering your token. Your token is almost ready to use.</target>
       </trans-unit>
       <trans-unit id="61c16d1cf1191b8bfb09d98779fbbf5cb748bd6b" resname="ss.registration.registration_email_sent.title">
-        <jms:reference-file line="3">views/Registration/registrationEmailSent.html.twig</jms:reference-file>
+        <jms:reference-file line="3">views/Registration/registrationEmailSentWithRaLocations.html.twig</jms:reference-file>
+        <jms:reference-file line="3">views/Registration/registrationEmailSentWithRas.html.twig</jms:reference-file>
         <source>ss.registration.registration_email_sent.title</source>
         <target>Activation code</target>
       </trans-unit>
+      <trans-unit id="536255f00c5e95be847f318b9a692596a9d927a2" resname="ss.registration.registration_email_sent.title.list_of_ra_locations">
+        <jms:reference-file line="45">views/Registration/registrationEmailSentWithRaLocations.html.twig</jms:reference-file>
+        <source>ss.registration.registration_email_sent.title.list_of_ra_locations</source>
+        <target>Location(s) to activate your token</target>
+      </trans-unit>
       <trans-unit id="fad1d50cfe9eadd2b8c3dd3e10456e70a5c927f0" resname="ss.registration.registration_email_sent.title.list_of_ras">
-        <jms:reference-file line="45">views/Registration/registrationEmailSent.html.twig</jms:reference-file>
+        <jms:reference-file line="45">views/Registration/registrationEmailSentWithRas.html.twig</jms:reference-file>
         <source>ss.registration.registration_email_sent.title.list_of_ras</source>
         <target>Location(s) to activate your token</target>
       </trans-unit>
@@ -379,7 +397,7 @@ For all mobile phones.</target>
         <jms:reference-file line="12">Resources/views/translations.twig</jms:reference-file>
         <source>ss.registration.selector.tiqr.description</source>
         <target>Log in with a smartphone app.
-For all smartphones with Apple iOS or Android.</target>
+For all smartphones with %tiqr_ios_link_start%Apple iOS%tiqr_ios_link_end% or %tiqr_android_link_start%Android%tiqr_android_link_end%.</target>
       </trans-unit>
       <trans-unit id="dd724c0f4759a5dc04d29ab36e611d16da4ad8ba" resname="ss.registration.selector.tiqr.title">
         <jms:reference-file line="11">Resources/views/translations.twig</jms:reference-file>