{"push_id":870974031,"size":18,"distinct_size":0,"ref":"refs/heads/develop","head":"e70e2b5be6f9b53981cbe6f0f25cec507106f2a8","before":"0ab8d8d44a24bf3562ec844696c39cb9564cb3ef","commits":[{"sha":"eaa7d2be8c98a09bffd1f91775afe865febc5f5b","author":{"email":"617f0ce6620ed3f88e360069bc2ad035c123bc5d@gmail.com","name":"Ben Henning"},"message":"Implemented the initial iteration of the learner view of collections.\nThis commit includes the following:\n\n- Controller and service for viewing the collection learner page as well\n  as retrieving collection data.\n\n- Functionality for loading demo collections through the admin panel.\n\n- A basic collection learner view page which loads a collection,\n  displays its title, and lists all of the explorations contained in\n  the collection with links to play each of them (not within the context\n  of a collection).\n\n- A URL interpolation service (as discussed in #1019).\n\n- A new directory structure and frontend architecture for the\n  collections learner view, following standards discussed with Sean.","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/eaa7d2be8c98a09bffd1f91775afe865febc5f5b"},{"sha":"afbaed8e1a418288cbd2255d9050c1c565d0470a","author":{"email":"617f0ce6620ed3f88e360069bc2ad035c123bc5d@gmail.com","name":"Ben Henning"},"message":"Implemented the second iteration of the learner view of collections.\nThis commit includes the following:\n\n- Ability to play explorations within the context of a collection.\n\n- Saved progress when an exploration is completed within the context of\n  a collection.\n\n- An updated collection learner view page which shows the next\n  explorations to complete by the learner.\n\n- An update to the end interaction page to recommend the learner\n  continues playing the later explorations in the collection as well as\n  have an option to return to the collection or the gallery.","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/afbaed8e1a418288cbd2255d9050c1c565d0470a"},{"sha":"179100e6ea6f064672dd8617e60d19ccac918621","author":{"email":"7dfe1ac3784b57967461a73acc319e983b6e91ed@google.com","name":"Ben Henning"},"message":"Implemented a basic learner view styling based on the gallery's styling.","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/179100e6ea6f064672dd8617e60d19ccac918621"},{"sha":"99761eccc1efd61e72a0bf9d134f62fd1f38de6e","author":{"email":"7dfe1ac3784b57967461a73acc319e983b6e91ed@google.com","name":"Ben Henning"},"message":"Merge branch 'develop' of https://github.com/oppia/oppia into collections-learner-view\n\nConflicts:\n\tcore/controllers/admin.py","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/99761eccc1efd61e72a0bf9d134f62fd1f38de6e"},{"sha":"5b956c6a20d37af8f8436f111e8dad4ce62e789c","author":{"email":"7dfe1ac3784b57967461a73acc319e983b6e91ed@google.com","name":"Ben Henning"},"message":"Updated the collection player directory structure to better demonstrate the frontend refactor plan.","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/5b956c6a20d37af8f8436f111e8dad4ce62e789c"},{"sha":"eec92bdd749498261a5668e2e5a35e38d35cec19","author":{"email":"7dfe1ac3784b57967461a73acc319e983b6e91ed@google.com","name":"Ben Henning"},"message":"Addressed most of the review comments for the collections learner view.","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/eec92bdd749498261a5668e2e5a35e38d35cec19"},{"sha":"23d0dc7ceb6b89a9757009e45d6fcd4f3ddc7169","author":{"email":"7dfe1ac3784b57967461a73acc319e983b6e91ed@google.com","name":"Ben Henning"},"message":"Updated the collection learner view to display a warning message to\nguests that their progress will not be saved. Implemented switching\nbetween two different views in the player: one which is the current\nprogress view and another which shows all explorations in the\ncollection. Updated the guest mode of the learner view to display all\nof the explorations of the collection. Updated the progress mode to show\nand gray out completed explorations. Updated the wording of the\ncollection player title.","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/23d0dc7ceb6b89a9757009e45d6fcd4f3ddc7169"},{"sha":"3b7f4ed10c5210804e6c446e37f1f88150be6bba","author":{"email":"617f0ce6620ed3f88e360069bc2ad035c123bc5d@gmail.com","name":"Ben Henning"},"message":"Introduced backend tests for the collection viewer controller, a\ncapitalize utility function, and for ensuring explorations played\nwithin the context of a collection are properly recorded and retrieved.","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/3b7f4ed10c5210804e6c446e37f1f88150be6bba"},{"sha":"03f15720b4f4e88224541179d19f46c8ab2d0b2c","author":{"email":"7dfe1ac3784b57967461a73acc319e983b6e91ed@google.com","name":"Ben Henning"},"message":"Updated the URL interpolation service to sanitize parameters using\nescape instead of the Oppia HTML sanitizer. Updated the collection data\nservice to return promise objects when fetching or loading a collection,\nrather than requiring the caller to pass in callbacks. Added tests for\nboth the collection data and URL interpolation services.","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/03f15720b4f4e88224541179d19f46c8ab2d0b2c"},{"sha":"d977c6bcb7243dd2959f2177fd363a540dafbdf9","author":{"email":"7dfe1ac3784b57967461a73acc319e983b6e91ed@google.com","name":"Ben Henning"},"message":"Moved CollectionDataService, UrlInterpolationService, and related tests\nto their final locations per the Q4 2015 frontend refactor document.","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/d977c6bcb7243dd2959f2177fd363a540dafbdf9"},{"sha":"00284096fbe017350ab81c5c1b6966c3fd597f3f","author":{"email":"7dfe1ac3784b57967461a73acc319e983b6e91ed@google.com","name":"Ben Henning"},"message":"Merge branch 'develop' into collections-learner-view\n\nConflicts:\n\tscripts/backend_tests.py","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/00284096fbe017350ab81c5c1b6966c3fd597f3f"},{"sha":"49bcf8ce4b3049df90a808d15bbf032a8f7a3257","author":{"email":"7dfe1ac3784b57967461a73acc319e983b6e91ed@google.com","name":"Ben Henning"},"message":"Merge branch 'develop' of https://github.com/oppia/oppia into collections-learner-view\n\nConflicts:\n\tscripts/backend_tests.py","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/49bcf8ce4b3049df90a808d15bbf032a8f7a3257"},{"sha":"221d4a25be12e0a20e5dc46a120a089dd4894079","author":{"email":"7dfe1ac3784b57967461a73acc319e983b6e91ed@google.com","name":"Ben Henning"},"message":"Addressed all review comments up until this point. Changed the layout of\nthe collection learner view to display different sections based on\nrecommended explorations to play, completed explorations, and future\nexplorations. Altered a lot of styling and frontend logic/structure\nbased on all of these suggestions. Updated the URL interpolation service\nto throw errors instead of returning an invalid value when the function\nis used wrong. Introduced a 'new user' in the backend test_utils for cleaner\ntests which deal with testing state on a fresh user (versus abusing one\nof the other profiles supplied by test_utils). Renamed the progress\nmodel for collections to 'CollectionProgressModel'. Updated the demo\ncollection to have a better title.","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/221d4a25be12e0a20e5dc46a120a089dd4894079"},{"sha":"87237672a49b5bbb79b3d4cf33ebca529ee30529","author":{"email":"617f0ce6620ed3f88e360069bc2ad035c123bc5d@gmail.com","name":"Ben Henning"},"message":"Addressed all review comments, which included adding an animation to slide\nthe upcoming exploration tiles list in the collection learner view into and\nout of view when it is expanded/collapsed. The end exploration was also\nupdated to display the title of the collection, if it's currently being\nplayed within the context of a collection. The URL interpolation service's\npolicy on parameter values was tightened to instead enforce a whitelist of\nacceptable characters.","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/87237672a49b5bbb79b3d4cf33ebca529ee30529"},{"sha":"490e0c6765753749ebc77e4b365c38ef0a86c75a","author":{"email":"617f0ce6620ed3f88e360069bc2ad035c123bc5d@gmail.com","name":"Ben Henning"},"message":"Merge branch 'develop' into collections-learner-view\n\nConflicts:\n\textensions/interactions/EndExploration/EndExploration.html\n\tscripts/backend_tests.py","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/490e0c6765753749ebc77e4b365c38ef0a86c75a"},{"sha":"dddf3cd8bb0d0c6ce0ef1c01628c87550dd024bf","author":{"email":"617f0ce6620ed3f88e360069bc2ad035c123bc5d@gmail.com","name":"Ben Henning"},"message":"Changed 'encodeURI' to 'encodeURIComponent' in the URL interpolator for\nparmater values, since the values are really just components of the URI.","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/dddf3cd8bb0d0c6ce0ef1c01628c87550dd024bf"},{"sha":"fbd42933d7ec6c81465b0d0557f29a0415b454a4","author":{"email":"7dfe1ac3784b57967461a73acc319e983b6e91ed@google.com","name":"Ben Henning"},"message":"Addressed latest review comments.","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/fbd42933d7ec6c81465b0d0557f29a0415b454a4"},{"sha":"e70e2b5be6f9b53981cbe6f0f25cec507106f2a8","author":{"email":"7dfe1ac3784b57967461a73acc319e983b6e91ed@google.com","name":"Ben Henning"},"message":"Merge branch 'develop' into collections-learner-view\n\nConflicts:\n  scripts/backend_tests.py","distinct":false,"url":"https://api.github.com/repos/oppia/oppia/commits/e70e2b5be6f9b53981cbe6f0f25cec507106f2a8"}]}