Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ichuang
ff96fbf5d5 Merge pull request #146 from MITx/cpennington/cms-xml-processing 
These changes make xml import into the cms use XModuleDescriptors
 2012-07-01 10:55:53 -07:00
Calen Pennington
e61946dfea Fix titles in sequence module display 2012-07-01 13:52:06 -04:00
ichuang
8467aa0846 fix dev_edx4edx mako path - add EDX4EDX_ROOT 2012-07-01 17:44:04 +00:00
Calen Pennington
19a958a3d4 Renaming keystore to modulestore for clarity 2012-07-01 13:33:32 -04: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
pmitros
81a1dd8975 Merge pull request #151 from MITx/course_settings_json 
Course settings is in json, not python
 2012-06-30 04:30:47 -07:00
ichuang
7f4ebcb6a9 pep8 fixes - inputtypes 2012-06-29 23:22:40 -04:00
ichuang
fedf216bde Exception, err -> Exception as err 2012-06-29 23:18:58 -04:00
ichuang
547e19625a exception as err 2012-06-29 23:09:26 -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
ichuang
735833c135 Merge branch 'stable-edx4edx' of github.com:MITx/mitx into stable-edx4edx 2012-06-29 14:50:47 -04:00
ichuang
8283636e39 inputtypes: if externalresponse server message is bad, don't crash 2012-06-29 14:50:11 -04:00
Matthew Mongeau
9d4043e40e Redirect to dashboard when visiting the hoem page while signed in. 2012-06-29 13:38:28 -04:00
John Jarvis
d61d084599 postrm update 2012-06-29 13:33:14 -04:00
Calen Pennington
99ae0c2041 Import logging where needed 2012-06-29 13:16:04 -04:00
John Jarvis
6229b2d1f4 updating rakefile to cleanup on package removal 2012-06-29 13:14:36 -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
dcd74e6dd0 Make abtests work, using the new abtest xml format 2012-06-29 12:45:18 -04:00
Calen Pennington
c3a432f217 Make problemsets display as verticals rather than sequences 2012-06-29 12:45:18 -04:00
Calen Pennington
27b75ca76e Use display_name in sequence title bar 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
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