Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

18841 Commits

Author SHA1 Message Date
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
b432db1aba Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/static-tab-edit 2012-11-08 09:55:56 -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
chrisndodge
e3d65a0c08 Merge pull request #997 from MITx/feature/cale/js-tests 
Feature/cale/js tests
 2012-11-08 06:44:49 -08:00
David Ormsbee
459c5e322f Merge pull request #1024 from MITx/feature/dave/pearson_setup 
Simple Pearson Testing
 2012-11-07 16:29:29 -08:00
David Ormsbee
e90d321142 Comments, whitespace from review. 2012-11-07 19:28:22 -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
David Ormsbee
4b02b2af2a Rearrange how we handle the auth tokens for our fake Pearson preliminary testing 2012-11-07 17:20:49 -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
David Ormsbee
528fcd7f4e Create a config option for enabling a Pearson login in a totally hacky manner. 2012-11-07 14:08:55 -05:00
David Ormsbee
92f2fbf0f8 Ugly, ugly hack needed so that Pearson can test something today, to be replaced by a real implementation later this week or early next. 2012-11-07 13:55:08 -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
David Ormsbee
ad93f70e65 Re-add TestCenterUser along with a basic command to make an entry for a given user already in the system. 2012-11-07 09:24:38 -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
David Ormsbee
847b2eb7e0 Merge branch 'master' into feature/dave/pearson_setup 2012-11-06 11:54:13 -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
Vik Paruchuri
92e931b15b Rename hint to hints 2012-11-05 19:02:36 -05:00
Vik Paruchuri
9310267e0b Proper instance state storage, remove correctmap vars 2012-11-05 18:57:19 -05:00
Vik Paruchuri
dfbfc7905f Work on templating, bugfix 2012-11-05 18:48:41 -05:00
Vik Paruchuri
e94a78c6bb Refactor code to make it simpler, pull out templates 2012-11-05 18:42:55 -05:00
Victor Shnayder
914e9c9b83 Mid-cleanup. 
- remove all the html-module-specific cruft
 2012-11-05 18:01:31 -05:00
Vik Paruchuri
f9555d815a changed points in progress tab to being completion based, not correctness based 2012-11-05 08:55:15 -05:00
David Ormsbee
f38ba3ce5c Merge pull request #1012 from MITx/bugfix/victor/xml-loading 
Fix a bug with pointer-tag detection on load
 2012-11-02 14:04:53 -07:00
Victor Shnayder
55a0cada7b Fix a bug with pointer-tag detection on load 
if a tag has text but no children, wasn't properly detected as an inline definition.
 2012-11-02 16:59:41 -04:00
Calen Pennington
e35d1483c6 Merge pull request #1009 from MITx/bug/lyla/latextemplate 
fixed typo
 2012-11-02 13:38:40 -07:00
Victor Shnayder
9db977feae Merge pull request #1002 from MITx/feature/victor/inputtypes-refactor 
More inputtype refactor …
 2012-11-02 13:05:40 -07:00
Don Mitchell
8089be3354 Minor stylistic change on jQuery pattern. 2012-11-02 15:31:02 -04:00
Victor Shnayder
79174259cb Address Ike's comments. 
- change a few comments / strings
- move extract_choices into the ChoiceGroup class
 2012-11-02 14:00:51 -04:00
Vik Paruchuri
4bde46677b sync answer, correctness, hint, so they all save at the same time 2012-11-02 13:27:06 -04:00
Vik Paruchuri
35fa61cca3 add some documentation 2012-11-02 13:09:58 -04:00
Vik Paruchuri
3da43fc2ee add in ability to store multiple answers 2012-11-02 13:05:32 -04:00