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

3005 Commits

Author SHA1 Message Date
Matthew Mongeau
3ae48d19b4 Passes course around for courseware. Fix static assets. 2012-07-03 12:13:15 -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
b3cc34c3d4 add debugging to courseware debug (tricky with https behind gunicorn) 2012-07-01 13:16:09 -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
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
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
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
3a54916b2d Help link 2012-06-29 11:52:48 -04:00
Matthew Mongeau
bd4a9471bf Display enrollments on dashboard. Add reverse to navigation and footer links. 2012-06-29 11:25:16 -04:00
Bridger Maxwell
8002644436 Added migrations for simplewiki. It is a tricky one to apply. Don't attempt at home. 2012-06-28 15:58:11 -04:00
Matthew Mongeau
0750ee0531 Registrations and signup form 2012-06-28 15:38:36 -04:00
Bridger Maxwell
2a9a15ad66 Beginning to port wiki to multicourse. (Unstable) 2012-06-28 15:11:00 -04:00
Bridger Maxwell
cbe5c612b4 Used dictionary update for cleaner course settings code. 2012-06-28 14:04:50 -04:00
Bridger Maxwell
3386031fea Moved more pieces of the about page to live in the course data directory. 2012-06-28 12:58:04 -04:00
Bridger Maxwell
201f093981 Removed old import. 2012-06-28 12:34:45 -04:00
Bridger Maxwell
621680e340 Removed old global course settings file. 2012-06-28 12:31:29 -04:00
Bridger Maxwell
51d6b3f096 Changed course settings to be a json file. Moved it to its own file. 2012-06-28 12:04:03 -04:00
Calen Pennington
2fde7f4c6d Minor fixes from pull request 131 2012-06-28 08:39:12 -04:00
ichuang
3f60c76fad Merge branch 'ps-fix-problem' of github.com:MITx/mitx into stable-edx4edx 2012-06-27 19:14:32 -04:00
Bridger Maxwell
dfc2a35442 First pass at putting dyanamic content from data on course about page. 2012-06-27 18:31:39 -04:00
Bridger Maxwell
bf4f946f0d Put in a fix for the Profile page (a bug was showing up for new users). A basecamp discussion will be started on the issue. 2012-06-27 14:47:16 -04:00
Matthew Mongeau
56d5e54150 Hook up about and jobs pages. Use named route for root. 2012-06-27 13:52:49 -04:00
ichuang
200e188c09 add MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] config for edx4edx activation 
- issue is that content machine isn't whitelisted for email
 - this also provides secondary filtering for user registration
 2012-06-26 23:00:25 -04:00
ichuang
bda75b4fbd add admin model for student (need to be able to see activation keys in db) 2012-06-26 23:07:45 +00:00
Matthew Mongeau
b8d50e51ee Course navigation work 2012-06-26 17:23:16 -04:00
ichuang
caa14922bb edx4edx configuration running on content server. Notes: 
- django debug commented out in lms/envs/dev.py (temporarily - need cleanup)
  - email backend set
  - index page modified for edx4edx
 2012-06-26 14:04:56 +00:00