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

5216 Commits

Author SHA1 Message Date
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
Calen Pennington
630c2fa21e Make jasmine testing quieter 2012-11-13 10:55: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
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
da3c3e5f20 initial xlint implementation. Accumulate all import errors during XmlModuleStore importing. Also do checks post XmlModuleStore import and assert that the structure (course->chapter->sequential->vertical) is present in the courses. 2012-11-09 13:54:12 -05:00
Chris Dodge
da8efc17de Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint 2012-11-09 09:37:21 -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
Chris Dodge
3774c95b5e Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint 2012-11-08 16:12:26 -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
981f5cee45 initial buildout of a 'xlint' test to verify legacy coursewar 2012-11-08 16:07:17 -05: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
Chris Dodge
87ff18dc56 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 2012-11-07 09:35:21 -05:00
Carlos Andrés Rocha
07da271747 Merge pull request #1022 from MITx/ie8patch 
revert to using getElementsByClassName in .dialog b/c jQuery was
 2012-11-06 14:14:07 -08:00
Don Mitchell
ce623bcf17 revert to using getElementsByClassName in .dialog b/c jQuery was 
undefined on the content passed in & whole widget is disabled in ie8.
 2012-11-06 17:05:44 -05:00
Calen Pennington
bca0134a35 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-06 16:13:31 -05:00
Chris Dodge
55c69a1e13 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 
Conflicts:
	lms/djangoapps/courseware/module_render.py
 2012-11-06 14:20:59 -05:00
Vik Paruchuri
b66a559b1d Add some more docs to code, remove some old code that assigned points. 2012-11-06 09:49:00 -05:00
Vik Paruchuri
fee0facd39 Add in some docs for tests, factor out class name in js 2012-11-06 09:30:59 -05:00
Calen Pennington
6212507b55 Merge pull request #1008 from MITx/ie8patch 
merge to master
 2012-11-06 06:18:01 -08:00
Vik Paruchuri
71547e29da Added tests for selfassessment import and export (both pass) 2012-11-06 09:17:35 -05:00
Vik Paruchuri
b209018c46 Adding tests 2012-11-06 09:03:59 -05:00
Vik Paruchuri
2aeb6150d3 Work on documentation 2012-11-05 19:18:04 -05:00
Vik Paruchuri
88491f7bb1 moved everything to templates, added hint prompt 2012-11-05 19:13:48 -05:00