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

2544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Fiedler
f1623ec605 Added more tweeks to the calendar and unit pages 2012-07-09 10:04:20 -04:00
Kyle Fiedler
94fccb0017 Added fixes for the sidebar, made better base style for inputs and brightened colors a bit 2012-07-09 10:04:19 -04:00
Kyle Fiedler
985a5323f4 Added some hovers fo the caledar 2012-07-09 10:04:19 -04:00
ichuang
5ee2980708 Merge branch 'kf-inline-inputs' of github.com:MITx/mitx into ichuang/stable_edx4edx_merge 2012-07-08 22:26:58 -04:00
ichuang
3a664753b4 minor changes - test this branch with more courses (8.01x, 6.00x) 2012-07-08 22:05:21 -04:00
ichuang
aedcd9a4c4 change "type" to "category" in xml_module.py 2012-07-08 22:04:54 -04:00
ichuang
0daf7b0497 merging of stable-edx4edx into master - bugfixes and debugging 2012-07-08 19:03:29 -04:00
ichuang
4356ec5c45 default course to settings.COURSE_DEFAULT 2012-07-08 17:00:08 -04:00
ichuang
9b90068e03 Merge branch 'stable-edx4edx' of github.com:MITx/mitx 
Conflicts:
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/xmodule/capa_module.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/multicourse/multicourse_settings.py
 2012-07-08 16:52:36 -04:00
Prem Sichanugrist
9801ce5d3b Add documentation for running JavaScript test 2012-07-06 14:19:32 -04:00
ichuang
74e01bb07a fixed two bugs in inputtypes: textline with quotes crashed problems, and 
choice without text caused error
 2012-07-06 09:49:08 -04:00
Kyle Fiedler
82c68dd845 Removed table borders and declared inputs as inline instead of inline-block 2012-07-05 10:01:02 -04:00
Calen Pennington
87e612f0f2 Don't swallow messages going to the root logger 2012-07-05 08:48:08 -04:00
ichuang
a5f3d8a900 fix handling of tail in inputtypes.math (needed saxutils.escape) 2012-07-04 16:06:07 -04:00
ichuang
edeb81ce63 change 8.01x default chapter 2012-07-04 15:50:39 -04:00
ichuang
d8b22ff12f add hidden attribute to textline and textbox inputtypes, for javascript problems 2012-07-04 14:13:13 -04:00
ichuang
1f29403ace typo in loncapa_check 2012-07-03 17:06:39 -04:00
ichuang
96c132b333 put try around Progress call in capa_module - exception when divide by zero 2012-07-03 17:02:01 -04:00
ichuang
105f429d61 fix bug in loncapa_check 2012-07-03 16:42:08 -04:00
Kyle Fiedler
841fb8da0b Added the wip calss back in 2012-07-03 16:26:56 -04:00
Kyle Fiedler
ffea8e3e7d added more style for unit page, hovers, and buttons 2012-07-03 16:19:19 -04:00
Kyle Fiedler
20df117bfc Added style for the calendar view and section view 2012-07-03 16:19:19 -04:00
Kyle Fiedler
3415e48be5 Added bug fix for speed selector 2012-07-03 16:03:29 -04:00
Prem Sichanugrist
28cc64b9b1 Remove unused lms/problem.js 2012-07-03 15:00:41 -04:00
Prem Sichanugrist
cec1b23d7d Remove mystery guest from the test 2012-07-03 14:53:57 -04:00
Prem Sichanugrist
0815f3498a Cleanup Video Logger, update logging message 2012-07-03 14:35:40 -04:00
Prem Sichanugrist
8fb06ce194 Update code according to changes in 829e502 2012-07-03 14:33:24 -04:00
Prem Sichanugrist
de4d487402 Fix failing tests after jQuery upgrade 2012-07-03 14:33:23 -04:00
Prem Sichanugrist
e7e0fe1f3d Fix element naming convention 2012-07-03 14:33:23 -04:00
Prem Sichanugrist
4e183dd6e1 Clean up events binding in Video Player 
* Video Player now acting as a parent that always knowing the state of
  their children.
* Events on the sub-controls are now triggered on itself, and binded by
  the Video Player instead of triggering everything on the Video Player.
* A new helper class, SubView, has been introduced to cleanup repeat
  logic on scoped jQuery selector, render() and bind()
 2012-07-03 14:33:23 -04:00
Calen Pennington
207777fbe1 Fix up problem display to use the new metadata that's available 2012-07-03 14:20:11 -04:00
Calen Pennington
42cef5b788 Get rid of references to self.filename in capa_module, as it no longer exists 2012-07-03 14:19:51 -04:00
ichuang
ce74aa798d fix name of 6.002x course to correspond to change in course.xml 2012-07-03 12:16:33 -04:00
Calen Pennington
68c155b268 Don't use __dict__ for namedtuples, because it doesn't work in python 2.7.1 2012-07-03 09:57:51 -04:00
Calen Pennington
92ea15b786 Merge pull request #155 from MITx/cpennington/cms-xml-export 
This allows XModuleDescriptors to export themselves to XML
 2012-07-02 17:08:36 -07:00
Calen Pennington
64a4a62cf5 Don't pass fileobjects to LoncapaProblem 2012-07-02 20:01:20 -04:00
Calen Pennington
3355f804d1 Add logging of filename when module file parsing fails 2012-07-02 20:01:01 -04:00
Calen Pennington
e172be3a26 Make XML import pass in an empty render_template function 2012-07-02 19:55:42 -04:00
ichuang
20720c91b9 add 7.00x to dev_ike.py 2012-07-02 18:29:42 -04:00
Calen Pennington
3b4fb61648 Push dependency on mitxmako up out of mako_module 2012-07-02 14:10:29 -04:00
ichuang
1509cdcced Merge pull request #153 from MITx/cpennington/lms-descriptors 
These changes make the LMS read from the XML course files using the ModuleStore interface. 

Note that stable-edx4edx will now no longer be a clean merge.  But this code has priority.
 2012-07-02 10:52:22 -07:00
Calen Pennington
d7178e4a41 Add a set of rake tasks for checking settings importability 2012-07-02 13:26:31 -04:00
Calen Pennington
e56f8763ac Point to the js files in package data 2012-07-02 13:26:14 -04:00
Calen Pennington
a0f550396c Make xmodule fit the typical python installation setup 2012-07-02 13:19:27 -04:00
Calen Pennington
cc8ecb1891 Make xmodule tests pass again 2012-07-02 12:50:03 -04:00
Calen Pennington
8f59521660 Add a function to check round-trip export/import cycles 2012-07-02 12:25:48 -04:00
Calen Pennington
be40d8bb69 Make sure that xml_module definition xml doesn't have any metadata sprinkled in with it 2012-07-02 12:25:09 -04:00
Calen Pennington
c57833dab7 Define equality for XModuleDescriptors 2012-07-02 12:24:39 -04:00
Calen Pennington
f035d5602d Keep abtest children in a consistent order (makes testing easier) 2012-07-02 12:24:07 -04:00
ichuang
63aa451d67 use course = settings.COURSE_DEFAULT.replace('_',' ') for default accordion 2012-07-02 11:29:45 -04:00