Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into questions-projec…
Browse files Browse the repository at this point in the history
…t-p2

* upstream/develop: (129 commits)
  Fix 3946: Add visualization for Item selection inputs (oppia#4080)
  Remove feedback button from mobile learner view. (oppia#4093)
  Fix oppia#3289: Introduce domain objects for answer calculation output (oppia#4036)
  Renamed RTC_specs to RTC_definitions and removed useless __init__.py file. (oppia#4101)
  Fix exploration graph directive URL. (oppia#4098)
  Fix error in one off stats migration job. (oppia#4068)
  Add state id mapping mapreduce job to the job registry (oppia#4099)
  Added underline to 'Back to collection' link (oppia#4096)
  Minor updates to CHANGELOG v2.5.6 after proofreading (oppia#4097)
  Update Authors, Contributors, Changelog, Credits for Release 2.5.6. (oppia#4095)
  Prevent hint tooltip from going offscreen on mobile (oppia#4087)
  Implement one off MapRreduce job to generate state id mapping model for explorations. (oppia#4088)
  Routine update of translations. (oppia#4082)
  Fix part of oppia#3954: Created a Page Object for Thanks Page (oppia#4085)
  Rename CSS property oppia-learner-continue-button to oppia-learner-confirm-button; Make the Submit button in ItemSelectionInput the same style as the Continue button; Move informational text in ItemSelectionInput from bottom-right to top of the interaction so that it is more visible; Add extra text to ItemSelectionInput indicating to the learner that they may select more than one choice. (oppia#4083)
  Stop cards from going offscreen in mobile learner view. (oppia#4084)
  Upgrade SSL library version; remove obsolete challenge-response handler. (oppia#4081)
  Fix part of oppia#3826: extract from EditorServices.js (oppia#3970)
  Fix part of oppia#3826: Extract services from app.js (oppia#4079)
  Fix oppia#4055: Replaced redundant CSS selectors. (oppia#4059)
  ...
  • Loading branch information
giritheja committed Nov 25, 2017
2 parents fe34005 + 039f024 commit bc0afd7
Show file tree
Hide file tree
Showing 537 changed files with 17,908 additions and 9,717 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
core/templates/dev/head/expressions/parser.js
core/templates/dev/head/expressions/ExpressionParserService.js
backend_prod_files/*
core/tests/protractor.conf.js
extensions/interactions/LogicProof/static/js/generatedDefaultData.js
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ notifications:
recipients:
- sean@seanlip.org
- henning.benmax@gmail.com
- wxy.xinyu@gmail.com
- tzjiang1@gmail.com
on_success: change
on_failure: change
irc:
Expand Down
13 changes: 13 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@
#
# Please keep the list sorted alphabetically.

Aashish Gaba <aashishgaba097@gmail.com>
Abhay Raizada <abhsag24@gmail.com>
Abhijit Suresh <abhijit5893@gmail.com>
Abhishek Arya <abhishekarya286@gmail.com>
acash mkj <31628272+acashmkj@users.noreply.github.com>
Aditya Jain <adityajain.783@gmail.com>
Ajo John <ajojohn555@gmail.com>
Alex Gower <alexanderpgower@gmail.com>
Allan Zhou <allan.zhou@berkeley.edu>
Ana Francisca Bernardo <anafranciscabernardo@gmail.com>
Expand All @@ -20,10 +24,13 @@ Anggoro Dewanto <anggorodewanto@gmail.com>
Anmol Shukla <anmol.shkl@gmail.com>
Anthony Alridge <anthonyalridge270@gmail.com>
Anthony Zheng <Anthony@fopen-dream.space>
Anurag Thakur <ranaasr60@gmail.com>
Arpan Banerjee <arpanbnrj9@gmail.com>
Arun Kumar <arunkumarm1995@gmail.com>
Arunabh Ghosh <arunabhghosh98@gmail.com>
Ashish Verma <ashish1500616@gmail.com>
Ashmeet Singh <ashmeet.nas96@gmail.com>
Ashutosh Singla <ashutoshsingla@ymail.com>
Aubrey Wells <dozure@gmail.com>
Avijit Gupta <526avijit@gmail.com>
Barnabas Makonda <barnabasmakonda@gmail.com>
Expand All @@ -45,9 +52,11 @@ Edward Allison <eallison1102@gmail.com>
Estelle Lee <estelle0500@gmail.com>
Frederik Creemers <frederikcreemers@gmail.com>
Fang You <fangy@andrew.cmu.edu>
Gagan Suneja <gagan91suneja@gmail.com>
Google Inc.
Grace Guo <graceguo43@gmail.com>
Hamza Chandad <zeiurfhc@gmail.com>
Henry Phu <hphu@bu.edu>
Himanshu Aggarwal <rackstar17@gmail.com>
Himanshu Dixit <hudixt@gmail.com>
Hitesh Sharma <hitesh96db@gmail.com>
Expand All @@ -70,6 +79,7 @@ Joshua Lan <josh.lan9@gmail.com>
Joshua Lusk <luskjh@g.cofc.edu>
Justin Du <justin.d128@gmail.com>
Karen Rustad <karen.rustad@gmail.com>
Kartikey Pandey <pandeykartikey99@gmail.com>
Kathryn Patterson <katp@wegrok.net>
Kefeh Collins <kefehcollins@gmail.com>
Kenneth Ho <a0125364@u.nus.edu>
Expand All @@ -92,6 +102,7 @@ Michael Wagner <wagnerdmike@gmail.com>
Milagro Teruel <milagro.teruel@gmail.com>
Mohammad Shahebaz <shahebaz13@gmail.com>
Mohit Gupta <thedeveloperrmail@gmail.com>
Mohit Musaddi <96mohitm@gmail.com>
Mungo Dewar <mpjdewar@gmail.com>
Nalin Chhibber <nalin.chhibber@gmail.com>
Naveen Kumar Shukla <shuklank2709@gmail.com>
Expand All @@ -118,6 +129,7 @@ Reto Brunner <brunnre8@gmail.com>
Richard Cho <won0089@gmail.com>
Rohan Gulati <rohangulati@gmail.com>
Ross Strader <strader@gmail.com>
Rudra Sadhu <rdrsadhu@gmail.com>
Samara Trilling <samara.trilling@gmail.com>
Saeed Jassani <saeedjassani@gmail.com>
Sandeep Dubey <dubeysandeep.in@gmail.com>
Expand Down Expand Up @@ -151,6 +163,7 @@ Truong Kim <kimphantruong@gmail.com>
Tuguldur Baigalmaa <philoniare@gmail.com>
Umesh Singla <umeshksingla@gmail.com>
Utkarsh Dixit <downloadplaza97@gmail.com>
Vibhor Agarwal <agarwalvibhor84@gmail.com>
Viraj Prabhu <prabhuviraj@gmail.com>
Vishal Gupta <vishal.vgu@gmail.com>
Vojtěch Jelínek <vojtin.j@gmail.com>
Expand Down
199 changes: 198 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,203 @@ This file contains a summary of changes to the Oppia code base. For a full chang

https://github.com/oppia/oppia/commits/master

v2.5.6 (20 Nov 2017)
--------------------
Learner View:
* Have the tutor card appear directly above the supplemental card on mobile (#3936)

Exploration Editor:
* Fix #3794: Complete milestone one of introducing the new fraction interaction. (#3967)
* Replaced the correct CSS styling for md-checkbox
* Fix #3997: Added proper css for CodeRepl preview (#4053)
* Shorten answer group header summaries so that the existence of multiple rules can be seen. (#4030)
* Fix #3975: Removed repeated warnings for non-alphanumeric strings.

Creator Dashboard:
* Fix #3257: Remember list/grid display preference in the creator dashboard.(#3803)

Site Navigation:
* Text tweak for Teach page. (#4032)
* Fix typo in Donations paragraph (#4040)

Embedding:
* Fix #3976: Show supplemental interactions in embedded explorations (#4052)

Infrastructure and Refactoring:
* Fix part of #3950: Replace Jinja templates in frontend with Angular (#4050)
* Fix part of #3950: Replace Jinja templates in frontend with Angular (#4019)
* Fix part of #3950: Replace Jinja templates in frontend with Angular (#4037)
* Fix #3954: Add AdminPage page object (#3974)
* Fix #3891: Changes made for remaining directives.

Statistics:
* Fix #3987: Reworked Stats tab (#3992)
* Fix #3958: One-off job to use existing stats data to create new ExplorationStatsModels (#3959)
* Only record stats for solutions if not in preview mode. (#4049)
* Fix #3422: Fix answer summarizer job interaction updating (#3955)
* Introduce event model schema version and modify ExplorationStatsModel (#3960)
* Fix #3912: Introduce incremental statistics update and event recording functionality (#3916)

Audio:
* Add fallback for browsers which do not support speech synthesis. (#4028)
* Add fallback to blob-builder on low-end devices (#3937)
* Allow creators to optionally disable automatic text-to-speech for an exploration. (#3918)
* Fix #3993: Standardize check for whether autogenerated translations are shown. (#4002)

Hints:
* Show a tooltip over hint button to suggest that the learner use a hint after a few attempts.
* Fix #4015: Added e2e tests for hints/solutions (#4033)
* Fix #3805: On mobile, the tooltip for the hint button is cutoff on the right edge of the screen.

Speed:
* Fix #3254: Load MathJax only where needed (#4042)

Misc:
* Fix #3791: Paragraph spacing fix (#4048)
* Reformat frontend error message so that StackDriver hopefully catches it. (#4045)
* Fix #4046: SITE_NAME replacement error fixed in license explanation page (#4051)
* Fix part of #2575: Remove load errors from the frontend tests (#4041)
* Fix errors in production due to parameters not working correctly. (#4029)
* Fix issue with lastComputedArrangement occasionally being undefined when calculating the destination state lists.


v2.5.5 (20 Oct 2017)
--------------------
Learner View:
* Have the tutor card appear directly above the supplemental card on mobile (#3936)
* Fix #3993: Standardize the check for whether autogenerated translations are shown. (#4002)
* Fix #3790: Add automatic text-to-speech audio to explorations (#3818)
* Add all supported audio languages (#3903)
* Disable the save button while uploading audio to server; add Spanish support to audio languages; add audio loading message to learner view (#3856)
* Fix #3807: Center the info icon in the footer vertically (#3859)
* Fix #3812: Auto-adjust the size of buttons to fit within small screen widths (#3858)

Learner Dashboard:
* Add timestamps to individual messages (#3873)
* Disable the "feedback updates" send button when there is no text entered. (#3860)
* Fix #3404: Add default placeholder text for mobile devices (#3845)
* Add I18N to “give up” button, and change the tooltip text. (#3844)

Collections:
* Fix issue with the exploration tile in a collection being unclickable on mobile devices. (#3900)

Exploration Editor:
* Replace "source" element with in-line "audio" element in the audio translations editor, to prevent the same audio source persisting incorrectly across multiple states. (#3908)
* Fix #3295: Save a draft of the exploration editor’s change list to local storage, to guard against loss of Internet connectivity while editing. (#3584)
* Fix part of #3400: make the Objective field directives in the exploration settings tab and the publish modal match each other (#3740)

Site Navigation:
* Update the Oppia blog link, and rewrite the Teach with Oppia page. (#3945)
* Add external Foundation links (#3934)
* Fix #3800: Fix hover issue for dropdown menu buttons in the About page (#3855)
* Fix #3828: fix warning erroneously showing up in registration page on Safari (#3833)

Embedding:
* Add v0.0.3 version of embed script, which adds explorationTitle data to messengerServices (#3935)

Infrastructure and Refactoring:
* Fix #3691 Add a config property to add notification emails for failing ML tasks (#3871)
* Fix #2553: Change the "index all explorations" job in the admin dashboard to index all activities (#3831)
* Fix #3687: Batch calls for retrieving the exploration and exploration rights objects. (#3815)
* Enforce the one-service-per-frontend-file rule and frontend naming conventions in more places.
* Fix part of #3891: Refactor directives to use template URLs (#3942)
* Fix part of #2575: Refactor rich-text component directives to use template URLs (#3921)
* Fix part of #2863: Introduce ParamType domain object in the frontend (#3870)
* Introduce Creator Dashboard page object for Protractor tests (#3949)

Misc:
* Fix #3721: Update the release_info script to use LCA and the most recent release tag in order to compile the list of changes, rather than relying on git describe. (#3838)
* Update deploy scripts to match new release process (#3952)
* Update the automatic backup script to automatically split up URLs if needed (#3956)
* Update the backups script to ignore reconstitutable models (#3876)
* Update the release info script to output both new and old authors to Oppia (#3878)
* Add the release script to the codebase (#3839)
* Add script for cutting a new release branch. (#3919)


v2.5.4 (22 Sep 2017)
--------------------
Learner Dashboard:
* Learner dashboard 3.2 (#3759)
* Handle anonymous feedback usernames. Learner Dashboard Hotfix. (#3762)
* Address the bugs in learner dashboard. (#3720)
* Fix #3695: Pull the load tests apart from the main test. (#3729)
* Assign the default dashboard to all the users of the site. (#3760)
* Add user default dashboards job to job registry (#3779)
* Set default dashboard for users and fix a bug in preferences for default dashboard. (#3781)

Site-Wide ACL refactor (new roles/permissions system):
* Fixes #3742: function added for fetching list of exploration rights based on ids. (#3796)
* SiteWide ACl: removing the old system for authorization. (#3696)

Hints:
* Fix #3645: Introduce new Solution Editor and Learner View (#3703)
* Fix #3771: Remove fallbacks (#3772)
* Fixes '0' issue for solutions (#3770)

Machine Learning:
* Fixes for end to end working between Oppia and Oppia-ml. (#3824)
* Enable code classifier for code interaction. (#3767)
* Make answer classification work synchronously. (#3765)
* Code classifier frontend prediction API services. (#3719)
* Fix #3469: Introduce PredictionAlgorithmRegistryService and a sample prediction service. (#3716)
* Fix #3693: Deprecate ClassifierDataModel and update ClassifierTrainingJobModel (#3734)
* Fix #3514: Next job controller (#3658)

Learner View:
* Fix #3612: In embedded explorations, the learner avatars are too large. (#3736)
* Fix #3725: Message bubble triangle (#3749)
* Fix #3258: Add share-to-classroom Button (#3743)

Audio:
* Add audio language preferences (#3766)
* Test uploading audio file with an mpeg container. (#3752)
* Handle audio files with MPEG container with mutagen (#3735)
* Preloading of audio and bandwidth confirmation (#3727)
* Fix issue with inter-paragraph spacing in content field being unintentionally reduced. (#3775)

Editor:
* Remove gadgets functionality and update the exploration schema version accordingly. (#3801)
* Fix part of #3400: Update title field in Publish Modal (#3690)

Collections:
* Fix 'Empty path passed in method' error on the collection page. (#3827)
* Fix #3707 Change the start text of collection learner view (#3816)

Misc:
* Deprecate splash page experiment (#3829)
* Remove extraneous period (#3780)
* Routine update of translations. (#3785)
* Fix #3558: Browser specific alignment (#3768)
* Removed I18N_PLAYER_CONTINUE_NEXT_CARD from the translation files (#3737)
* Eliminates stray tick mark (#3731)
* Fix #3726: prevent graph SVG from overlapping modal footer buttons. (#3728)
* remove data-toggle Fixes #3750 (#3754)
* Fix #3789: Space out the profile drop down icons (#3789). (#3817)

Infrastructure:
* Make the range used for generating IDs much larger. (#3799)
* Derive GCS bucket name automatically. (#3798)
* Simple fix to prevent the last updated field on running the count job. (#3761)
* Fix #2036: Introduces and uses configuration point for assigning a job to a specific queue. (#3745)
* Fix call to base class (#3751)
* Add a one-off job to list which explorations use gadgets; remove old fallbacks job. (#3717)
* Improvements and bug fixes to changes introduced by PR #3671 (#3684)

Code health:
* Fixes #3748 - Changed file names of EmailDashboardService according t… (#3758)
* Code refactor: removed publicize status. (#3739)

Speed:
* Fix part of #3453: Removed jinja template in editor_navigation_directive (#3732)
* Fix #3453: Removed jinja template in collection editor navigation bar directive (#3723)
* Removed jinja template logics in search_results_directive (#3733)
* Remove jinja template in create_activity_modal_directive (#3724)
* Fix #3453: remove Jinja template in create activity button directive (#3722)

Questions:
* Fix #2998 implement collection skills update commands (#3710)


v2.5.3 (15 Aug 2017)
--------------------
Expand Down Expand Up @@ -1559,7 +1756,7 @@ Security:
Infrastructure:
* Adjust backend tests to not use datetime.datetime.now(), since it gives different results in different locales.
* Add a hook for inserting custom HTML before the end of the 'body' tag.
* Broadcast parameter values to the messengerService for explorationCompleted and stateTransition events.
* Broadcast parameter values to the MessengerService for explorationCompleted and stateTransition events.
* Speed up the recommendations job by making fewer calls to the datastore.
* Update FontAwesome to version 4.4.0.
* Add created_on and last_updated fields to reconstituted version snapshots.
Expand Down
15 changes: 14 additions & 1 deletion CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,15 @@
#
# Please keep the list sorted alphabetically.

Aashish Gaba <aashishgaba097@gmail.com>
Abhay Raizada <abhsag24@gmail.com>
Abhijit Suresh <abhijit5893@gmail.com>
Abhishek Arya <abhishekarya286@gmail.com>
acash mkj <31628272+acashmkj@users.noreply.github.com>
Abraham Mgowano <mgowano@google.com>
Aditya Jain <adityajain.783@gmail.com>
Ajay Sharma <ayejay.nsit@gmail.com>
Ajo John <ajojohn555@gmail.com>
Alex Gower <alexanderpgower@gmail.com>
Allan Zhou <allan.zhou@berkeley.edu>
Amit Deutsch <amitdeutsch@google.com>
Expand All @@ -36,10 +40,13 @@ Anggoro Dewanto <anggorodewanto@gmail.com>
Anmol Shukla <anmol.shkl@gmail.com>
Anthony Alridge <anthonyalridge270@gmail.com>
Anthony Zheng <Anthony@fopen-dream.space>
Anurag Thakur <ranaasr60@gmail.com>
Arpan Banerjee <arpanbnrj9@gmail.com>
Arun Kumar <arunkumarm1995@gmail.com>
Arunabh Ghosh <arunabhghosh98@gmail.com>
Ashish Verma <ashish1500616@gmail.com>
Ashmeet Singh <ashmeet.nas96@gmail.com>
Ashutosh Singla <ashutoshsingla@ymail.com>
Aubrey Wells <dozure@gmail.com>
Avijit Gupta <526avijit@gmail.com>
Barnabas Makonda <barnabasmakonda@gmail.com>
Expand All @@ -64,8 +71,10 @@ Elizabeth Kemp <kempy@kempy.org>
Estelle Lee <estelle0500@gmail.com>
Fang You <fangy@andrew.cmu.edu>
Frederik Creemers <frederikcreemers@gmail.com>
Gagan Suneja <gagan91suneja@gmail.com>
Grace Guo <graceguo43@gmail.com>
Hamza Chandad <zeiurfhc@gmail.com>
Henry Phu <hphu@bu.edu>
Himanshu Aggarwal <rackstar17@gmail.com>
Himanshu Dixit <hudixt@gmail.com>
Hitesh Sharma <hitesh96db@gmail.com>
Expand All @@ -90,6 +99,7 @@ Joshua Lusk <luskjh@g.cofc.edu>
Juan Saba <sabapc@gmail.com>
Justin Du <justin.d128@gmail.com>
Karen Rustad <karen.rustad@gmail.com>
Kartikey Pandey <pandeykartikey99@gmail.com>
Kathryn Patterson <katp@wegrok.net>
Kefeh Collins <kefehcollins@gmail.com>
Kenneth Ho <a0125364@u.nus.edu>
Expand Down Expand Up @@ -117,6 +127,7 @@ Michael Wagner <wagnerdmike@gmail.com>
Milagro Teruel <milagro.teruel@gmail.com>
Mohammad Shahebaz <shahebaz13@gmail.com>
Mohit Gupta <thedeveloperrmail@gmail.com>
Mohit Musaddi <96mohitm@gmail.com>
Mungo Dewar <mpjdewar@gmail.com>
Nalin Chhibber <nalin.chhibber@gmail.com>
Naveen Kumar Shukla <shuklank2709@gmail.com>
Expand All @@ -142,9 +153,10 @@ Rajendra Kadam <rajendrakadam249@gmail.com>
Raymond Tso <thisraymond@gmail.com>
Reinaldo Aguiar <reinaldoaguiar@google.com>
Reto Brunner <brunnre8@gmail.com>
Richard Cho <won0089@gmail.com>
Rohan Gulati <rohangulati@gmail.com>
Ross Strader <strader@gmail.com>
Richard Cho <won0089@gmail.com>
Rudra Sadhu <rdrsadhu@gmail.com>
Saeed Jassani <saeedjassani@gmail.com>
Samara Trilling <samara.trilling@gmail.com>
Sandeep Dubey <dubeysandeep.in@gmail.com>
Expand Down Expand Up @@ -182,6 +194,7 @@ Truong Kim <kimphantruong@gmail.com>
Tuguldur Baigalmaa <philoniare@gmail.com>
Umesh Singla <umeshksingla@gmail.com>
Utkarsh Dixit <downloadplaza97@gmail.com>
Vibhor Agarwal <agarwalvibhor84@gmail.com>
Viraj Prabhu <prabhuviraj@gmail.com>
Vishal Gupta <vishal.vgu@gmail.com>
Vishal Joisar <vjoisar@google.com>
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ The Oppia project is built by the community for the community. We welcome contri

You can help with Oppia's development in many ways, including art, coding, design and documentation.
* **Developers**: please see [this wiki page](https://github.com/oppia/oppia/wiki/Contributing-code-to-Oppia#setting-things-up) for instructions on how to set things up and commit changes.
* **All other contributors**: please see our [general contributor guidelines](https://github.com/oppia/oppia/wiki/Contributing-to-Oppia).
* **All other contributors**: please see our [general contributor guidelines](https://github.com/oppia/oppia/wiki).

In addition, if you'd like to make contributions to the codebase, please follow [these instructions](https://github.com/oppia/oppia/blob/develop/CONTRIBUTING.md#setting-things-up), which will walk you through setting things up, signing the CLA, and joining the developer mailing list. Thanks!

## Support

Expand All @@ -60,7 +59,7 @@ The Oppia code is released under the [Apache v2 license](https://github.com/oppi

## Keeping in touch

* [Blog](https://oppiablog.blogspot.com/)
* [Blog](https://medium.com/oppia-org)
* [Discussion forum](http://groups.google.com/group/oppia)
* [Announcements mailing list](http://groups.google.com/group/oppia-announce)
* Social media: [G+](https://plus.google.com/109898456505810251700/about), [YouTube](https://www.youtube.com/channel/UC5c1G7BNDCfv1rczcBp9FPw), [FB](https://www.facebook.com/oppiaorg), [Twitter](https://twitter.com/oppiaorg)
Expand Down
Loading

0 comments on commit bc0afd7

Please sign in to comment.