Merge branch 'staging' into planter

Author: Hamms

.gitignore

@@ -1,8 +1,10 @@
 \#*#
 *.pid
+*.pid.oldbin
 *~
 .DS_Store
 .dropbox
+.tmputils
 .idea/
 **/.bundle
 crowdin.yaml

.rubocop.yml

@@ -9,7 +9,7 @@ AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.2
 
-# Code.org style overrides.
+# BEGIN CODE.ORG OVERRIDES
 
 Style/AlignParameters:
   EnforcedStyle: with_fixed_indentation
@@ -35,38 +35,46 @@ Style/Semicolon:
 Style/WordArray:
   MinSize: 5
 
-# Listed below are rules we don't plan to enable in the foreseeable future.
-# Add rules we plan to fix (but are currently failing) to .rubocop_todo.yml.
+# END CODE.ORG OVERRIDES
 
-Style/BarePercentLiterals:
+# BEGIN BLACKLIST: Below are rules we don't plan to enable in the forseeable
+# future. Rules we plan to fix (but are currently failing) belong in
+# .rubocop_todo.yml.
+
+Metrics/AbcSize:
   Enabled: false
 
-Style/ClosingParenthesisIndentation:
+Metrics/BlockNesting:
   Enabled: false
 
-Style/ExtraSpacing:
+Metrics/LineLength:
   Enabled: false
 
-Style/IdenticalConditionalBranches:
+Metrics/ModuleLength:
   Enabled: false
 
-Style/IfInsideElse:
+Style/AsciiComments:
   Enabled: false
 
-Style/RedundantReturn:
+Style/BarePercentLiterals:
   Enabled: false
 
-Metrics/AbcSize:
+Style/ClosingParenthesisIndentation:
   Enabled: false
 
-Metrics/LineLength:
+Style/ExtraSpacing:
   Enabled: false
 
-Metrics/ModuleLength:
+Style/IdenticalConditionalBranches:
   Enabled: false
 
-Metrics/BlockNesting:
+Style/IfInsideElse:
   Enabled: false
 
-Style/AsciiComments:
+Style/RedundantReturn:
   Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+# END BLACKLIST

.rubocop_todo.yml

@@ -120,13 +120,6 @@ Style/ConditionalAssignment:
 Style/ConstantName:
   Enabled: false
 
-# Offense count: 274
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: empty_lines, no_empty_lines
-Style/EmptyLinesAroundClassBody:
-  Enabled: false
-
 # Offense count: 64
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
@@ -176,13 +169,6 @@ Style/Lambda:
 Style/LeadingCommentSpace:
   Enabled: false
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
-Style/MethodDefParentheses:
-  Enabled: false
-
 # Offense count: 7
 Style/MultilineBlockChain:
   Enabled: false
@@ -287,13 +273,6 @@ Style/SpaceInsideBlockBraces:
 Style/SpaceInsideHashLiteralBraces:
   Enabled: false
 
-# Offense count: 13953
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Enabled: false
-
 # Offense count: 30
 # Cop supports --auto-correct.
 # Configuration parameters: AllowNamedUnderscoreVariables.

.tmputils/.gitkeep

@@ -103,6 +103,9 @@ gem 'jquery-rails', '~> 3.1.0'
 
 gem 'phantomjs', '~> 1.9.7.1'
 
+# for emoji in utility output
+gem 'gemoji'
+
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 1.2'
 
@@ -126,13 +129,13 @@ gem 'nokogiri', '~> 1.6.1'
 
 gem 'highline', '~> 1.6.21'
 
-gem 'honeybadger', '~> 1.11' # error monitoring
+gem 'honeybadger' # error monitoring
 
 gem 'newrelic_rpm', '~> 3.10.0.279', group: [:staging, :production] # perf/error/etc monitoring
 
 gem 'redcarpet', '~> 3.3.4'
 
-gem 'geocoder'
+gem 'geocoder', github: 'wjordan/geocoder', ref: 'rack-request-fix'
 
 gem 'rmagick'
 gem 'mini_magick'

Gemfile

@@ -6,6 +6,13 @@ GIT
     active_model_serializers (0.10.0.pre)
       activemodel (>= 4.0)
 
+GIT
+  remote: git://github.com/wjordan/geocoder.git
+  revision: 2da20897188b57f777df89f90e45cf331c5b014f
+  ref: rack-request-fix
+  specs:
+    geocoder (1.3.7)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -179,7 +186,7 @@ GEM
     firebase_token_generator (2.0.0)
     font-awesome-rails (4.6.3.0)
       railties (>= 3.2, < 5.1)
-    geocoder (1.3.7)
+    gemoji (2.1.0)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     gli (2.13.4)
@@ -223,8 +230,7 @@ GEM
     highline (1.6.21)
     hike (1.2.3)
     hitimes (1.2.2)
-    honeybadger (1.16.7)
-      json
+    honeybadger (2.6.0)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
       haml (~> 4.0.0)
@@ -607,15 +613,16 @@ DEPENDENCIES
   firebase
   firebase_token_generator
   font-awesome-rails (~> 4.6.3)
