Merge branch 'master' into integration

moodlehq · Dec 19, 2019 · c6dee63 · c6dee63
2 parents dc5f813 + 3cefd6b
commit c6dee63
Show file tree

Hide file tree

Showing 39 changed files with 1,451 additions and 812 deletions.
diff --git a/scripts/aot.sh b/scripts/aot.sh
@@ -4,7 +4,7 @@
 npm list --depth=0
 
 # Compile AOT.
-if [ $TRAVIS_BRANCH == 'integration' ] || [ $TRAVIS_BRANCH == 'master' ] || [ $TRAVIS_BRANCH == 'desktop' ] || [ -z $TRAVIS_BRANCH ] ; then
+if [ $TRAVIS_BRANCH == 'integration' ] || [ $TRAVIS_BRANCH == 'master' ] || [ $TRAVIS_BRANCH == 'desktop' ] || [ $TRAVIS_BRANCH == 'security' ] || [ -z $TRAVIS_BRANCH ] ; then
     cd scripts
     ./build_lang.sh
     cd ..

diff --git a/src/addon/block/myoverview/lang/en.json b/src/addon/block/myoverview/lang/en.json
@@ -3,7 +3,7 @@
     "all": "All (except hidden)",
     "favourites": "Starred",
     "future": "Future",
-    "hiddencourses": "Hidden",
+    "hiddencourses": "Removed from view",
     "inprogress": "In progress",
     "lastaccessed": "Last accessed",
     "morecourses": "More courses",