Commit Graph

65817 Commits

Author SHA1 Message Date
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
5cd388d638 Have the CMS use the same XMLModuleStore for import that the LMS uses for reading content 2012-06-29 12:44:15 -04:00
Calen Pennington
7d16dbbcb4 Clean up module_render.py 2012-06-29 12:42:48 -04:00
Calen Pennington
bae90ab16d Make custom tags work in the LMS 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
6987349561 Make icons show up in sequences containing verticals that contain videos 2012-06-29 12:40:51 -04:00
Calen Pennington
c6b477c815 Use html safe IDs for sequences and videos 2012-06-29 12:40:50 -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
Calen Pennington
5b8120280e Move the resources_fs abstraction into the primary DescriptorSystem, as it is needed for more than just XMLParsing 2012-06-29 12:38:58 -04:00
Calen Pennington
3c054306c6 Add the ability to specify Keystore engines and default descriptor classes by name from settings 2012-06-29 12:38:10 -04:00
Calen Pennington
d02abac820 Restrict the set of characters allowed in locations further 2012-06-29 12:38:10 -04:00
Calen Pennington
21ba501989 Revert "Make import work via mako again, to unblock others while I work on making the LMS work using XModuleDescriptors"
This reverts commit 6fdf44fe8d.
2012-06-29 12:38:10 -04:00
Calen Pennington
3c60d1a9af Clean up how errors in import command are handled 2012-06-29 12:34:58 -04:00
Bridger Maxwell
0c4b6f3065 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-06-29 12:18:30 -04:00
Calen Pennington
feef179e3e Merge remote-tracking branch 'origin/master' into cpennington/cms-xml-processing
Conflicts:
	cms/envs/common.py
2012-06-29 12:11:35 -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
Matthew Mongeau
0028324161 Change username in navigation from static copy. 2012-06-29 11:44:34 -04:00
Matthew Mongeau
31efd1f72e Dashboard coarses link to the info page. 2012-06-29 11:42:43 -04:00
Matthew Mongeau
bd4a9471bf Display enrollments on dashboard. Add reverse to navigation and footer links. 2012-06-29 11:25:16 -04:00
John Jarvis
6df2226777 updating URL for activation email to edx4edx 2012-06-29 09:37:14 -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
8715187a31 Successfull signup works. 2012-06-28 15:38:40 -04:00
Matthew Mongeau
219a9b5aa3 Fixed form for signup 2012-06-28 15:38:40 -04:00
Matthew Mongeau
95008dfde3 Changing form variables. 2012-06-28 15:38:40 -04:00
Matthew Mongeau
3068afccc0 Add error div. 2012-06-28 15:38:39 -04:00
Matthew Mongeau
cddf4cf6cf Wip on sign up form. 2012-06-28 15:38:39 -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
ichuang
8a6dd2f756 add 6.00x to dev_ike.py 2012-06-28 14:20:22 -04:00
Bridger Maxwell
cbe5c612b4 Used dictionary update for cleaner course settings code. 2012-06-28 14:04:50 -04:00
Bridger Maxwell
ef3afda283 Slash at the end of courses/ is now optionally there. 2012-06-28 14:01:19 -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
John Jarvis
db614b2c16 removing symlinks 2012-06-28 12:51:50 -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
789325b400 Merge branch 'master' of github.com:MITx/mitx 2012-06-28 12:04:11 -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
194908711d Import x_module using the full path 2012-06-28 11:52:58 -04:00
Calen Pennington
f59951ead5 Run tests before running code quality checks (for faster turnaround time) 2012-06-28 11:51:37 -04:00
Calen Pennington
19044abed2 Run tests before running code quality checks (for faster turnaround time) 2012-06-28 11:29:46 -04:00
Calen Pennington
919f8cf261 Import x_module using the full path 2012-06-28 11:28:42 -04:00
Bridger Maxwell
fc1eeb08e3 Still working on making sections of the course about page dynamic. 2012-06-28 11:24:39 -04:00
John Jarvis
5c398b25da updating edx4edx_aws config 2012-06-28 11:15:03 -04:00
ichuang
5688e89fab change MITx -> edX in many lms templates 2012-06-28 10:26:59 -04:00