Skip to content

Commit

Permalink
Merge branch 'answer-summarizers-framework' into answer-migration
Browse files Browse the repository at this point in the history
Conflicts:
	core/controllers/editor.py
	core/controllers/editor_test.py
	core/controllers/reader.py
	core/domain/exp_domain.py
	core/domain/stats_services.py
	core/domain/stats_services_test.py
	core/templates/dev/head/admin/Admin.js
	core/templates/dev/head/pages/exploration_editor/main_tab/StateEditor.js
	core/templates/dev/head/pages/exploration_editor/statistics_tab/StatisticsTab.js
	core/templates/dev/head/pages/exploration_player/AnswerClassificationService.js
	core/templates/dev/head/player/AnswerClassificationServiceSpec.js
	core/tests/test_utils.py
	extensions/interactions/base.py
	main.py
  • Loading branch information
BenHenning committed Oct 1, 2016
2 parents afdc830 + 8ae8327 commit 00f90c8
Show file tree
Hide file tree
Showing 684 changed files with 23,863 additions and 11,238 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
6 changes: 4 additions & 2 deletions .jscsrc
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
39 changes: 30 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,33 @@ branches:

env:
matrix:
- RUN_E2E_TESTS_EDITOR=true
- RUN_E2E_TESTS_MAIN_EDITOR=true
- RUN_E2E_TESTS_EDITOR_FEATURES=true
- RUN_E2E_TESTS_EXTENSIONS=true
- RUN_E2E_TESTS_LIBRARY=true
- 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
- RUN_E2E_TESTS_MAIN_EDITOR_PROD=true
- RUN_E2E_TESTS_EDITOR_FEATURES_PROD=true
- RUN_E2E_TESTS_EXTENSIONS_PROD=true
- RUN_E2E_TESTS_LIBRARY_PROD=true
- 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:
email:
recipients:
- sean@seanlip.org
- henning.benmax@gmail.com
- briggs.brenton@gmail.com
- wxy.xinyu@gmail.com
on_success: change
on_failure: change
Expand All @@ -61,6 +68,7 @@ notifications:
before_install:
- pip install codecov
- pip install numpy==1.6.1
- pip install pyyaml
- export CHROME_BIN=/usr/bin/google-chrome-stable
- export DISPLAY=:99.0
- bash -e /etc/init.d/xvfb start
Expand All @@ -72,16 +80,29 @@ install:
- source scripts/setup_gae.sh || exit 1

