Merge changes from upstream. Divide each step in tar mission into separate explorations. #26
Conversation
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
…S (this will come later). The aim is to remove the old angular-ui dependency.
…tor view. This turns out to have the nice side-effect of making the exploration editor page load a lot faster :-)
…y not loading all explorations.
…earch exploration to fail.
…clare certain fields as unindexed to increase speed.
…ly in editable form.
…he exploration editor.
…template for maintainability.
…nt of the zip file and not its location.
…it is not possible to see the diff in the source code repo.
… substituted for a datastore-backed one in tests.
…served from the exploration filesystem. Allow rules to make use of a filesystem.
… messaging service to communicate between oppia and its embedding page.
…me content was not being substituted correctly.
…se can be sent back to the parent frame when the height of the embedded exploration is changed.
…should be less invasive.
…rs is empty on initial page load.
…jwysiwyg depends on).
…tallation is causing trouble on some computers. Move it into a run_js_tests.sh script instead.
Conflicts: core/controllers/editor_test.py core/controllers/reader_test.py core/storage/file/models.py data/explorations/binary_search/The Lazy Magician.yaml extensions/widgets/interactive/FileReadInput/FileReadInput.html extensions/widgets/interactive/TarFileReadInput/static/js/TarFileReadInput.js feconf.py scripts/install_third_party.sh scripts/test.sh
…hat upstream has.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.