Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

1864 Commits

Author SHA1 Message Date
Brian Wilson
6a24ecebe7 decode utf-8 when reading html, and encode when writing. 2012-11-28 17:54:18 -05:00
Victor Shnayder
4b58cb9560 Fix attempt tracking, fix test 
- increments attempts on any transition to DONE state
 2012-11-28 15:04:07 -05:00
Victor Shnayder
0a1b731dbc properly reset answer area on module reset 2012-11-28 14:18:44 -05:00
Victor Shnayder
b41b459712 update docstring on x_module.get_score to match reality 2012-11-28 14:09:32 -05:00
Victor Shnayder
4fd1a2fa1a Fix state tracking for self-assessment. 
now keep each set of responses in a separate dictionary
 2012-11-28 14:09:09 -05:00
Victor Shnayder
e3b9238eef reorder imports 2012-11-28 14:08:18 -05:00
Victor Shnayder
f8e45e0a8e Add tests for old logic 2012-11-28 13:21:48 -05:00
Victor Shnayder
a0a5167207 Hook up testing for self assessment modules 2012-11-28 11:12:06 -05:00
Don Mitchell
2238019539 Details tab works except for file references 2012-11-27 11:32:03 -05:00
John Jarvis
474f810b38 Adding lowest_passing_grade() to CourseDescriptor 2012-11-26 16:29:45 -05:00
Calen Pennington
8e68573243 Merge pull request #1041 from MITx/fix/cdodge/video-captions 
wire through course asset path information to the video playback module ...
 2012-11-26 08:29:05 -08:00
Chris Dodge
6d45445aef assume that users are putting caption information in /static/subs. We'll enforce this on the xlint utility 2012-11-26 11:19:51 -05:00
Chris Dodge
2d7f1b73d7 consolidate logic to compute caption path to server-side, we don't need to do this client-side 2012-11-26 11:19:51 -05:00
Chris Dodge
71f16d40e1 wire through course asset path information to the video playback module and corresponding .coffee files 2012-11-26 11:19:51 -05:00
Calen Pennington
4e3da342d7 Merge pull request #1048 from MITx/feature/cdodge/xlint 
Feature/cdodge/xlint
 2012-11-26 08:11:34 -08:00
Chris Dodge
fff3782884 cleave xlint entry point in xml_importer.py to be separate from the import method 2012-11-26 11:05:57 -05:00
Calen Pennington
2b6e2b5143 Merge pull request #1056 from MITx/bugfix/ichuang/xml_importer 
xml_importer bugfix - when importing without policy override use course_location
 2012-11-26 06:54:22 -08:00
Chris Dodge
ec6b1a12e9 insert the xmodule.coffee dependency into HTMLSnippet().get_javascript(). This allows us a single point to define this dependency. 2012-11-19 15:46:57 -05:00
Don Mitchell
8c8be3e82a Cleaned up imports 2012-11-19 10:38:58 -05:00
Don Mitchell
88cc5a080b Everything tested and ready for Tom to fix 2012-11-19 10:38:58 -05:00
ichuang
f84f08fae4 xml_importer bugfix - when importing without policy override use course_location 2012-11-17 21:38:15 -05:00
Calen Pennington
3b2b8ad4fa Merge pull request #1053 from MITx/feature/jzoldak/common-jasmine-tests 
Capa Problem jasmine tests running independently
 2012-11-16 13:35:19 -08:00
Calen Pennington
719277876f Merge pull request #1051 from MITx/fix/cdodge/code-mirror-crash-on-style-blocks 
remove 'mode' property when creating a new CodeMirror control. This appe...
 2012-11-16 12:52:33 -08:00
Jay Zoldak
8d0abcb974 Merge branch 'feature/cale/cms-master' into feature/jzoldak/common-jasmine-tests 2012-11-16 15:10:19 -05:00
Jay Zoldak
ea4c0ed86a Refactor fixtures for capa problems. 2012-11-16 14:59:46 -05:00
Jay Zoldak
a10a3209aa Fix all but 4 broken tests. 2012-11-16 14:47:09 -05:00
Jay Zoldak
6ae0add931 Fix the new problem create statements in the describe blocks for the capa display spec. 2012-11-16 13:26:16 -05:00
Jay Zoldak
718ce4db28 Get Problem constructor working again, and copy the helper file from lms. 2012-11-16 13:02:38 -05:00
Calen Pennington
0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
 2012-11-16 09:03:15 -05:00
Chris Dodge
975d75c116 When importing a course, we need to set the 'display_name' on the static tab module from the course module's policy. This isn't ideal, but the static tab definition on disk does not encapsulate the tab's display name on the LMS - we have to take it from the course 2012-11-15 21:45:20 -05:00
Chris Dodge
2a35132b2a When importing a course, we need to set the 'display_name' on the static tab module from the course module's policy. This isn't ideal, but the static tab definition on disk does not encapsulate the tab's display name on the LMS - we have to take it from the course 2012-11-15 21:44:20 -05:00
Chris Dodge
9ae8558382 put htmlmixed.js and css.js includes in CMS base.html so that we can support html mode in CodeMirror 2012-11-15 20:35:45 -05:00
Jay Zoldak
bf6a147c85 Modify rake file to read in spec and src files correctly and also add in the lms helper file for stubRequests, etc. 2012-11-15 15:43:39 -05:00
David Ormsbee
156dc1fb6c Merge branch 'master' into feature/victor/actual-askbot-removal 
Conflicts:
	lms/envs/aws.py
 2012-11-15 14:24:55 -05:00
Chris Dodge
39c33b42b2 remove 'mode' property when creating a new CodeMirror control. This appears to completely crash if the user puts in a <style ...> tag in the input. This was causing imported static tabs to not be editable 2012-11-15 13:56:42 -05:00
Calen Pennington
93cc17cf3b Starting to generate jasmine tests for common/lib 2012-11-14 15:03:55 -05:00
Chris Dodge
b779a421d7 check for the existence of static and static/subs directories 2012-11-14 12:37:17 -05:00
Chris Dodge
1e598ad1f5 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint 2012-11-13 10:34:31 -05:00
Calen Pennington
dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	lms/static/sass/course/courseware/_courseware.scss
 2012-11-13 10:22:42 -05:00
Victor Shnayder
3f95116ac1 only ask for hints if assessed as wrong 2012-11-12 16:23:58 -05:00
Victor Shnayder
6e5a6f9753 make textboxes read-only when that makes sense. 
- also make reset hide the original output
 2012-11-12 16:23:29 -05:00
Vik Paruchuri
39210fa95f Move point where input box is disabled 2012-11-12 14:20:44 -05:00
Vik Paruchuri
d5702fc712 Add in ability to define score points 2012-11-12 14:19:04 -05:00
Vik Paruchuri
ba8781ddf4 Modify to store scores instead of correct/incorrect, remove student ability to edit response 2012-11-12 14:07:06 -05:00
Victor Shnayder
0ad2154b86 merge in origin/master 2012-11-12 13:10:21 -05:00
Victor Shnayder
68fb5c9799 bugfixes re: button state 2012-11-12 13:03:12 -05:00
Victor Shnayder
4922ab33c0 hook up reset button 2012-11-12 12:43:55 -05:00
Victor Shnayder
0ec7043e05 mostly working version of self-assessment 
TODO:
* better css
* green checkmark
* reset button
* tests
 2012-11-12 12:14:12 -05:00
Victor Shnayder
ca9cb86a7d show proper course will-start/started/ended text on dashboard 2012-11-09 18:18:37 -05:00
Victor Shnayder
1b2371d64a fix bug in has_ended 2012-11-09 18:18:37 -05:00