update from vetrolamu #2
Merged
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
CMS i18n changes from Tsinghua
Validate date/time settings when typed in directly.
Two endpoints are intended to be used by AJAX calls from the web UI with an authenticated user. When enabled, the value of the preference is an encryption of the username, to be used as a token for one-click unsubscribe links. The third endpoint is the target of unsubscribe links, which displays a page with an appropriate message to the user.
…d email notification settings
Conflicts: cms/djangoapps/contentstore/views/user.py cms/static/sass/elements/_controls.scss cms/templates/activation_active.html cms/templates/activation_complete.html cms/templates/activation_invalid.html
Fixes for `vagrant up`
…ght organization for applicaiton.scss to match studio sass breakdown.
…compiling, added in initial icon references
…d fontawesome icons into discusison home with basic positioning
…or the rest of _discussion.scss
…aned up styling as well
This allows a more general approach to modules such as word_cloud and video which have no XML data (it's all store in metadata), but use XmlDescriptor for backwards compatibility. They now generate an empty tag on export, and clear out empty tags on import. Also a small change to the video module as a result -- if it's asked to parse empty XML data, it won't try to parse anything.
Grant admin rights to members of the course team
And replace calls with calls to load_preview_module.
`world.css_find()` to protect against StaleElementException in Jenkins.
This makes the LMS use an XBlock's student_view, rather than an XModule's get_html to render for display. However, it does not yet use wrap_child to handle instructor debug information or url rewriting. [LMS-219]
…r_studio "Graphical Slider Tool" integration into studio
Remove get_preview_module.
…uring-tests Quiet mongoimport noise during tests
…ersion Jonahstanley/upgrade chrome version
Fix word cloud modules not exporting correctly.
Laboratory
Fix broken Studio signup.feature acceptance test
Cale/lms xblock student view
fix for ie bug where drop down menus were still clickable when collapsed
vetrolamu
added a commit
that referenced
this pull request
Aug 1, 2013
vetrolamu
pushed a commit
that referenced
this pull request
Aug 29, 2013
Added missing file.~ Undid a mistake. Copied Python tests from video_alpha1. moves TestLogic to __init__.py reorginizes xmodule logic tests adds docstrings for poll tests adds docstring for word cloud and conditional tests adds docstrings for video alpha tests adds videoalphafactory for tests, not finished adds imports Bug fixing. fix video/videoalpha tests Updated lettuce test. Now it is aware of the fact that Video and Video Alpha players have different base CSS classes. Removed REFACTOR comments. Turn off autoplay for Video Alpha in Studio. Carry over fix for bug where in Firefox changing to speed 1.0 has no effect. Carry over JavaScript Jasmine tests from jmclaus/videoalpha2_js branch. Exporting state object from main function of Video Alpha. More stuff from jmclaus/videoalpha2_js branch. Specs in html5_video.js all pass except ten of them. Cleaned code a bit and moved it out of display_spec.js One more spec passes Fixed remaning tests in spec/../html5_video.js test suite. Removed test video files. Added JavaScript Jasmine tests for main of Video Alpha 2. adds test for volume control and updates helper file for videoalpha
gitim
pushed a commit
that referenced
this pull request
Jul 17, 2014
Убраны лишние директории из статики
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.