-  geocoder
+  gemoji
+  geocoder!
   google-api-client
   google_drive (~> 1.0.0)
   haml
   haml-rails
   haml_lint
   heroku_rails_deflate
   highline (~> 1.6.21)
-  honeybadger (~> 1.11)
+  honeybadger
   httparty
   ims-lti (~> 1.1)
   jbuilder (~> 1.2)

Gemfile.lock

@@ -377,9 +377,11 @@ module.exports = function (grunt) {
         'levelbuilder_markdown': './src/code-studio/levelbuilder_markdown.js',
         'levelbuilder_studio': './src/code-studio/levelbuilder_studio.js',
         'levelbuilder_gamelab': './src/code-studio/levelbuilder_gamelab.js',
+        'levelbuilder_applab': './src/code-studio/levelbuilder_applab.js',
         'makerlab/setupPage': './src/code-studio/makerlab/setupPage.js',
         'districtDropdown': './src/code-studio/districtDropdown.js',
         'signup': './src/code-studio/signup.js',
+        'termsInterstitial': './src/code-studio/termsInterstitial.js',
         'levels/contract_match': './src/code-studio/levels/contract_match.jsx',
         'levels/widget': './src/code-studio/levels/widget.js',
         'levels/external': './src/code-studio/levels/external.js',

apps/Gruntfile.js

@@ -271,5 +271,32 @@
   "when": "عندما",
   "whenRun": "عند التشغيل",
   "workspaceHeaderShort": "مساحة العمل: ",
-  "yes": "نعم"
+  "yes": "نعم",
+  "allowEditing": "Allow editing",
+  "allowEditingInstructions": "1. \"Allow editing\" while students should be taking the assessment.",
+  "answersVisible": "Answers visible (read-only)",
+  "assessmentSteps": "Steps to give assessment",
+  "autolock": "Note: Stage auto-locks after 24 hours.",
+  "dontForget": "Don't forget",
+  "editable": "Editable",
+  "loading": "Loading...",
+  "locked": "Locked",
+  "lockFollowing": "Lock the following stages that are currently unlocked:",
+  "lockSettings": "Lock settings",
+  "lockStage": "Lock stage",
+  "lockStageInstructions": "2. Once time is up, \"Lock stage\" to hide questions.",
+  "lockWhenDone": "Lock as soon as students are done",
+  "relockStage": "Re-lock stage",
+  "relockStageInstructions": "4. \"Re-lock stage\" to prevent sharing of answers with other classes/schools.",
+  "save": "Save",
+  "saving": "Saving...",
+  "selectSection": "Select a section to be able to lock and unlock assessments or surveys. Click the lock settings button in the stage to the left.",
+  "student": "Student",
+  "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
+  "teacherPanel": "Teacher Panel",
+  "showAnswers": "Show answers",
+  "showAnswersInstructions": "3. \"Show answers\" to put the assessment into a read-only mode.",
+  "studentControl": "Individual student control",
+  "teacher": "Teacher",
+  "viewPageAs": "View page as:"
 }

apps/i18n/common/ar_sa.json

@@ -271,5 +271,32 @@
   "when": "nə zaman",
   "whenRun": "icra etdikdə",
   "workspaceHeaderShort": "iş sahəsi: ",
-  "yes": "Bəli"
+  "yes": "Bəli",
+  "allowEditing": "Allow editing",
+  "allowEditingInstructions": "1. \"Allow editing\" while students should be taking the assessment.",
+  "answersVisible": "Answers visible (read-only)",
+  "assessmentSteps": "Steps to give assessment",
+  "autolock": "Note: Stage auto-locks after 24 hours.",
+  "dontForget": "Don't forget",
+  "editable": "Editable",
+  "loading": "Loading...",
+  "locked": "Locked",
+  "lockFollowing": "Lock the following stages that are currently unlocked:",
+  "lockSettings": "Lock settings",
+  "lockStage": "Lock stage",
+  "lockStageInstructions": "2. Once time is up, \"Lock stage\" to hide questions.",
+  "lockWhenDone": "Lock as soon as students are done",
+  "relockStage": "Re-lock stage",
+  "relockStageInstructions": "4. \"Re-lock stage\" to prevent sharing of answers with other classes/schools.",
+  "save": "Save",
+  "saving": "Saving...",
+  "selectSection": "Select a section to be able to lock and unlock assessments or surveys. Click the lock settings button in the stage to the left.",
+  "student": "Student",
+  "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
+  "teacherPanel": "Teacher Panel",
+  "showAnswers": "Show answers",
+  "showAnswersInstructions": "3. \"Show answers\" to put the assessment into a read-only mode.",
+  "studentControl": "Individual student control",
+  "teacher": "Teacher",
+  "viewPageAs": "View page as:"
 }

apps/i18n/common/az_az.json

@@ -271,5 +271,32 @@
   "when": "когато",
   "whenRun": "при стартиране",
   "workspaceHeaderShort": "Работна област: ",
