oppia · ghost · Feb 16, 2016 · Feb 29, 2016 · Mar 21, 2016 · Mar 21, 2016
@@ -14,3 +14,8 @@ venv/
 .DS_Store
 .idea
 .vagrant/*
+
+# Oppia uses cache slugs for various resources and we need separate resource
+# directories for dev and prod. Resource directories for prod are generated
+# via build.py and should not be committed to the repo.
+build/*
diff --git a/.jscsrc b/.jscsrc
@@ -11,8 +11,10 @@
         "extensions/interactions/LogicProof/static/js/generatedParser.js",
         "integrations/**",
         "integrations_dev/**",
-        "static/scripts/**",
-        "third_party/**"
+        "assets/scripts/**",
+        "third_party/**",
+        "build/**",
+        "**.min.js"
     ],
     "fileExtensions": [".js"],
     "extract": ["*.html"],

diff --git a/.travis.yml b/.travis.yml
@@ -87,7 +87,10 @@ script:
 # Travis aborts test run if nothing is printed back to STDOUT for some time.
 # -x is used to avoid that.
 - if [ $RUN_FRONTEND_TESTS == 'true' ]; then bash -x scripts/run_frontend_tests.sh --run-minified-tests=true; fi
-- if [ $RUN_PERFORMANCE_TESTS == 'true' ]; then bash scripts/run_performance_tests.sh; fi
+# TODO(gvishal): add all tests to travis. Running all tests on travis fails currently due to
+# unexplained reasons. Sometimes 2-4 out of the total 7 page tests succeed and then the next one
+# gets stuck for a long time.
+- if [ $RUN_PERFORMANCE_TESTS == 'true' ]; then bash scripts/run_performance_tests.sh --test_name=splash_test; fi
 
 after_success:
 - if [ $RUN_BACKEND_TESTS == 'true' ] && [ $REPORT_BACKEND_COVERAGE == 'true' ]; then codecov; fi

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Oppia is written using Python and AngularJS, and is built on top of Google App E
 
 <p align="center">
   <a href="http://www.youtube.com/watch?v=Ntcw0H0hwPU" target="_blank">
-    <img src="http://img.youtube.com/vi/Ntcw0H0hwPU/0.jpg">
+    <img src="https://cloud.githubusercontent.com/assets/8845039/16814722/b219cac0-4954-11e6-9573-c37557d1b410.png">
   </a>
 </p>
 

diff --git a/app.yaml b/app.yaml
@@ -15,34 +15,36 @@ inbound_services:
 
 handlers:
 - url: /favicon.ico
-  static_files: static/images/favicon.ico
-  upload: static/images/favicon.ico
+  static_files: assets/common/favicon.ico
+  upload: assets/common/favicon.ico
   secure: always
   http_headers:
     Cache-Control: 'public, max-age=2592000'
     Vary: Accept-Encoding
-- url: /images
-  static_dir: static/images
+- url: /robots.txt
+  static_files: assets/common/robots.txt
+  upload: assets/common/robots.txt
   secure: always
   http_headers:
-    Cache-Control: 'public, max-age=600'
-- url: /static/pages
-  static_dir: static/pages
+    Cache-Control: 'public, max-age=2592000'
+    Vary: Accept-Encoding
+- url: /build
+  static_dir: build
   secure: always
   http_headers:
-    Cache-Control: 'public, max-age=600'
-- url: /robots.txt
-  static_files: static/pages/robots.txt
-  upload: static/pages/robots.txt
+    Cache-Control: 'public, max-age=2592000'
+- url: /assets/common
+  static_dir: assets/common
   secure: always
   http_headers:
-    Cache-Control: 'public, max-age=2592000'
-    Vary: Accept-Encoding
-- url: /scripts
-  static_dir: static/scripts
+    # WARNING TO DEVELOPERS: Files in this folder may be stale for
+    # up to 10 mins after a code release.
+    Cache-Control: 'public, max-age=600'
+- url: /assets
+  static_dir: assets
   secure: always
   http_headers:
-    Cache-Control: 'no-cache'
+    Cache-Control: 'public, max-age=60'
 - url: /css
   # NB: not minified. TODO(sll): fix.
   static_dir: core/templates/dev/head/css
@@ -53,11 +55,6 @@ handlers:
   http_headers:
     Cache-Control: 'public, max-age=2592000'
     Vary: Accept-Encoding
-- url: /i18n
-  static_dir: i18n
-  secure: always
-  http_headers:
-    Cache-Control: 'no-cache'
 - url: /third_party/generated
   static_dir: third_party/generated
   secure: always
@@ -98,6 +95,10 @@ handlers:
   login: admin
   script: main_cron.app
   secure: always
+- url: /task/.*
+  login: admin
+  script: main_taskqueue.app
+  secure: always
 - url: /.*
   script: main.app
   secure: always
@@ -109,5 +110,8 @@ libraries:
   version: '1.6.1'
 - name: webapp2
   version: '2.5.2'
+# This environmental variable is for serving minified resources
+# when set to true. It allows minified resources to be used when
+# running the server in the dev environment.
 env_variables:
   MINIFICATION: false
@@ -1,5 +1,6 @@
 {
   "I18N_ABOUT_PAGE_TITLE": "About us - Oppia",
+  "I18N_ACTION_APPLY_TO_TEACH_WITH_OPPIA": "Apply to Teach With Oppia",
   "I18N_ACTION_BROWSE_EXPLORATIONS": "Browse our Explorations",
   "I18N_ACTION_CREATE_EXPLORATION": "Create your own Exploration",
   "I18N_CREATE_ACTIVITY_QUESTION": "What do you want to create?",
@@ -12,6 +13,7 @@
   "I18N_CREATE_EXPLORATION_UPLOAD": "Upload",
   "I18N_CREATE_NO_THANKS": "No, Thanks",
   "I18N_CREATE_YES_PLEASE": "Yes, please!",
+  "I18N_DASHBOARD_OPEN_FEEDBACK": "Open Feedback",
   "I18N_DASHBOARD_MY_COLLECTIONS": "My Collections",
   "I18N_DASHBOARD_MY_EXPLORATIONS": "My Explorations",
   "I18N_DIRECTIVES_DRAG_IMAGE_HERE": "Drag image here",

@@ -1,5 +1,6 @@
 {
   "I18N_ABOUT_PAGE_TITLE": "Acerca de nosotros - Oppia",
+  "I18N_ACTION_APPLY_TO_TEACH_WITH_OPPIA": "Aplica para \"Teach with Oppia\"",
   "I18N_ACTION_BROWSE_EXPLORATIONS": "Navega nuestras exploraciones",
   "I18N_ACTION_CREATE_EXPLORATION": "Crea tu propia exploración",
   "I18N_CREATE_ACTIVITY_QUESTION": "¿Que quieres crear?",
@@ -14,6 +15,7 @@
   "I18N_CREATE_YES_PLEASE": "¡Sí, por favor!",
   "I18N_DASHBOARD_MY_COLLECTIONS": "Mis Colecciones",
   "I18N_DASHBOARD_MY_EXPLORATIONS": "Mis Exploraciones",
+  "I18N_DASHBOARD_OPEN_FEEDBACK": "Retroalimentación abierta",
   "I18N_DIRECTIVES_DRAG_IMAGE_HERE": "Arrastra una imagen aquí",
   "I18N_DIRECTIVES_OR_SELECT_FILE": "o selecciona un archivo de imagen:",
   "I18N_ERROR_DISABLED_EXPLORATION": "Exploración deshabilitada",

@@ -1,5 +1,6 @@
 {
   "I18N_ABOUT_PAGE_TITLE": "Tentang kami - Oppia",
+  "I18N_ACTION_APPLY_TO_TEACH_WITH_OPPIA": "Mendaftar ke \"Teach with Oppia\"",
   "I18N_ACTION_BROWSE_EXPLORATIONS": "Lihat eksplorasi kami",
   "I18N_ACTION_CREATE_EXPLORATION": "Buat eksplorasimu sendiri",
   "I18N_CREATE_ACTIVITY_QUESTION": "Apa yang ingin anda buat?",
@@ -12,6 +13,7 @@
   "I18N_CREATE_EXPLORATION_UPLOAD": "Unggah",
   "I18N_CREATE_NO_THANKS": "Tidak, Terima Kasih",
   "I18N_CREATE_YES_PLEASE": "Ya, tentu!",
+  "I18N_DASHBOARD_OPEN_FEEDBACK": "Terbuka umpan balik",
   "I18N_DASHBOARD_MY_COLLECTIONS": "Koleksiku",
   "I18N_DASHBOARD_MY_EXPLORATIONS": "Eksplorasiku",
   "I18N_DIRECTIVES_DRAG_IMAGE_HERE": "Tarik gambar ke sini",

@@ -1,5 +1,6 @@
 {
   "I18N_ABOUT_PAGE_TITLE": "Sobre nós - Oppia",
+  "I18N_ACTION_APPLY_TO_TEACH_WITH_OPPIA": "Candidata-te ao programa \"Teach with Oppia\"",
   "I18N_ACTION_BROWSE_EXPLORATIONS": "Procura as nossas explorações",
   "I18N_ACTION_CREATE_EXPLORATION": "Cria a tua exploração",
   "I18N_CREATE_ACTIVITY_QUESTION": "O que queres criar?",
@@ -12,6 +13,7 @@
   "I18N_CREATE_EXPLORATION_UPLOAD": "Carregar",
   "I18N_CREATE_NO_THANKS": "Não, obrigado",
   "I18N_CREATE_YES_PLEASE": "Sim, por favor!",
+  "I18N_DASHBOARD_OPEN_FEEDBACK": "Feedback aberto",
   "I18N_DASHBOARD_MY_COLLECTIONS": "As minhas colecções",
   "I18N_DASHBOARD_MY_EXPLORATIONS": "As minhas Explorações",
   "I18N_DIRECTIVES_DRAG_IMAGE_HERE": "Arranta uma imagem para aqui",
@@ -134,6 +136,7 @@
   "I18N_LIBRARY_GROUPS_SCIENCE" : "Ciências",
   "I18N_LIBRARY_GROUPS_SOCIAL_SCIENCE": "Ciências Sociais",
   "I18N_LIBRARY_GROUPS_TOP_RATED_EXPLORATIONS": "Explorações bem Classificadas",
+  "I18N_LIBRARY_LAST_UPDATED": "Ultima atualização",
   "I18N_LIBRARY_LOADING": "A carregar",
   "I18N_LIBRARY_MAIN_HEADER": "Imagina o que poderás aprender hoje...",
   "I18N_LIBRARY_N/A": "N/D",

@@ -1,5 +1,6 @@
 {
   "I18N_ABOUT_PAGE_TITLE": "Title of the About page that explains Oppia mission and the Oppia foundation.",
+  "I18N_ACTION_APPLY_TO_TEACH_WITH_OPPIA": "Text displayed in a button on the Teach page. - When the user clicks the button they are taken to a form that allows them to apply to the 'Teach with Oppia' program.",
   "I18N_ACTION_BROWSE_EXPLORATIONS": "Text displayed in a button on the Home and Teach pages. - When the user clicks the button they are taken to the library page.",
   "I18N_ACTION_CREATE_EXPLORATION": "Text displayed in a button on the Home and Teach pages. - When the user clicks the button they are taken to their dashboard, and a dialog is opened where the user can create a new exploration.",
   "I18N_CREATE_ACTIVITY_QUESTION": "Text displayed as the first sentence in a dialog. - The dialog appears when the user clicks the I18N_CREATE_EXPLORATION_CREATE button.",
@@ -12,6 +13,7 @@
   "I18N_CREATE_EXPLORATION_UPLOAD": "Text displayed in a button in the navigation bar",
   "I18N_CREATE_NO_THANKS": "Text of the cancel button of a dialog. - see I18N_CREATE_EXPLORATION_CREATE.",
   "I18N_CREATE_YES_PLEASE": "Text of the confirmation button of a dialog. - see I18N_CREATE_EXPLORATION_CREATE.",
+  "I18N_DASHBOARD_OPEN_FEEDBACK": "Text of feedback icon shown in summary tile of an exploration in card view in the user's dashboard page.",
   "I18N_DASHBOARD_MY_COLLECTIONS": "Title shown in a tab header in the user's dashboard page. - Clicking on this tab header shows a list of the collections the user has created.",
   "I18N_DASHBOARD_MY_EXPLORATIONS": "Title shown in a tab header in the user's dashboard page. - Clicking on this tab header shows a list of the explorations the user has created.",
   "I18N_DIRECTIVES_DRAG_IMAGE_HERE": "Text displayed in the preferences page. - Text shown in the dialog shown to upload a profile picture. The user can upload the picture by dragging a file to the area with this text.",