script:
- if [ $RUN_E2E_TESTS_EDITOR == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="editor"; fi
- if [ $RUN_E2E_TESTS_MAIN_EDITOR == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="mainEditor"; fi
- if [ $RUN_E2E_TESTS_EDITOR_FEATURES == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="editorFeatures"; fi
- if [ $RUN_E2E_TESTS_EXTENSIONS == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="extensions"; fi
- if [ $RUN_E2E_TESTS_LIBRARY == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="library"; fi
- if [ $RUN_E2E_TESTS_MISC == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="misc"; fi
- if [ $RUN_E2E_TESTS_I18N == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="i18n"; fi
- if [ $RUN_BACKEND_TESTS == 'true' ] && [ $REPORT_BACKEND_COVERAGE == 'true' ]; then bash scripts/run_backend_tests.sh --generate_coverage_report; fi
- if [ $RUN_BACKEND_TESTS == 'true' ] && [ $REPORT_BACKEND_COVERAGE == 'false' ]; then bash scripts/run_backend_tests.sh; fi
- if [ $RUN_LINT == 'true' ]; then bash scripts/install_third_party.sh; python scripts/pre_commit_linter.py --path=.; fi
# 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
# 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
# Run e2e tests in production mode
- if [ $RUN_E2E_TESTS_MAIN_EDITOR_PROD == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="mainEditor" --prod_env; fi
- if [ $RUN_E2E_TESTS_EDITOR_FEATURES_PROD == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="editorFeatures" --prod_env; fi
- if [ $RUN_E2E_TESTS_EXTENSIONS_PROD == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="extensions" --prod_env; fi
- if [ $RUN_E2E_TESTS_LIBRARY_PROD == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="library" --prod_env; fi
- if [ $RUN_E2E_TESTS_MISC_PROD == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="misc" --prod_env; fi
- if [ $RUN_E2E_TESTS_I18N_PROD == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="i18n" --prod_env; fi

after_success:
- if [ $RUN_BACKEND_TESTS == 'true' ] && [ $REPORT_BACKEND_COVERAGE == 'true' ]; then codecov; fi
Expand All @@ -96,4 +117,4 @@ cache:

before_cache:
# Delete python bytecode to prevent cache rebuild.
- find third_party -name "*.pyc" -print -delete
- find third_party -name "*.pyc" -print -delete
9 changes: 9 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@
#
# 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>
Ana Francisca Bernardo <anafranciscabernardo@gmail.com>
Andrew Low <kahkhang@gmail.com>
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>
Expand All @@ -32,6 +36,8 @@ 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>
Jasper Deng <jasper.deng@gmail.com>
Expand All @@ -46,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>
Expand All @@ -59,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>
Expand All @@ -79,6 +87,7 @@ Sreenivasulu Giritheja <s.giritheja@gmail.com>
Tarashish Mishra <sunu0000@gmail.com>
Timothy Cyrus <tim.h.cyrus@gmail.com>
Travis Shafer <tdtshafer@gmail.com>
Truong Kim <kimphantruong@gmail.com>
Tuguldur Baigalmaa <philoniare@gmail.com>
Umesh Singla <umeshksingla@gmail.com>
Viraj Prabhu <prabhuviraj@gmail.com>
Expand Down
154 changes: 154 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,160 @@ 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:
* Fix #1366: redesign the creator dashboard to highlight stats and display card/list view.
* Fix #461: implement functionality for sending emails to creators when they receive feedback messages on their explorations.
* Remove the "neither, thanks" option from the activity creation modal.
* Implemented a version of stats_services.get_top_state_rule_answers to
fetch answers for multiple explorations simultaneously.

Library page:
* Read featured activities from a list, in order to reduce loading time in the library.
* Change "featured explorations" to "featured activities" in the library.
* Add scripts to randomize the library banner image.
* Fix #2013: correctly align the banner image.
* Fix #2164: expand the width of an exploration summary tile to match the width for the collection summary tile.
* Fix #1979: fix alignment of the carousel scroll buttons.
* Fix #2144: position the language dropdown selector correctly in the navbar for screen widths less than 1230px.
* Fully remove the 'contributors' field from the exploration summary data passed to the frontend.

Learner page:
* Fix #1795: add social sharing icons to the end of an exploration.
* Fix #2113: prevent recommended explorations from disappearing behind the tutor card on small screens.
* Fix missing text next to player feedback checkbox.
* Remove the standard navbar tabs from the collection player.

Editor page:
* Use the graph visualization in the history tab to display the changes when an exploration is saved, and remove the corresponding logic from the backend.
* Fix #1801: modify the “publish exploration” modal to be more visually appealing.
* Add a button to the exploration preview tab that allows the user to restart from the initial card.
* Show a list of all current parameter values in preview mode.
* Hide the exploration graph if there is only one card in the exploration.
* Fix #2078: prevent unsaved changes from being lost when editing a state name.
* Change the wording for the "featuring" functionality in the exploration settings tab to indicate that this no longer places the exploration in the “Featured Activities” group in the library.

Profile page:
* Fix #1867: prevent the tooltips on the summary tiles from flickering.
* Fix #2075: make the subject interests wrap properly.

Preferences page:
* Fix #2092: prevent the dropdown placeholders from showing i18n keys instead of the correct placeholders.
* Fix #2089: update the display of the text field for Preferred Languages on mobile phones.

I18n:
* Add Indonesian and Portuguese translations.
* Add a qqq.json file with explanations of translation keys.
* Add tests to verify keys in i18n json files.
* Fix #2117: add i18n for title of creator dashboard.
* Fix #2120: add i18n for the buttons on the Teach page.
* Fix #2121: remove unused keys from translation JSON files.

Other pages:
* Fix #2023: display the About page tabs correctly on small-width screens.
* Add a Donate page.
* Remove redundant /participate page, add redirect URLs, and add a new URL for the 'Contact us' page.

UI (general):
* Fix #2108: remove rounded corners from the select2 dropdown.
* Fix #2035: replace glyphicons with material icons.
* Fix #2091: adjust footer on smaller screens.
* Fix #1901: move terms/privacy links to the footer.

Rich-text components:
* Fix #1931: add caption functionality for images

Interactions:
* Fix #2074: for ItemSelectionInput, display the rule selections correctly.
* Fix #1740: for CodeRepl, start at the top of the code when initially displaying the Python coding window.
* InteractiveMap: fix width of map on narrow viewports.

Infrastructure and tests:
* Move the rules to a rules.json file that is accessible by both the frontend and backend.
* Fix #2047: add a performance testing framework.
* Remove obsolete configuration properties.
* Add a new task queue for backups.
* Fix #1857: add a flag allowing developers to enable minification on the dev server.
* Fix #1974: add pattern checks for ‘==’ and ‘!=’ in JavaScript files.
* Divide the editor e2e test suite into mainEditor and editorFeatures.


v2.3.0 (7 Jun 2016)
-------------------
Site-wide features:
Expand Down
Loading

0 comments on commit 00f90c8

Please sign in to comment.