Merge branch 'master' into develop

Conflicts: core/templates/dev/head/pages/about.html
oppia · Aug 8, 2016 · 21fadc9 · 21fadc9
2 parents 53c2d47 + 1e57e0c
commit 21fadc9
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,8 @@ env:
     - RUN_E2E_TESTS_MISC=true
     - RUN_E2E_TESTS_I18N=true
     - RUN_BACKEND_TESTS=true REPORT_BACKEND_COVERAGE=false
-    - RUN_BACKEND_TESTS=true REPORT_BACKEND_COVERAGE=true
+    # TODO(sll): Reinstate this when we can get it to run in reasonable time.
+    # - RUN_BACKEND_TESTS=true REPORT_BACKEND_COVERAGE=true
     - RUN_LINT=true
     - RUN_FRONTEND_TESTS=true
     - RUN_PERFORMANCE_TESTS=true
@@ -40,10 +41,7 @@ env:
     - RUN_E2E_TESTS_MISC_PROD=true
     - RUN_E2E_TESTS_I18N_PROD=true
 matrix:
-  allow_failures:
-  # The backend tests, with coverage, take too long to run, so we make this
-  # optional.
-  - env: RUN_BACKEND_TESTS=true REPORT_BACKEND_COVERAGE=true
+  allow_failures: []
   fast_finish: true
 
 notifications:

diff --git a/AUTHORS b/AUTHORS
@@ -8,6 +8,7 @@
 #
 # Please keep the list sorted alphabetically.
 
+Abhay Raizada <abhsag24@gmail.com>
 Abhijit Suresh <abhijit5893@gmail.com>
 Alex Gower <alexanderpgower@gmail.com>
 Allan Zhou <allan.zhou@berkeley.edu>
@@ -17,6 +18,7 @@ Andrey Mironyuk <andmir92@yahoo.com>
 Anggoro Dewanto <anggorodewanto@gmail.com>
 Anmol Shukla <anmol.shkl@gmail.com>
 Arun Kumar <arunkumarm1995@gmail.com>
+Arunabh Ghosh <arunabhghosh98@gmail.com>
 Avijit Gupta <526avijit@gmail.com>
 Barnabas Makonda <barnabasmakonda@gmail.com>
 Ben Targan <ben.targan@gmail.com>
@@ -34,6 +36,7 @@ Frederik Creemers <frederikcreemers@gmail.com>
 Google Inc.
 Grace Guo <graceguo43@gmail.com>
 Hitesh Sharma <hitesh96db@gmail.com>
+Huong Le <minh_huong_148@yahoo.com>
 Jackson Wu <jacksonwu.zg@gmail.com>
 Jacob Davis <jacobdavis11@gmail.com>
 Jakub Osika <osika.jakub@gmail.com>
@@ -49,6 +52,7 @@ Kathryn Patterson <katp@wegrok.net>
 Kenneth Ho <a0125364@u.nus.edu>
 Kerry Wang <kerryxwang@gmail.com>
 Kevin Lee <leekevin@berkeley.edu>
+Kevin Thomas <kevintab@tutanota.com>
 Kristin Anthony <anthkris09@gmail.com>
 Kumari Shalini <shaliniroy012@gmail.com>
 Marcel Schmittfull <marcel-sl@gmx.de>
@@ -62,6 +66,7 @@ Oskar Cieslik <oskar.cieslik@gmail.com>
 Oswell Chan <oswellchan@gmail.com>
 Owen Parry <owenparry@fastmail.fm>
 Philip Hayes <philiphayes9@gmail.com>
+Phillip Moulton <moulton.dev@gmail.com>
 Prasanna Patil <prasannapatil08@gmail.com>
 Raine Hoover <raine.hoover@gmail.com>
 Rajat Patwa <razat249@gmail.com>

diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,81 @@ This file contains a summary of changes to the Oppia code base. For a full chang
 
     https://github.com/oppia/oppia/commits/master
 
