Miles Steele
daeabb06bf
add instructor dashboard beta (partial) (view, template, coffeescript, api endpoints)
2013-08-02 09:52:12 -04:00
Chris Dodge
93df9c4c30
resolve merge conflicts
2013-08-02 09:41:02 -04:00
polesye
042b7d5f60
Merge pull request #428 from edx/valera/video_alpha2_refactor
...
Valera/video alpha2 refactor
2013-08-02 01:04:13 -07:00
brianhw
a628b62d1e
Merge pull request #511 from edx/feature/brian/audit-log
...
Use audit logger for logging of logins in external_auth...
2013-08-01 14:08:08 -07:00
Valera Rozuvan
52fa6591c2
Corrected all isues found during refactoring #2 .
...
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
2013-08-01 20:08:45 +03:00
Calen Pennington
e8ee29786f
Remove news carousel and other unused pages
...
Remove unused course_filter page
removes university_profile urls and templates
removes all university_profile views
remove news from templates/index
2013-07-31 19:39:15 -04:00
Calen Pennington
0d3c44996a
LMS i18n from Tsinghua
2013-07-31 19:39:15 -04:00
David Ormsbee
e68ddcd057
Merge branch 'release'
2013-07-31 15:33:30 -04:00
Brian Wilson
635d36fcf9
Add audit log definition, and use for logging of logins in external_auth and student apps. Move test_login to student app. Improve conditional tests for Shibboleth login logic. (Does not include reconfiguring log settings.)
2013-07-31 13:32:21 -04:00
Calen Pennington
b64aa813c8
Make render_template mocking clearer
2013-07-31 12:19:33 -04:00
Calen Pennington
e43dbd29c4
Merge pull request #487 from edx/cale/lms-xblock-student-view
...
Cale/lms xblock student view
2013-07-31 09:04:38 -07:00
Jonah Stanley
8d11c246e1
Merge pull request #516 from edx/jonahstanley/upgrade-chrome-version
...
Jonahstanley/upgrade chrome version
2013-07-31 08:17:46 -07:00
Calen Pennington
99f9894f1c
Switch LMS over to using XBlock rendering commands
...
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]
2013-07-31 09:22:10 -04:00
Calen Pennington
487c9a4f10
Merge pull request #524 from edx/cale/external_discussion_tab
...
Cale/external discussion tab
2013-07-30 08:59:09 -07:00
Calen Pennington
5e4cf50086
Make sure that all tab types used by the default for the course.tabs field work correctly
2013-07-30 11:32:31 -04:00
Diana Huang
0d10a872c8
Merge pull request #499 from edx/diana/login-redirect
...
Only redirect when redirect url is an internal page.
2013-07-30 05:29:39 -07:00
Diana Huang
d1b503d53a
Only redirect when redirect url is an internal page.
2013-07-29 14:18:04 -04:00
JonahStanley
20ce33dcdb
Fixed broken tests from chrome versioning
2013-07-29 13:38:27 -04:00
Don Mitchell
d1ed6fbc34
More xblock.save() calls to handle fields set during inits
2013-07-29 09:08:37 -04:00
Adam Palay
2efcb0cdca
Change default names for various LMS components
...
Embedded discussion component defaults to "Discussion"
Blank HTML page defaults to "Text"
Video component defaults to "Video"
These default names show up in tooltips.
2013-07-25 10:38:47 -04:00
Calen Pennington
76055aa211
Add a manage.py command that understands the extra edX options
2013-07-24 09:04:12 -04:00
Adam
420b092033
Merge pull request #467 from edx/fix/adam/file-upload
...
Fix/adam/file upload
2013-07-23 15:05:18 -07:00
Diana Huang
86ee2bca7a
Merge branch 'release'
...
Conflicts:
lms/djangoapps/courseware/tests/test_views.py
2013-07-23 17:57:07 -04:00
Diana Huang
2926c94330
Prevent XSS attack via submission_history page.
...
Conflicts:
lms/djangoapps/courseware/tests/test_views.py
2013-07-23 17:23:59 -04:00
Chris Dodge
c5ef8dc526
add line break between arguments
2013-07-23 12:15:56 -04:00
Chris Dodge
f78e3a221b
fix fat finger string formatting
2013-07-23 12:15:56 -04:00
Chris Dodge
345d2af540
address review feedback
2013-07-23 12:15:56 -04:00
Chris Dodge
e24eb3e4eb
added explicit unit test to verify the link rewriting
2013-07-23 12:15:55 -04:00
Chris Dodge
63c5cfda94
add comment and fix mistake in test
2013-07-23 12:10:49 -04:00
Chris Dodge
1c79b9c874
add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio
2013-07-23 12:10:49 -04:00
chrisndodge
8c94be8083
Merge pull request #436 from edx/fix/cdodge/stop-using-unmunged-urlnames-as-display-names
...
change from_xml class method on video class to make sure we honor the fa...
2013-07-23 08:33:27 -07:00
Alexander Kryklia
1eaba8b0b4
Merge pull request #41 from edx/alex/word_cloud_course_factory
...
Word cloud tests
2013-07-23 04:47:38 -07:00
Adam Palay
af522af2ca
formatting
2013-07-22 17:39:11 -04:00
Renzo Lucioni
1fc4ac864e
Add feature showing current score next to problem title
2013-07-19 16:14:24 -04:00
Chris Dodge
22802a4d29
change from_xml class method on video class to make sure we honor the fact that the xml string could actually be a pointer to another file on disk which actually contains the attributes
2013-07-19 13:54:22 -04:00
Joe Blaylock
044a69d63d
Merge pull request #52 from edx/nate/simple-chat
...
Simple port of Class2Go's chat feature
2013-07-19 10:10:32 -07:00
Ned Batchelder
66ca7d750e
Merge pull request #411 from edx/ned/studentmodulehistory-cleaner-command
...
Ned/studentmodulehistory cleaner command
2013-07-19 08:33:37 -07:00
Joe Blaylock
50c906732f
Chat rebase, test update
...
Rebase on today's master and update to unit test to include settings
where needed.
2013-07-18 15:00:54 -07:00
Nate Hardison
293bd30a59
Use chat settings when deciding whether to render
...
Only render the chat widget if both the site has enabled it in the
`MITX_FEATURES` and if the course has enabled it. In addition, fail
gracefully with a log warning if the `JABBER_DOMAIN` is not set, and
do not try to render the widget. However, do go ahead and render the
rest of the courseware.
2013-07-18 15:00:54 -07:00
Nate Hardison
f4ae0e0cae
Test generation of chat settings
...
Ensure that the chat connection settings are generated properly for
the template context.
2013-07-18 15:00:54 -07:00
Nate Hardison
bf8e5e6ba1
Simple port of Class2Go's chat feature
...
Embed a chat widget (much like the calculator widget) into the
courseware. To use, you must point it at an ejabberd box,
configured as `JABBER_DOMAIN` in the settings.
2013-07-18 15:00:53 -07:00
Sarina Canelake
7615a0638b
Merge pull request #310 from robertjmarks/master
...
Adds in changes for stat2.3x question type
2013-07-18 13:44:00 -07:00
Diana Huang
3f9431e8cf
Provide implicit saves for XBlocks and XModules.
...
Update existing tests and provide new ones to test new paradigm.
2013-07-18 16:37:34 -04:00
Sarina Canelake
f0c9aa3916
Provide set_many methods for Lms and Mongo KeyValueStores
...
Refactor new set_many and update XBlock version number.
2013-07-18 15:30:13 -04:00
RobertMarks
4d880db1b5
Updated behavior for split_answer_dict, get_score, and check_student_inputs (responsetypes.py)
2013-07-18 10:18:53 -07:00
RobertMarks
46ae2f9c26
Added support for a new problem type: ChoicetextResponse
2013-07-18 10:12:56 -07:00
Ned Batchelder
900e794c02
Only quiet the particular logger we think is too noisy.
2013-07-18 11:53:21 -04:00
Ned Batchelder
3d67c506a3
Use TransactionTestCase, to keep other tests from failing, even though it slows them down.
2013-07-18 11:16:46 -04:00
Ned Batchelder
10f062cf18
Records should be sorted by created,id so that timestamp ties will be broken by id.
2013-07-18 11:16:46 -04:00
Ned Batchelder
83cb3d1924
Add batch and sleep arguments so we can control the speed from the command line.
2013-07-18 11:16:46 -04:00
