Merge pull request #224 from lookit/release/v2.3.1

Release/v2.3.1
lookit · Feb 3, 2021 · 5593921 · 5593921
2 parents 4e40753 + 415ffb2
commit 5593921
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/app/components/consent-template005/template.hbs b/app/components/consent-template005/template.hbs
@@ -13,7 +13,7 @@
     <p> {{ exp-format purpose }} </p>
 
     <h2> {{#if procedures_header}} {{procedures_header}} {{else}} {{t "consent-template-5.procedures-header" }} {{/if}}</h2>
-    <p> {{t "consent-template-5.duration-statement" duration=experiment.duration }}</p>
+    <p> {{t "consent-template-5.duration-statement" duration=experiment.duration }} {{exp-format procedures}} </p>
 
     <h2> {{#if participation_header}} {{participation_header}} {{else}} {{t "consent-template-5.participation-header" }} {{/if}}</h2>
     <p>

diff --git a/app/components/exp-lookit-stimuli-preview/doc.rst b/app/components/exp-lookit-stimuli-preview/doc.rst
@@ -92,14 +92,6 @@ Example
 Parameters
 ----------------
 
-video [Object | ``{}`` ]
-    Object describing the video to show. It can have the following properties:
-
-    :source: [String or Array]
-        The location of the main video to play. This can be either
-        an array of ``{'src': 'https://...', 'type': '...'}`` objects (e.g., to provide both
-        webm and mp4 versions at specified URLS) or a single string relative to ``baseDir/<EXT>/``.
-
 showPreviousButton [Boolean | ``true``]
     Whether to show a 'previous' button
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-lookit-frameplayer",
-  "version": "v2.3.0",
+  "version": "v2.3.1",
   "description": "Ember Frame Player",
   "private": true,
   "directories": {