forked from oppia/oppia
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'answer-summarizers-framework' into answer-migration
Conflicts: core/domain/stats_domain.py core/domain/stats_services.py core/domain/stats_services_test.py core/storage/base_model/gae_models.py core/templates/dev/head/pages/admin/Admin.js core/templates/dev/head/pages/admin/admin.html
- Loading branch information
Showing
394 changed files
with
24,503 additions
and
6,012 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,7 +33,6 @@ env: | |
| # - 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 | ||
|
|
@@ -48,7 +47,7 @@ notifications: | |
| email: | ||
| recipients: | ||
| - [email protected] | ||
| - briggs.brenton@gmail.com | ||
| - henning.benmax@gmail.com | ||
| - [email protected] | ||
| on_success: change | ||
| on_failure: change | ||
|
|
@@ -66,6 +65,10 @@ notifications: | |
| on_failure: always | ||
|
|
||
| before_install: | ||
| # For the rationale behind the next two lines, see: | ||
| # https://github.com/travis-ci/travis-ci/issues/6928#issuecomment-264227708 | ||
| - source /opt/jdk_switcher/jdk_switcher.sh | ||
| - jdk_switcher use oraclejdk8 | ||
| - pip install codecov | ||
| - pip install numpy==1.6.1 | ||
| - pip install pyyaml | ||
|
|
@@ -92,11 +95,7 @@ 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 | ||
| # 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 | ||
| # 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 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,29 +17,37 @@ Andrew Low <[email protected]> | |
| Andrey Mironyuk <[email protected]> | ||
| Anggoro Dewanto <[email protected]> | ||
| Anmol Shukla <[email protected]> | ||
| Anthony Zheng <[email protected]> | ||
| Arun Kumar <[email protected]> | ||
| Arunabh Ghosh <[email protected]> | ||
| Avijit Gupta <[email protected]> | ||
| Barnabas Makonda <[email protected]> | ||
| Ben Targan <[email protected]> | ||
| Bill Morrisson <[email protected]> | ||
| BJ Voth <[email protected]> | ||
| Bolaji Fatade <[email protected]> | ||
| Brenton Briggs <[email protected]> | ||
| Charisse De Torres <[email protected]> | ||
| Chase Albert <[email protected]> | ||
| Chin Zhan Xiong <[email protected]> | ||
| Cihan Bebek <[email protected]> | ||
| Corey Hunter <[email protected]> | ||
| Debanshu Bhaumik <[email protected]> | ||
| Deepank Agarwal <[email protected]> | ||
| Edward Allison <[email protected]> | ||
| Estelle Lee <[email protected]> | ||
| Frederik Creemers <[email protected]> | ||
| Google Inc. | ||
| Grace Guo <[email protected]> | ||
| Hamza Chandad <[email protected]> | ||
| Himanshu Aggarwal <[email protected]> | ||
| Hitesh Sharma <[email protected]> | ||
| Huong Le <[email protected]> | ||
| Jackson Wu <[email protected]> | ||
| Jacob Davis <[email protected]> | ||
| Jakub Osika <[email protected]> | ||
| Jared Silver <[email protected]> | ||
| Jasmine Rider <[email protected]> | ||
| Jasper Deng <[email protected]> | ||
| Jaysinh Shukla <[email protected]> | ||
| Jérôme (zolk232) <[email protected]> | ||
|
|
@@ -55,16 +63,20 @@ Kevin Lee <[email protected]> | |
| Kevin Thomas <[email protected]> | ||
| Kristin Anthony <[email protected]> | ||
| Kumari Shalini <[email protected]> | ||
| Mamat Rahmat <[email protected]> | ||
| Marcel Schmittfull <[email protected]> | ||
| Mark Cabanero <[email protected]> | ||
| Mark Halpin <[email protected]> | ||
| Maurício Meneghini Fauth <[email protected]> | ||
| Michael Mossey <[email protected]> | ||
| Michael Wagner <[email protected]> | ||
| Milagro Teruel <[email protected]> | ||
| Mungo Dewar <[email protected]> | ||
| Naveen Kumar Shukla <[email protected]> | ||
| Oskar Cieslik <[email protected]> | ||
| Oswell Chan <[email protected]> | ||
| Owen Parry <[email protected]> | ||
| Ozan Filiz <[email protected]> | ||
| Philip Hayes <[email protected]> | ||
| Phillip Moulton <[email protected]> | ||
| Prasanna Patil <[email protected]> | ||
|
|
@@ -73,26 +85,33 @@ Rajat Patwa <[email protected]> | |
| Rajendra Kadam <[email protected]> | ||
| Reto Brunner <[email protected]> | ||
| Richard Cho <[email protected]> | ||
| Ross Strader <[email protected]> | ||
| Samara Trilling <[email protected]> | ||
| Santos Hernandez <[email protected]> | ||
| Sanyam Khurana <[email protected]> | ||
| Satmeet Ubhi <[email protected]> | ||
| Satwik Kansal <[email protected]> | ||
| Scott Junner <[email protected]> | ||
| Sebastian Zangaro <[email protected]> | ||
| Seth Beckman <[email protected]> | ||
| Shafqat Dulal <[email protected]> | ||
| Shouvik Roy <[email protected]> | ||
| Soumyo Dey <[email protected]> | ||
| Sourav Badami <[email protected]> | ||
| Sourav Singh <[email protected]> | ||
| Sreenivasulu Giritheja <[email protected]> | ||
| Tarashish Mishra <[email protected]> | ||
| Timothy Cyrus <[email protected]> | ||
| Tony Jiang <[email protected]> | ||
| Travis Shafer <[email protected]> | ||
| Truong Kim <[email protected]> | ||
| Tuguldur Baigalmaa <[email protected]> | ||
| Umesh Singla <[email protected]> | ||
| Viraj Prabhu <[email protected]> | ||
| Vishal Gupta <[email protected]> | ||
| Vojtěch Jelínek <[email protected]> | ||
| Xinyu Wu <[email protected]> | ||
| Yang Lu <[email protected]> | ||
| Yi Yan <[email protected]> | ||
| Yousef Hamza <[email protected]> | ||
| Zoe Madden-Wood <[email protected]> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.