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

10211 Commits

Author SHA1 Message Date
Calen Pennington
207777fbe1 Fix up problem display to use the new metadata that's available 2012-07-03 14:20:11 -04:00
Bridger Maxwell
e122583440 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-07-03 09:59:37 -07:00
Bridger Maxwell
064274a756 Most of the wiki pages are now loading without errors. 2012-07-03 09:50:58 -07:00
ichuang
ce74aa798d fix name of 6.002x course to correspond to change in course.xml 2012-07-03 12:16:33 -04:00
Matthew Mongeau
3ae48d19b4 Passes course around for courseware. Fix static assets. 2012-07-03 12:13:15 -04:00
ichuang
20720c91b9 add 7.00x to dev_ike.py 2012-07-02 18:29:42 -04:00
Galen Frechette
506ee58b61 fixes template paths in course_about.html 2012-07-02 15:45:05 -04:00
Galen Frechette
c4bdfd9d6a wip course info/profile page 2012-07-02 15:39:19 -04:00
Galen Frechette
11bf79a52e cleans up course info/profile page 2012-07-02 15:38:21 -04:00
Galen Frechette
909f78c8ef cleans up course info/profile page 2012-07-02 14:26:11 -04:00
Galen Frechette
4359a2544e wip course info/profile page 2012-07-02 14:23:14 -04:00
Galen Frechette
e0f01aa828 cleans up course info/profile page 2012-07-02 14:11:25 -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
Bridger Maxwell
baa2c06803 Got history and view revision working on wiki. 2012-06-29 20:53:36 -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
Matthew Mongeau
9d4043e40e Redirect to dashboard when visiting the hoem page while signed in. 2012-06-29 13:38:28 -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
Calen Pennington
2011861444 Get capa problems to display from a keystore 2012-06-29 12:42:48 -04:00
Calen Pennington
de07b8b345 Begin using a Keystore for XML parsing. Still broken: sequence icons, custom tags, problems, video js 2012-06-29 12:40:50 -04:00
Bridger Maxwell
0c4b6f3065 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-06-29 12:18:30 -04:00
Bridger Maxwell
7cfb8ddb8e Merge 2012-06-29 12:08:27 -04:00
Bridger Maxwell
b69deb698d Got the view page of the wiki rendering. Most of it is a styling mess. 2012-06-29 12:05:55 -04:00
Matthew Mongeau
e9d006e324 Signing in brings you to your dashboard instead of the courses page with a find courses button when not enrolled. 2012-06-29 11:57:48 -04:00
Matthew Mongeau
3a54916b2d Help link 2012-06-29 11:52:48 -04:00