Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,489 Commits 1 Branch 0 Tags
ee618d422306331c3791ca0ee0f41bdfebb40ade
Commit Graph

1428 Commits

Author SHA1 Message Date
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
ichuang
f84f08fae4 xml_importer bugfix - when importing without policy override use course_location 2012-11-17 21:38:15 -05:00
Calen Pennington
650f537763 Merge pull request #1043 from MITx/feature/cale/quieter-jasmine-tests 
Make jasmine testing quieter
 2012-11-16 13:35:45 -08: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
Calen Pennington
630c2fa21e Make jasmine testing quieter 2012-11-13 10:55:17 -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
Victor Shnayder
2846c61d15 Revert "remove (almost) all references to askbot." 
This reverts commit 793354a0dc.
 2012-11-09 18:18:37 -05:00
Victor Shnayder
cf33d85ef9 Wire up cert status 2012-11-09 18:18:36 -05:00
Victor Shnayder
76f0cf4a86 remove (almost) all references to askbot. 2012-11-09 18:18:33 -05:00
Victor Shnayder
f88cb685aa split out the assess and reflect states. Still need matching js 2012-11-09 16:20:53 -05:00
Chris Dodge
5a02e37cce make sure we strip away the leading '/' from the subpath for static content otherwise the naming expectations will break 2012-11-09 09:11:56 -05:00
Victor Shnayder
fb3b52b99f refactor + style self-assessment in progress 2012-11-08 18:01:09 -05:00
chrisndodge
13700316a6 Merge pull request #1025 from MITx/feature/cdodge/static-tab-edit 
Feature/cdodge/static tab edit
 2012-11-08 13:10:51 -08:00
Chris Dodge
c3c6a7af7e address feedback from cale 2012-11-08 13:29:46 -05:00
Calen Pennington
171e932266 Merge branch 'master' into feature/cale/cms-master 
Conflicts:
	rakefile
 2012-11-08 12:28:40 -05:00
Calen Pennington
3230345204 Make coverage reports only include code from the source directories 2012-11-08 12:25:12 -05:00
Ned Batchelder
28bb4724e7 Put the coverage data files in the reports dir, where they will be treated like the disposable things they are. 2012-11-08 11:20:23 -05:00
Ned Batchelder
3dc23eb131 Coverage xml and html reports are now a separate 'xml' and 'html' step from 'test'. 2012-11-08 11:20:22 -05:00
Ned Batchelder
90e3386751 WIP for quieter tests with coverage. 2012-11-08 11:19:33 -05:00
Chris Dodge
7dbabce4db fix up styling by reusing existing CSS class names. Also refactor some code regarding the management of static_tabs so that it's in the course as course contains references to static_tabs in the current data model 2012-11-08 09:55:52 -05:00
Carlos Andrés Rocha
25d482099e Merge pull request #955 from MITx/louis/srt_downloads 
Add support for subtitle download link
 2012-11-07 15:31:02 -08:00
Victor Shnayder
e3c213dd38 Refactor html and js. 
Next:
  - more clear states (logic in python, view in js)
  - style
 2012-11-07 18:18:35 -05:00
Chris Dodge
a99277275d add new files 2012-11-07 15:56:16 -05:00
Chris Dodge
9cc1af5052 first pass at static tab editing. Doesn't yet support drag/drop as well as new tab creation, which needs to modify the policy on the course 2012-11-07 15:27:44 -05:00