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

177 Commits

Author SHA1 Message Date
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
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
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
edeb81ce63 change 8.01x default chapter 2012-07-04 15:50:39 -04:00
ichuang
1f29403ace typo in loncapa_check 2012-07-03 17:06:39 -04:00
ichuang
105f429d61 fix bug in loncapa_check 2012-07-03 16:42:08 -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
ichuang
ce74aa798d fix name of 6.002x course to correspond to change in course.xml 2012-07-03 12:16:33 -04:00
ichuang
20720c91b9 add 7.00x to dev_ike.py 2012-07-02 18:29:42 -04:00
ichuang
63aa451d67 use course = settings.COURSE_DEFAULT.replace('_',' ') for default accordion 2012-07-02 11:29:45 -04:00
ichuang
10a10c7938 clean up email settings check in lms.djangoapps.student.views 2012-07-02 11:21:00 -04:00
Calen Pennington
6612beab46 Acknowledge the fact that right now keystore is really just a module store. If we need a keystore that returns other objects, we can reexctract the base class into it's own module again 2012-07-02 11:15:37 -04:00
Calen Pennington
79987666df Lazily load module definition and metadata as needed, rather than immediately 2012-07-02 10:50:27 -04:00
Calen Pennington
51a790173f Only set the default etree parser options in the module that is starting the xml parsing 2012-07-02 10:35:40 -04:00
Calen Pennington
b5cd01841c Merge remote-tracking branch 'origin/master' into cpennington/lms-descriptors 
Conflicts:
	lms/djangoapps/courseware/grades.py
 2012-07-02 10:31:26 -04:00
Calen Pennington
3cf29af8fe Make location into a named tuple, and use it more as a first class entity, rather than URL for identifying content 2012-07-02 10:17:59 -04:00
Calen Pennington
7ac8fecb38 Rename XModule[Descriptor].type to .category to be parallel to Location 2012-07-02 09:01:08 -04:00
ichuang
8467aa0846 fix dev_edx4edx mako path - add EDX4EDX_ROOT 2012-07-01 17:44:04 +00:00
ichuang
5f4a27d6cc typo 2012-07-01 13:17:57 -04:00
ichuang
b3cc34c3d4 add debugging to courseware debug (tricky with https behind gunicorn) 2012-07-01 13:16:09 -04:00
ichuang
d28ad6ced8 lms/envs/edx4edx_aws update 2012-07-01 12:53:31 -04:00
ichuang
23128ced67 courseware views now goes to default chapter and section if unprovided 
- uses multicourse settings (default_chapter and default_section)
  - it would be nice to use course_settings instead, but that is not
    currently compatible with multicourse
 2012-07-01 12:51:14 -04:00
ichuang
7e25e30ac1 Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx 2012-07-01 12:26:04 -04:00
ichuang
0f1ae7f03b Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx 2012-06-29 16:22:49 -04:00
ichuang
14745893b7 add edx4edx root stuff from aws config to dev_ike config 2012-06-29 15:47:49 -04:00
Calen Pennington
87d80835c0 Initialize StudentModule with the max_score 2012-06-29 12:45:46 -04:00
Calen Pennington
f25478b3d4 Consolidate access to metadata, and allow some of it to be inherited between modules 2012-06-29 12:45:46 -04:00
Calen Pennington
2a9eba3886 Removing content_parser 2012-06-29 12:45:46 -04:00
Calen Pennington
c7f95695c5 Fix check_course command 2012-06-29 12:45:46 -04:00
Calen Pennington
3a26b98027 Remove errant print line left over from debugging 2012-06-29 12:45:18 -04:00
Calen Pennington
3fdae56a27 Remove dead code 2012-06-29 12:45:18 -04:00
Calen Pennington
d7ee03874d Make staff histograms work again 2012-06-29 12:45:18 -04:00
Calen Pennington
c837cf797d Remove some unused code from content_parser 2012-06-29 12:45:18 -04:00
Calen Pennington
506c281bcc Make gradesheet work again 2012-06-29 12:45:18 -04:00
Calen Pennington
35af8101d7 Make grade graph on profile work correctly 2012-06-29 12:45:18 -04:00
Calen Pennington
23195e9d76 Make user profiles work again after the switch to an XMLModuleStore. Staff user histograms are still broken 2012-06-29 12:45:17 -04:00
Calen Pennington
7d16dbbcb4 Clean up module_render.py 2012-06-29 12:42:48 -04:00
Calen Pennington
c140fe8766 Get problem execution working with problems read from keystore 2012-06-29 12:42:48 -04:00