+
+v2.3.2 (7 Aug 2016)
+-------------------
+Splash, About and Donation pages:
+* Add donation page.
+* Add video to donation page.
+* Update About, Teach and Contact pages.
+* Add different splash pages for splash page experiments.
+* Change Forum link to Donate.
+* Fix #2277: Make credit columns equal length in credits.
+
+Creator Dashboard:
+* Show number of unresolved answers and open feedback in creator dashboard.
+* Display relative (weekly) change in average ratings statistics.
+* Add realtime layer for UserStats continuous job.
+* Make current UI of creator dashboard responsive.
+* Fix #2222: Make width of tiles add up to the width of the top bar.
+
+Performance:
+* Fix #2048: Add performance tests for various Oppia pages.
+* Add cache slugs to cache static assets.
+* Combine multiple font requests into one.
+* Add pre-rendering.
+* Fix #2293: tests for cache slugs.
+* Fix #2063: convert continuous jobs into one-off jobs.
+* Add a new main_taskqueue.py file for taskqueue handlers.
+
+i18n:
+* Fix #2179: Add Vietnamese translation.
+* Fix #2301: Added hindi translation.
+* Fix #2229: Add test to match en.json and qqq.json.
+* Fix #2274: Remove blank line in language selector on home page.
+
+Editor:
+* Fix #1863: Suppress warnings if all answers handled in item selection input.
+* Don't show the creation modal in the 'create activity' flow if it's not needed.
+* Fix #2017: Update publish button to show number of changes that are made.
+* Fix #1862: Creator no longer has to remove pre-existing text in content editor.
+* Fix #2094: Change 'Done' button to 'Save' and color it green in state title editor.
+* Fix #2176: Add minimum length to the objective of exploration.
+* Fix #1966: Remove the option for links to open in same window in RTE.
+* Fix #2337: Show feedback in the fallback editor.
+* Style the placeholder for multiple-choice input.
+
+Emails:
+* Fix #2211: send suggestion email to owner of exploration.
+* Fix #2258: Do not send feedback messages if user has already seen to them.
+* Add noreply email for notification emails.
+
+Admin page:
+* Fix #2197: Refresh admin page keeps it at same location.
+* Fix #2195: Add auto-scroll to show output in jobs tab.
+* Fix #2196: Add alternating colors to jobs list on admin page
+* Hide the 'Activities' tab in the production environment.
+
+Collections:
+* Fix #1990: Add ability to edit language code and tags in collection editor.
+* Fix #2116: Remove return to collection button.
+
+Development workflow:
+* Fix #2232: Do not show unnecessary feconf version change info in the release info generated by the release info script.
+* Update chromedriver to fix an e2e test bug.
+* Add more logging to the Python linter.
+* Fix #2271: Add documentation about minification flag and check for bad pattern before committed.
+* Fixes for the deploy script.
+
+Misc:
+* Remove PAGE_NAME_FOR_CSRF when generating CSRF token.
+* Alphabetize and limit GLOBALS to 80 chars in html.
+* Add diagnostic one-off job to highlight ItemSelectionInput interactions whose answer groups need to be fixed.
+* Normalize whitespace, and capitalization in strings in code interaction.
+* Add analytics events.
+* Fix #2247: Update README image.
+
+
 v2.3.1 (3 Jul 2016)
 -------------------
 Creator dashboard and notifications:

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -20,6 +20,7 @@
 #
 # Please keep the list sorted alphabetically.
 
+Abhay Raizada <abhsag24@gmail.com>
 Abhijit Suresh <abhijit5893@gmail.com>
 Abraham Mgowano <mgowano@google.com>
 Alex Gower <alexanderpgower@gmail.com>
@@ -32,6 +33,7 @@ Angela Park <her@google.com>
 Anggoro Dewanto <anggorodewanto@gmail.com>
 Anmol Shukla <anmol.shkl@gmail.com>
 Arun Kumar <arunkumarm1995@gmail.com>