-  "yes": "Да"
+  "yes": "Да",
+  "allowEditing": "Allow editing",
+  "allowEditingInstructions": "1. \"Allow editing\" while students should be taking the assessment.",
+  "answersVisible": "Answers visible (read-only)",
+  "assessmentSteps": "Steps to give assessment",
+  "autolock": "Note: Stage auto-locks after 24 hours.",
+  "dontForget": "Don't forget",
+  "editable": "Editable",
+  "loading": "Loading...",
+  "locked": "Locked",
+  "lockFollowing": "Lock the following stages that are currently unlocked:",
+  "lockSettings": "Lock settings",
+  "lockStage": "Lock stage",
+  "lockStageInstructions": "2. Once time is up, \"Lock stage\" to hide questions.",
+  "lockWhenDone": "Lock as soon as students are done",
+  "relockStage": "Re-lock stage",
+  "relockStageInstructions": "4. \"Re-lock stage\" to prevent sharing of answers with other classes/schools.",
+  "save": "Save",
+  "saving": "Saving...",
+  "selectSection": "Select a section to be able to lock and unlock assessments or surveys. Click the lock settings button in the stage to the left.",
+  "student": "Student",
+  "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
+  "teacherPanel": "Teacher Panel",
+  "showAnswers": "Show answers",
+  "showAnswersInstructions": "3. \"Show answers\" to put the assessment into a read-only mode.",
+  "studentControl": "Individual student control",
+  "teacher": "Teacher",
+  "viewPageAs": "View page as:"
 }

apps/i18n/common/bg_bg.json

@@ -271,5 +271,32 @@
   "when": "যখন",
   "whenRun": "চালানোর সময়",
   "workspaceHeaderShort": "কর্মপরিসর:",
-  "yes": "\"হ্যাঁ\""
+  "yes": "\"হ্যাঁ\"",
+  "allowEditing": "Allow editing",
+  "allowEditingInstructions": "1. \"Allow editing\" while students should be taking the assessment.",
+  "answersVisible": "Answers visible (read-only)",
+  "assessmentSteps": "Steps to give assessment",
+  "autolock": "Note: Stage auto-locks after 24 hours.",
+  "dontForget": "Don't forget",
+  "editable": "Editable",
+  "loading": "Loading...",
+  "locked": "Locked",
+  "lockFollowing": "Lock the following stages that are currently unlocked:",
+  "lockSettings": "Lock settings",
+  "lockStage": "Lock stage",
+  "lockStageInstructions": "2. Once time is up, \"Lock stage\" to hide questions.",
+  "lockWhenDone": "Lock as soon as students are done",
+  "relockStage": "Re-lock stage",
+  "relockStageInstructions": "4. \"Re-lock stage\" to prevent sharing of answers with other classes/schools.",
+  "save": "Save",
+  "saving": "Saving...",
+  "selectSection": "Select a section to be able to lock and unlock assessments or surveys. Click the lock settings button in the stage to the left.",
+  "student": "Student",
+  "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
+  "teacherPanel": "Teacher Panel",
+  "showAnswers": "Show answers",
+  "showAnswersInstructions": "3. \"Show answers\" to put the assessment into a read-only mode.",
+  "studentControl": "Individual student control",
+  "teacher": "Teacher",
+  "viewPageAs": "View page as:"
 }

apps/i18n/common/bn_bd.json

@@ -271,5 +271,32 @@
   "when": "kada",
   "whenRun": "pri pokretanju",
   "workspaceHeaderShort": "Radni prostor: ",
-  "yes": "Da"
+  "yes": "Da",
+  "allowEditing": "Allow editing",
+  "allowEditingInstructions": "1. \"Allow editing\" while students should be taking the assessment.",
+  "answersVisible": "Answers visible (read-only)",
+  "assessmentSteps": "Steps to give assessment",
+  "autolock": "Note: Stage auto-locks after 24 hours.",
+  "dontForget": "Don't forget",
+  "editable": "Editable",
+  "loading": "Loading...",
+  "locked": "Locked",
+  "lockFollowing": "Lock the following stages that are currently unlocked:",
+  "lockSettings": "Lock settings",
+  "lockStage": "Lock stage",
+  "lockStageInstructions": "2. Once time is up, \"Lock stage\" to hide questions.",
+  "lockWhenDone": "Lock as soon as students are done",
+  "relockStage": "Re-lock stage",
+  "relockStageInstructions": "4. \"Re-lock stage\" to prevent sharing of answers with other classes/schools.",
+  "save": "Save",
+  "saving": "Saving...",
+  "selectSection": "Select a section to be able to lock and unlock assessments or surveys. Click the lock settings button in the stage to the left.",
+  "student": "Student",
+  "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
+  "teacherPanel": "Teacher Panel",
+  "showAnswers": "Show answers",
+  "showAnswersInstructions": "3. \"Show answers\" to put the assessment into a read-only mode.",
+  "studentControl": "Individual student control",
+  "teacher": "Teacher",
+  "viewPageAs": "View page as:"
 }