Commit Graph

  • 3cf29af8fe Make location into a named tuple, and use it more as a first class entity, rather than URL for identifying content Calen Pennington 2012-07-02 10:17:59 -04:00
  • 7ed9b4aa89 Add hashing and equality methods to Location Calen Pennington 2012-07-02 09:08:24 -04:00
  • 736148f21d Adding clarifying comment about the contents of 'data' Calen Pennington 2012-07-02 09:02:41 -04:00
  • 7ac8fecb38 Rename XModule[Descriptor].type to .category to be parallel to Location Calen Pennington 2012-07-02 09:01:08 -04:00
  • 7b78fa5278 Make self.rerandomize a property accessor that reads from metadata Calen Pennington 2012-07-02 08:57:05 -04:00
  • 4ae711c421 Clarify from_json arguments Calen Pennington 2012-07-02 08:54:23 -04:00
  • 32ed18fef6 Allow slightly more latitude in what is passed as the children array Calen Pennington 2012-07-02 08:54:13 -04:00
  • cff8ae4623 Add more documentation to XModule Calen Pennington 2012-07-02 08:50:56 -04:00
  • 6686179bb6 Moving __init__ functions in xmodule to top of class for consistancy Calen Pennington 2012-07-01 14:15:02 -04:00
  • ff96fbf5d5 Merge pull request #146 from MITx/cpennington/cms-xml-processing ichuang 2012-07-01 10:55:53 -07:00
  • e61946dfea Fix titles in sequence module display Calen Pennington 2012-07-01 13:52:06 -04:00
  • 8467aa0846 fix dev_edx4edx mako path - add EDX4EDX_ROOT ichuang 2012-07-01 17:44:04 +00:00
  • 19a958a3d4 Renaming keystore to modulestore for clarity Calen Pennington 2012-07-01 13:33:32 -04:00
  • 5f4a27d6cc typo ichuang 2012-07-01 13:17:57 -04:00
  • b3cc34c3d4 add debugging to courseware debug (tricky with https behind gunicorn) ichuang 2012-07-01 13:16:09 -04:00
  • d28ad6ced8 lms/envs/edx4edx_aws update ichuang 2012-07-01 12:53:31 -04:00
  • 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 ichuang 2012-07-01 12:51:14 -04:00
  • 7e25e30ac1 Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx ichuang 2012-07-01 12:26:04 -04:00
  • 81a1dd8975 Merge pull request #151 from MITx/course_settings_json pmitros 2012-06-30 04:30:47 -07:00
  • 7f4ebcb6a9 pep8 fixes - inputtypes ichuang 2012-06-29 23:22:40 -04:00
  • fedf216bde Exception, err -> Exception as err ichuang 2012-06-29 23:18:58 -04:00
  • 547e19625a exception as err ichuang 2012-06-29 23:09:26 -04:00
  • baa2c06803 Got history and view revision working on wiki. Bridger Maxwell 2012-06-29 20:53:36 -04:00
  • 0f1ae7f03b Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx ichuang 2012-06-29 16:22:49 -04:00
  • 14745893b7 add edx4edx root stuff from aws config to dev_ike config ichuang 2012-06-29 15:47:49 -04:00
  • 735833c135 Merge branch 'stable-edx4edx' of github.com:MITx/mitx into stable-edx4edx ichuang 2012-06-29 14:50:47 -04:00
  • 8283636e39 inputtypes: if externalresponse server message is bad, don't crash ichuang 2012-06-29 14:50:11 -04:00
  • 9d4043e40e Redirect to dashboard when visiting the hoem page while signed in. Matthew Mongeau 2012-06-29 13:37:55 -04:00
  • d61d084599 postrm update John Jarvis 2012-06-29 13:33:14 -04:00
  • 99ae0c2041 Import logging where needed Calen Pennington 2012-06-29 13:16:04 -04:00
  • 6229b2d1f4 updating rakefile to cleanup on package removal John Jarvis 2012-06-29 13:14:36 -04:00
  • 87d80835c0 Initialize StudentModule with the max_score Calen Pennington 2012-06-29 12:02:41 -04:00
  • f25478b3d4 Consolidate access to metadata, and allow some of it to be inherited between modules Calen Pennington 2012-06-29 11:56:38 -04:00
  • 2a9eba3886 Removing content_parser Calen Pennington 2012-06-29 09:12:17 -04:00
  • c7f95695c5 Fix check_course command Calen Pennington 2012-06-29 08:44:16 -04:00
  • 3a26b98027 Remove errant print line left over from debugging Calen Pennington 2012-06-29 08:44:03 -04:00
  • 3fdae56a27 Remove dead code Calen Pennington 2012-06-29 07:29:49 -04:00
  • d7ee03874d Make staff histograms work again Calen Pennington 2012-06-29 07:20:12 -04:00
  • c837cf797d Remove some unused code from content_parser Calen Pennington 2012-06-29 05:57:38 -04:00
  • dcd74e6dd0 Make abtests work, using the new abtest xml format Calen Pennington 2012-06-28 16:27:46 -04:00
  • c3a432f217 Make problemsets display as verticals rather than sequences Calen Pennington 2012-06-28 14:01:23 -04:00
  • 27b75ca76e Use display_name in sequence title bar Calen Pennington 2012-06-28 13:58:50 -04:00
  • 506c281bcc Make gradesheet work again Calen Pennington 2012-06-28 13:55:50 -04:00
  • 35af8101d7 Make grade graph on profile work correctly Calen Pennington 2012-06-28 13:40:37 -04:00
  • 23195e9d76 Make user profiles work again after the switch to an XMLModuleStore. Staff user histograms are still broken Calen Pennington 2012-06-28 13:08:09 -04:00
  • 5cd388d638 Have the CMS use the same XMLModuleStore for import that the LMS uses for reading content Calen Pennington 2012-06-28 10:35:39 -04:00
  • 7d16dbbcb4 Clean up module_render.py Calen Pennington 2012-06-28 08:58:18 -04:00
  • bae90ab16d Make custom tags work in the LMS Calen Pennington 2012-06-28 08:56:18 -04:00
  • c140fe8766 Get problem execution working with problems read from keystore Calen Pennington 2012-06-27 16:29:49 -04:00
  • 2011861444 Get capa problems to display from a keystore Calen Pennington 2012-06-27 16:15:40 -04:00
  • 6987349561 Make icons show up in sequences containing verticals that contain videos Calen Pennington 2012-06-27 14:39:09 -04:00
  • c6b477c815 Use html safe IDs for sequences and videos Calen Pennington 2012-06-27 14:31:35 -04:00
  • de07b8b345 Begin using a Keystore for XML parsing. Still broken: sequence icons, custom tags, problems, video js Calen Pennington 2012-06-27 14:25:44 -04:00
  • 5b8120280e Move the resources_fs abstraction into the primary DescriptorSystem, as it is needed for more than just XMLParsing Calen Pennington 2012-06-27 14:20:24 -04:00
  • 3c054306c6 Add the ability to specify Keystore engines and default descriptor classes by name from settings Calen Pennington 2012-06-27 14:17:15 -04:00
  • d02abac820 Restrict the set of characters allowed in locations further Calen Pennington 2012-06-27 14:15:46 -04:00
  • 21ba501989 Revert "Make import work via mako again, to unblock others while I work on making the LMS work using XModuleDescriptors" Calen Pennington 2012-06-26 14:35:47 -04:00
  • 3c60d1a9af Clean up how errors in import command are handled Calen Pennington 2012-06-29 12:34:58 -04:00
  • 0c4b6f3065 Merge branch 'dormsbee/multicourse' into multicourse_wiki Bridger Maxwell 2012-06-29 12:18:30 -04:00
  • feef179e3e Merge remote-tracking branch 'origin/master' into cpennington/cms-xml-processing Calen Pennington 2012-06-29 12:11:35 -04:00
  • 7cfb8ddb8e Merge Bridger Maxwell 2012-06-29 12:08:27 -04:00
  • b69deb698d Got the view page of the wiki rendering. Most of it is a styling mess. Bridger Maxwell 2012-06-29 12:05:55 -04:00
  • e9d006e324 Signing in brings you to your dashboard instead of the courses page with a find courses button when not enrolled. Matthew Mongeau 2012-06-29 11:57:48 -04:00
  • 3a54916b2d Help link Matthew Mongeau 2012-06-29 11:52:48 -04:00
  • 0028324161 Change username in navigation from static copy. Matthew Mongeau 2012-06-29 11:44:34 -04:00
  • 31efd1f72e Dashboard coarses link to the info page. Matthew Mongeau 2012-06-29 11:42:43 -04:00
  • bd4a9471bf Display enrollments on dashboard. Add reverse to navigation and footer links. Matthew Mongeau 2012-06-29 11:25:16 -04:00
  • 6df2226777 updating URL for activation email to edx4edx John Jarvis 2012-06-29 09:37:14 -04:00
  • 8002644436 Added migrations for simplewiki. It is a tricky one to apply. Don't attempt at home. Bridger Maxwell 2012-06-28 15:58:11 -04:00
  • 8715187a31 Successfull signup works. Matthew Mongeau 2012-06-28 15:29:56 -04:00
  • 219a9b5aa3 Fixed form for signup Matthew Mongeau 2012-06-28 15:20:13 -04:00
  • 95008dfde3 Changing form variables. Matthew Mongeau 2012-06-28 14:41:17 -04:00
  • 3068afccc0 Add error div. Matthew Mongeau 2012-06-28 14:01:27 -04:00
  • cddf4cf6cf Wip on sign up form. Matthew Mongeau 2012-06-28 10:28:19 -04:00
  • 0750ee0531 Registrations and signup form Matthew Mongeau 2012-06-27 16:21:11 -04:00
  • 2a9a15ad66 Beginning to port wiki to multicourse. (Unstable) Bridger Maxwell 2012-06-28 15:11:00 -04:00
  • 8a6dd2f756 add 6.00x to dev_ike.py ichuang 2012-06-28 14:20:22 -04:00
  • cbe5c612b4 Used dictionary update for cleaner course settings code. Bridger Maxwell 2012-06-28 14:04:50 -04:00
  • ef3afda283 Slash at the end of courses/ is now optionally there. Bridger Maxwell 2012-06-28 14:01:19 -04:00
  • 3386031fea Moved more pieces of the about page to live in the course data directory. Bridger Maxwell 2012-06-28 12:58:04 -04:00
  • db614b2c16 removing symlinks John Jarvis 2012-06-28 12:51:50 -04:00
  • 201f093981 Removed old import. Bridger Maxwell 2012-06-28 12:34:45 -04:00
  • 621680e340 Removed old global course settings file. Bridger Maxwell 2012-06-28 12:31:29 -04:00
  • 789325b400 Merge branch 'master' of github.com:MITx/mitx Bridger Maxwell 2012-06-28 12:04:11 -04:00
  • 51d6b3f096 Changed course settings to be a json file. Moved it to its own file. Bridger Maxwell 2012-06-28 12:04:03 -04:00
  • 194908711d Import x_module using the full path Calen Pennington 2012-06-28 11:28:42 -04:00
  • f59951ead5 Run tests before running code quality checks (for faster turnaround time) Calen Pennington 2012-06-28 11:29:46 -04:00
  • 19044abed2 Run tests before running code quality checks (for faster turnaround time) Calen Pennington 2012-06-28 11:29:46 -04:00
  • 919f8cf261 Import x_module using the full path Calen Pennington 2012-06-28 11:28:42 -04:00
  • fc1eeb08e3 Still working on making sections of the course about page dynamic. Bridger Maxwell 2012-06-28 11:24:39 -04:00
  • 5c398b25da updating edx4edx_aws config John Jarvis 2012-06-28 11:15:03 -04:00
  • 5688e89fab change MITx -> edX in many lms templates ichuang 2012-06-28 10:26:59 -04:00
  • fedf2c8d00 Merge pull request #150 from MITx/stable-edx4edx-aws Calen Pennington 2012-06-28 05:39:42 -07:00
  • 2fde7f4c6d Minor fixes from pull request 131 Calen Pennington 2012-06-28 08:39:12 -04:00
  • 6f5e54b9de Merge pull request #147 from MITx/ps-fix-problem ichuang 2012-06-27 16:21:17 -07:00
  • 3f60c76fad Merge branch 'ps-fix-problem' of github.com:MITx/mitx into stable-edx4edx ichuang 2012-06-27 19:14:32 -04:00
  • dfc2a35442 First pass at putting dyanamic content from data on course about page. Bridger Maxwell 2012-06-27 18:31:39 -04:00
  • 03b6bd044e setting quickedit to true John Jarvis 2012-06-27 18:06:29 -04:00
  • 38425e9b9c adds styles back to courseware Galen Frechette 2012-06-27 15:55:05 -04:00
  • 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. Bridger Maxwell 2012-06-27 14:47:16 -04:00