+Arunabh Ghosh <arunabhghosh98@gmail.com>
 Avijit Gupta <526avijit@gmail.com>
 Barnabas Makonda <barnabasmakonda@gmail.com>
 Ben Henning <bhenning@google.com>
@@ -50,6 +52,7 @@ Estelle Lee <estelle0500@gmail.com>
 Frederik Creemers <frederikcreemers@gmail.com>
 Grace Guo <graceguo43@gmail.com>
 Hitesh Sharma <hitesh96db@gmail.com>
+Huong Le <minh_huong_148@yahoo.com>
 Jackson Wu <jacksonwu.zg@gmail.com>
 Jacob Davis <jacobdavis11@gmail.com>
 Jakub Osika <osika.jakub@gmail.com>
@@ -66,6 +69,7 @@ Kathryn Patterson <katp@wegrok.net>
 Kenneth Ho <a0125364@u.nus.edu>
 Kerry Wang <kerryxwang@gmail.com>
 Kevin Lee <leekevin@berkeley.edu>
+Kevin Thomas <kevintab@tutanota.com>
 Koji Ashida <kashida@google.com>
 Kristin Anthony <anthkris09@gmail.com>
 Kumari Shalini <shaliniroy012@gmail.com>
@@ -84,6 +88,7 @@ Oswell Chan <oswellchan@gmail.com>
 Owen Parry <owenparry@fastmail.fm>
 Phil Wagner <philhwagner@gmail.com>
 Philip Hayes <philiphayes9@gmail.com>
+Phillip Moulton <moulton.dev@gmail.com>
 Prasanna Patil <prasannapatil08@gmail.com>
 Raine Hoover <raine.hoover@gmail.com>
 Rajat Patwa <razat249@gmail.com>

diff --git a/app.yaml b/app.yaml
@@ -1,5 +1,5 @@
 application: oppiaserver
-version: 2-3-1
+version: 2-3-2
 runtime: python27
 api_version: 1
 threadsafe: false

diff --git a/core/templates/dev/head/pages/about.html b/core/templates/dev/head/pages/about.html
@@ -156,6 +156,7 @@ <h2>Credits</h2>
           <div class="oppia-about-credits-letter-groups three-col">
             <span>A</span>
             <ul>
+              <li>Abhay Raizada</li>
               <li>Abhijit Suresh</li>
               <li>Abraham Mgowano</li>
               <li>Alex Gower</li>
@@ -168,6 +169,7 @@ <h2>Credits</h2>
               <li>Anggoro Dewanto</li>
               <li>Anmol Shukla</li>
               <li>Arun Kumar</li>
+              <li>Arunabh Ghosh</li>
               <li>Avijit Gupta</li>
             </ul>
 
@@ -214,6 +216,7 @@ <h2>Credits</h2>
             <span>H</span>
             <ul>
               <li>Hitesh Sharma</li>
+              <li>Huong Le</li>
             </ul>
 
             <span>J</span>
@@ -238,6 +241,7 @@ <h2>Credits</h2>
               <li>Kenneth Ho</li>
               <li>Kerry Wang</li>
               <li>Kevin Lee</li>
+              <li>Kevin Thomas</li>
               <li>Koji Ashida</li>
               <li>Kristin Anthony</li>
               <li>Kumari Shalini</li>
@@ -268,6 +272,7 @@ <h2>Credits</h2>
             <ul>
               <li>Phil Wagner</li>
               <li>Philip Hayes</li>
+              <li>Phillip Moulton</li>
               <li>Prasanna Patil</li>
             </ul>
 

diff --git a/core/tests/karma.conf.js b/core/tests/karma.conf.js
@@ -2,7 +2,7 @@ var argv = require('yargs').argv;
 var isMinificationNeeded = (argv.minify === 'True');
 var generatedJs = 'third_party/generated/js/third_party.js';
 if (isMinificationNeeded) {
-  generatedJs = 'third_party/generated/prod/js/third_party.min.js';
+  generatedJs = 'third_party/generated/js/third_party.min.js';
 };
 
 module.exports = function(config) {