Merge branch 'staging' into pl-teacher-application-log-users

Conflicts:
	apps/src/code-studio/pd/form_components/FormController.jsx

Author: breville

.drone.yml

@@ -1,12 +1,48 @@
+---
 kind: pipeline
 name: unit
 
 clone:
-  depth: 50
+  disable: true
 
 steps:
+- name: clone
+  image: docker:git
+  commands:
+  - git clone --branch $DRONE_SOURCE_BRANCH  --depth 50 $DRONE_GIT_HTTP_URL .
+  - git reset --hard $DRONE_COMMIT
+
+- name: verify-pr
+  image: wintercdo/code-dot-org:0.7
+  pull: always
+  commands:
+    - |
+      if [ -z "$DRONE_PULL_REQUEST" ]; then
+        echo "Not a pull request."
+        exit 0
+      fi
+    # Check to see if PR is from fork. If so, exit, as the test run provides access to secrets.
+    - head_repo=$(curl -s "https://api.github.com/repos/code-dot-org/code-dot-org/pulls/$DRONE_PULL_REQUEST" | jq .head.repo.full_name)
+    - echo $head_repo
+    - |
+      if [ "$head_repo" != '"code-dot-org/code-dot-org"' ]; then
+        echo "Pull request is from fork $head_repo; exiting."
+        exit 1
+      fi
+
+- name: restore-cache
+  image: plugins/s3-cache
+  settings:
+    pull: true
+    restore: true
+    access_key:
+      from_secret: S3_CACHE_ACCESS_KEY
+    secret_key:
+      from_secret: S3_CACHE_SECRET_KEY
+
 - name: unit-tests
   image: wintercdo/code-dot-org:0.7
+  pull: always
   volumes:
   - name: rbenv
     path: /home/circleci/.rbenv
@@ -17,17 +53,28 @@ steps:
       from_secret: CLOUDFRONT_KEY_PAIR_ID
     CLOUDFRONT_PRIVATE_KEY:
       from_secret: CLOUDFRONT_PRIVATE_KEY
-    PROPERTIES_ENCRYPTION_KEY:
-      from_secret: PROPERTIES_ENCRYPTION_KEY
-    AWS_ACCESS_KEY_ID:
-      from_secret: AWS_ACCESS_KEY_ID
-    AWS_SECRET_ACCESS_KEY:
-      from_secret: AWS_SECRET_ACCESS_KEY
   commands:
-    - pwd
+    - df -h
     - sudo chown -R circleci:circleci .
+    - # cache is restored to source directory, so we need to copy it into the right place
+    - cp -rn "$(pwd)/home/circleci/.rbenv" /home/circleci || true
     - /entrypoint.sh docker/unit_tests.sh
 
+- name: update-cache
+  image: plugins/s3-cache
+  volumes:
+  - name: rbenv
+    path: /home/circleci/.rbenv
+  settings:
+    pull: true
+    rebuild: true
+    access_key:
+      from_secret: S3_CACHE_ACCESS_KEY
+    secret_key:
+      from_secret: S3_CACHE_SECRET_KEY
+    mount:
+      - /home/circleci/.rbenv
+
 volumes:
 - name: rbenv
   temp: {}
@@ -98,3 +145,8 @@ trigger:
 #   event:
 #     include:
 #     - pull_request
+---
+kind: signature
+hmac: 4ef30caa9dc7941b06d4ed3e8427def6b650ee9b3ceb3b161e2ffe83e603cae4
+
+...

SETUP.md

