Skip to content

Commit

Permalink
Merge branch 'develop' into answer-migration-and-summarizers-framework
Browse files Browse the repository at this point in the history 
Conflicts:
	core/controllers/editor.py
	core/controllers/reader.py
	core/domain/exp_domain.py
	core/domain/exp_services.py
	core/domain/stats_services_test.py
	core/templates/dev/head/pages/exploration_editor/EditorServicesSpec.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/pages/exploration_player/AnswerClassificationServiceSpec.js
	core/templates/dev/head/pages/exploration_player/PlayerServices.js
	core/templates/dev/head/pages/exploration_player/StatsReportingService.js
	extensions/interactions/LogicProof/stats_response.html
	extensions/interactions/MusicNotesInput/stats_response.html
  • Loading branch information
@BenHenning
BenHenning committed Apr 8, 2017
2 parents 3cf61f1 + 417a00d commit 1c2e059
Show file tree
Hide file tree
Showing 537 changed files with 32,710 additions and 15,162 deletions.
11 changes: 11 additions & 0 deletions .eslintignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
core/templates/dev/head/expressions/parser.js
core/templates/prod/*
core/tests/protractor.conf.js
extensions/interactions/LogicProof/static/js/generatedDefaultData.js
extensions/interactions/LogicProof/static/js/generatedParser.js
integrations/*
integrations_dev/*
assets/scripts/*
third_party/*
build/*
*.min.js
117 changes: 117 additions & 0 deletions .eslintrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
{
"extends": [
"eslint:recommended",
],
"plugins": [
"html"
],
"rules": {
"no-empty": [
"error",
{
"allowEmptyCatch": true
}
],
"no-redeclare": [
"off"
],
"no-unused-vars": [
"off"
],
"no-console": [
"off"
],
"no-constant-condition": [
"off"
],
"func-style": [
"error",
"expression"
],
"no-multi-str": [
"error"
],
"no-multi-spaces": [
"error"
],
"no-undef": [
"off"
],
"one-var": [
"off"
],
"padded-blocks": [
"error",
"never"
],
"quote-props": [
"error",
"as-needed",
{
"keywords": true
}
],
"space-unary-ops": [
"error",
{
"words": true,
"nonwords": false,
}
],
"space-before-function-paren": [
"error",
{
"anonymous": "ignore",
"named": "never"
}
],
"indent": [
"error",
2,
{
"ArrayExpression": "first",
"MemberExpression": 1,
"SwitchCase": 1
}
],
"max-len": [
"error",
"code": 80,
"ignoreUrls": true
],
"camelcase": [
"error",
{
"properties": "never"
}
],
"curly": [
"error",
"all"
],
"dot-notation": [
"error",
{
"allowKeywords": false
}
],
"operator-linebreak": [
"error",
"after"
],
"wrap-iife": [
"error",
"any"
],
"space-infix-ops": [
"error"
],
"quotes": [
"error",
"single",
{
"avoidEscape": true
}
]
}
}
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ venv/
.DS_Store
.idea
.vagrant/*
.lock

# Oppia uses cache slugs for various resources and we need separate resource
# directories for dev and prod. Resource directories for prod are generated
Expand Down
26 changes: 13 additions & 13 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,25 +83,25 @@ install:
- source scripts/setup_gae.sh || exit 1

script:
- 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_E2E_TESTS_MAIN_EDITOR == 'true' ]; then travis_retry bash scripts/run_e2e_tests.sh --suite="mainEditor"; fi
- if [ $RUN_E2E_TESTS_EDITOR_FEATURES == 'true' ]; then travis_retry bash scripts/run_e2e_tests.sh --suite="editorFeatures"; fi
- if [ $RUN_E2E_TESTS_EXTENSIONS == 'true' ]; then travis_retry bash scripts/run_e2e_tests.sh --suite="extensions"; fi
- if [ $RUN_E2E_TESTS_LIBRARY == 'true' ]; then travis_retry bash scripts/run_e2e_tests.sh --suite="library"; fi
- if [ $RUN_E2E_TESTS_MISC == 'true' ]; then travis_retry bash scripts/run_e2e_tests.sh --suite="misc"; fi
- if [ $RUN_E2E_TESTS_I18N == 'true' ]; then travis_retry 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
- if [ $RUN_FRONTEND_TESTS == 'true' ]; then travis_retry bash -x scripts/run_frontend_tests.sh --run-minified-tests=true; 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
- if [ $RUN_E2E_TESTS_MAIN_EDITOR_PROD == 'true' ]; then travis_retry bash scripts/run_e2e_tests.sh --suite="mainEditor" --prod_env; fi
- if [ $RUN_E2E_TESTS_EDITOR_FEATURES_PROD == 'true' ]; then travis_retry bash scripts/run_e2e_tests.sh --suite="editorFeatures" --prod_env; fi
- if [ $RUN_E2E_TESTS_EXTENSIONS_PROD == 'true' ]; then travis_retry bash scripts/run_e2e_tests.sh --suite="extensions" --prod_env; fi
- if [ $RUN_E2E_TESTS_LIBRARY_PROD == 'true' ]; then travis_retry bash scripts/run_e2e_tests.sh --suite="library" --prod_env; fi
- if [ $RUN_E2E_TESTS_MISC_PROD == 'true' ]; then travis_retry bash scripts/run_e2e_tests.sh --suite="misc" --prod_env; fi
- if [ $RUN_E2E_TESTS_I18N_PROD == 'true' ]; then travis_retry 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 Down
23 changes: 23 additions & 0 deletions AUTHORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,27 @@

Abhay Raizada <abhsag24@gmail.com>
Abhijit Suresh <abhijit5893@gmail.com>
Aditya Jain <adityajain.783@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>
Anthony Alridge <anthonyalridge270@gmail.com>
Anthony Zheng <Anthony@fopen-dream.space>
Arpan Banerjee <arpanbnrj9@gmail.com>
Arun Kumar <arunkumarm1995@gmail.com>
Arunabh Ghosh <arunabhghosh98@gmail.com>
Aubrey Wells <dozure@gmail.com>
Avijit Gupta <526avijit@gmail.com>
Barnabas Makonda <barnabasmakonda@gmail.com>
Ben Targan <ben.targan@gmail.com>
Bill Morrisson <billmorrissonjr@gmail.com>
BJ Voth <bjvoth86@gmail.com>
Bolaji Fatade <bjfatade@gmail.com>
Boyd Y. Ching <pooplacka@gmail.com>
Brenton Briggs <briggs.brenton@gmail.com>
Charisse De Torres <midorijikan@gmail.com>
Chase Albert <chase@mybasis.com>
Expand All @@ -41,6 +46,7 @@ Google Inc.
Grace Guo <graceguo43@gmail.com>
Hamza Chandad <zeiurfhc@gmail.com>
Himanshu Aggarwal <rackstar17@gmail.com>
Himanshu Dixit <hudixt@gmail.com>
Hitesh Sharma <hitesh96db@gmail.com>
Huong Le <minh_huong_148@yahoo.com>
Jackson Wu <jacksonwu.zg@gmail.com>
Expand All @@ -50,6 +56,7 @@ Jared Silver <jared@jaredsilver.name>
Jasmine Rider <jasamina13@gmail.com>
Jasper Deng <jasper.deng@gmail.com>
Jaysinh Shukla <jaysinhp@gmail.com>
Jenna Mandel <jenna.b.mandel@gmail.com>
Jérôme (zolk232) <zolk232@gmail.com>
Jerry Chen <jerry.c@berkeley.edu>
John Glennon <yeeons@gmail.com>
Expand All @@ -61,6 +68,8 @@ Kenneth Ho <a0125364@u.nus.edu>
Kerry Wang <kerryxwang@gmail.com>
Kevin Lee <leekevin@berkeley.edu>
Kevin Thomas <kevintab@tutanota.com>
Kiran Konduru <kiranckonduru@gmail.com>
Konstantinos Kagkelidis <kaggis@gmail.com>
Kristin Anthony <anthkris09@gmail.com>
Kumari Shalini <shaliniroy012@gmail.com>
Mamat Rahmat <coderbodoh@gmail.com>
Expand All @@ -71,38 +80,51 @@ Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Michael Mossey <michaelmossey@gmail.com>
Michael Wagner <wagnerdmike@gmail.com>
Milagro Teruel <milagro.teruel@gmail.com>
Mohit Gupta <thedeveloperrmail@gmail.com>
Mungo Dewar <mpjdewar@gmail.com>
Nalin Chhibber <nalin.chhibber@gmail.com>
Naveen Kumar Shukla <shuklank2709@gmail.com>
Nikhil Prakash <nikhil07prakash@gmail.com>
Nikhil Sangwan <nikhil.sangwan95@gmail.com>
Oskar Cieslik <oskar.cieslik@gmail.com>
Oswell Chan <oswellchan@gmail.com>
Owen Parry <owenparry@fastmail.fm>
Ozan Filiz <oznflz@gmail.com>
Philip Hayes <philiphayes9@gmail.com>
Phillip Moulton <moulton.dev@gmail.com>
Prasanna Patil <prasannapatil08@gmail.com>
Pratik Katte <pratikkatte7@gmail.com>
Raine Hoover <raine.hoover@gmail.com>
Rajan Garg <iamrajangarg@gmail.com>
Rajat Patwa <razat249@gmail.com>
Rajendra Kadam <rajendrakadam249@gmail.com>
Reto Brunner <brunnre8@gmail.com>
Richard Cho <won0089@gmail.com>
Rohan Gulati <rohangulati@gmail.com>
Ross Strader <strader@gmail.com>
Samara Trilling <samara.trilling@gmail.com>
Sandeep Dubey <dubeysandeep.in@gmail.com>
Santos Hernandez <hernandz@stanford.edu>
Sanyam Khurana <sanyam.khurana01@gmail.com>
Satmeet Ubhi <hello@ubhisat.com>
Satwik Kansal <satwikkansal@gmail.com>
Satyam Yadav <satyamyadav13579@gmail.com>
Scott Junner <scott.junner@gmail.com>
Sebastian Zangaro <szangaro@gmail.com>
Seth Beckman <beckmanseth@gmail.com>
Shafqat Dulal <shafqat.dulal@gmail.com>
Shivan Trivedi <shivanstar7@gmail.com>
Shivansh Bajaj <bajajshivansh1@gmail.com>
Shouvik Roy <vicks4uster@gmail.com>
Soumyo Dey <soumyodey@live.com>
Sourav Badami <souravbadami@gmail.com>
Sourav Singh <ssouravsingh12@gmail.com>
Sreenivasulu Giritheja <s.giritheja@gmail.com>
Sudhanva MG <mgsudhanva@gmail.com>
Tarashish Mishra <sunu0000@gmail.com>
Timothy Cyrus <tim.h.cyrus@gmail.com>
Tony Jiang <tjiang11@jhu.edu>
Tracy Homer <thomer@mac.com>
Travis Shafer <tdtshafer@gmail.com>
Truong Kim <kimphantruong@gmail.com>
Tuguldur Baigalmaa <philoniare@gmail.com>
Expand All @@ -113,5 +135,6 @@ Vojtěch Jelínek <vojtin.j@gmail.com>
Xinyu Wu <wxy.xinyu@gmail.com>
Yang Lu <andimeo@foxmail.com>
Yi Yan <chrno_crusade217@hotmail.com>
Yogesh Sharma <yogesh.sharma@research.iiit.ac.in>
Yousef Hamza <jo.adam.93@gmail.com>
Zoe Madden-Wood <maddenwood@gmail.com>
Loading

0 comments on commit 1c2e059

Please sign in to comment.