@@ -38,8 +38,9 @@ You can do Code.org development using OSX, Ubuntu, or Windows (running Ubuntu in
 1. `rake install`
 1. [Enable JavaScript builds](#enabling-javascript-builds)
     1. Note: You can skip this step if not editing javascript frequently.
-1. Setup AWS - Ask a Code.org engineer how to complete this step
 1. `rake build`
+1. (Optional, Code.org engineers only) Setup AWS - Ask a Code.org engineer how to complete this step
+   1. Some functionality will not work on your local site without this, for example, some project-backed level types such as https://studio.code.org/projects/gamelab. This setup is only available to Code.org engineers for now, but it is recommended for Code.org engineers.
 
 ## OS-specific prerequisites
 

apps/.storybook/config.js

@@ -1,4 +1,5 @@
-import React, {PropTypes} from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import * as storybook from '@storybook/react';
 import { setOptions } from '@storybook/addon-options';
 import Node from '@storybook/addon-info/dist/components/Node';

apps/Gruntfile.js

@@ -17,6 +17,9 @@ module.exports = function (grunt) {
 
   process.env.mocha_entry = grunt.option('entry') || '';
   if (process.env.mocha_entry) {
+    if (path.resolve(process.env.mocha_entry).indexOf('/apps/test/integration') > -1) {
+      throw new Error('Cannot use karma:entry to run integration tests');
+    }
     const isDirectory = fs.lstatSync(path.resolve(process.env.mocha_entry)).isDirectory();
     const loadContext = isDirectory ?
       `let testsContext = require.context(${JSON.stringify(path.resolve(process.env.mocha_entry))}, true, /\\.jsx?$/);` :

apps/i18n/bounce/sk_sk.json

@@ -77,9 +77,9 @@
   "putdownTower": "daj dole vežu",
   "reinfFeedbackMsg": "Pre návrat k svojej hre môžeš stlačiť tlačidlo \"Skúsiť znova\".",
   "removeSquare": "odstrániť štvorec",
-  "repeatUntil": "opakovať dokiaľ",
+  "repeatUntil": "opakuj dovtedy (kým)",
   "repeatUntilBlocked": "pokiaľ je cesta vpred",
-  "repeatUntilFinish": "opakovať do konca",
+  "repeatUntilFinish": "opakuj do konca",
   "scoreText": "Skóre: {playerScore} : {opponentScore}",
   "setBackground": "nastav {background} scénu",
   "setBackgroundHardcourt": "nastav hardcourt scénu",

apps/i18n/common/ar_sa.json

@@ -1279,6 +1279,7 @@
   "subtitle": "بيئة البرمجة المرئية",
   "success": "",
   "summaryAssessmentsOverview": "",
+  "switchSection": "قسم التبديل:",
   "syncClever": "",
   "syncGoogleClassroom": "",
   "syntaxErrorMsg": "برنامجك يحتوي علي خطأ في الكتابة الرجاء إزالة السطر رقم {lineNumber} والمحاولة مرة أخرى.",

apps/i18n/common/az_az.json

@@ -1279,6 +1279,7 @@
   "subtitle": "vizual proqramlaşdırma mühiti",
   "success": "",
   "summaryAssessmentsOverview": "",
+  "switchSection": "",
   "syncClever": "",
   "syncGoogleClassroom": "",
   "syntaxErrorMsg": "Proqramınızda hərf səhvi var. Zəhmət olmazsa, {lineNumber} nömrəli sətri pozun və bir daha cəhd edin.",

apps/i18n/common/bg_bg.json

@@ -1279,6 +1279,7 @@
   "subtitle": "визуална среда за програмиране",
   "success": "Успешно!",
   "summaryAssessmentsOverview": "",
+  "switchSection": "Преминаване към раздел:",
   "syncClever": "",
   "syncGoogleClassroom": "",
   "syntaxErrorMsg": "Вашата програма съдържа правописна грешка. Моля, премахнете линия {lineNumber} и опитайте отново.",

apps/i18n/common/bn_bd.json

@@ -1279,6 +1279,7 @@
   "subtitle": "ভিজ্যুয়াল প্রোগ্রামিং পরিবেশ",
   "success": "",
   "summaryAssessmentsOverview": "",
+  "switchSection": "অধ্যায় অদল-বদল করুন:",
   "syncClever": "",
   "syncGoogleClassroom": "",
   "syntaxErrorMsg": "আপনার প্রোগ্রাম লিখায় একটি ভুল রয়েছে। লাইন {lineNumber} অপসারণ করে আবার চেষ্টা করুন।",

apps/i18n/common/bs_ba.json

@@ -1279,6 +1279,7 @@
   "subtitle": "grafičko okruženje za programiranje",
   "success": "",
   "summaryAssessmentsOverview": "",
+  "switchSection": "Promijeni odjeljenje:",
   "syncClever": "",
   "syncGoogleClassroom": "",
   "syntaxErrorMsg": "Vaš program ima pogrešku. Molimo vas da uklonite liniju {lineNumber} i da pokušate ponovo.",

apps/i18n/common/ca_es.json

@@ -1279,6 +1279,7 @@
   "subtitle": "un entorn de programació visual",
   "success": "",
   "summaryAssessmentsOverview": "",
+  "switchSection": "Canvia de secció:",
   "syncClever": "",
   "syncGoogleClassroom": "",
   "syntaxErrorMsg": "El seu programa conté un error tipogràfic. Tregui la línia {lineNumber} i torneu-ho a provar.",

apps/i18n/common/co_co.json

@@ -1279,6 +1279,7 @@
   "subtitle": "",
   "success": "",
   "summaryAssessmentsOverview": "",
+  "switchSection": "",
   "syncClever": "",
   "syncGoogleClassroom": "",
   "syntaxErrorMsg": "",

apps/i18n/common/cs_cz.json

@@ -3,7 +3,7 @@
   "activity": "Aktivita",
   "actions": "Akce",
   "add": "Přidat",
-  "addPartners": "",
+  "addPartners": "Přidat partnery",
   "addPassword": "Přidat heslo",
   "addPasswordHint": "Po vytvoření hesla se budete vždy přihlašovat pomocí svého uživatelského jména (nebo e-mailové adresy) a hesla. Váš účet bude také lépe zabezpečen, protože při každé jeho změně bude požadováno zadání hesla.",
   "addRemoveCleverClassrooms": "Navštivte https://clever.com/ a potvrďte, že vaše třída je připojena do Code.org.",
@@ -73,7 +73,7 @@
   "assignHiddenUnitConfirm": "Vypadá to, že jste dříve skryli \"{assignmentName}\" z oddílu \"{sectionName}\". Chcete přesto přiřadit tuto jednotku a zviditelnit ji?",
   "assignedTo": "Přiřazeno",
   "assignUnit": "Přiřadit jednotku",
-  "assignedToNewerVersion": "",
+  "assignedToNewerVersion": "Učitel tě přidal do novější verze kurzu.",
   "assignmentSelectorCourse": "Vybrat kurz",
   "assignmentSelectorVersion": "Verze",
   "assignmentSelectorUnit": "Vybrat aktuální jednotku",
@@ -205,7 +205,7 @@
   "completedWithoutRecommendedBlock": "Blahopřejeme! Dokončil jsi Puzzle {puzzleNumber}. (Ale mohl bys použít jiný blok pro silnější kód.)",
   "completionStatus": "Stav dokončení",
   "concept": "Koncept",
-  "confirmDeleteExplanation": "",
+  "confirmDeleteExplanation": "Tento soubor bude odstraněn z celého projektu",
   "confirming": "Potvrzení...",
   "confirmSchool": "Potvrdit školu",
   "congratsCertificateHeading": "Získali jste osvědčení o dokončení",
@@ -1279,6 +1279,7 @@
   "subtitle": "vizuální programovací prostředí",
   "success": "",
   "summaryAssessmentsOverview": "",
+  "switchSection": "Přepnout sekci:",
   "syncClever": "",
   "syncGoogleClassroom": "",
   "syntaxErrorMsg": "Váš program obsahuje překlep. Odstranit řádek {lineNumber} a opakujte akci.",

apps/i18n/common/da_dk.json

@@ -1279,6 +1279,7 @@
   "subtitle": "et visuelt programmerings miljø",
   "success": "",
   "summaryAssessmentsOverview": "",
+  "switchSection": "Skift hold:",
   "syncClever": "",
   "syncGoogleClassroom": "",
   "syntaxErrorMsg": "Dit program indeholder en fejl. Fjern linje {lineNumber} og prøv igen.",

apps/i18n/common/de_de.json

@@ -1279,6 +1279,7 @@
   "subtitle": "eine visuelle Programmierumgebung",
   "success": "Geschafft!",
   "summaryAssessmentsOverview": "",
+  "switchSection": "Lerngruppe wechseln:",
   "syncClever": "",
   "syncGoogleClassroom": "",
   "syntaxErrorMsg": "Dein Programm enthält einen Tippfehler. Bitte entferne Zeile {lineNumber} und versuche es erneut.",