Commit Graph

  • 2c2e296034 Forgot to actually add migration file... Bridger Maxwell 2012-07-12 10:32:53 -04:00
  • 64888f1c1b Re-added the migration to expand the meta field. Bridger Maxwell 2012-07-12 10:29:15 -04:00
  • 1b118024a1 Merge pull request #174 from MITx/cpennington/cms-backcompat ichuang 2012-07-12 04:24:09 -07:00
  • b29649c49b Allow for more flexible candidates for replacement filepaths Calen Pennington 2012-07-11 23:00:56 -04:00
  • 379c6d164d Allow importing of courses that still have mako templating in them Calen Pennington 2012-07-11 22:17:53 -04:00
  • b3ab9c23f7 Allow importing of courses that don't have the expected path/filename structure for problems and html Calen Pennington 2012-07-11 22:17:27 -04:00
  • 926fdd010e Merge pull request #173 from MITx/cpennington/pull-155-cleanup ichuang 2012-07-11 19:34:56 -07:00
  • c468d47aa2 Minor change in comment about module type/category Calen Pennington 2012-07-11 18:00:04 -04:00
  • dfad0decc3 Disambiguating name in XMLModuleStore definition Calen Pennington 2012-07-11 17:59:49 -04:00
  • e39e454ff2 Correct comments for get_module Calen Pennington 2012-07-11 17:55:58 -04:00
  • 920c397292 Be more specific about what the random number generator seed is Calen Pennington 2012-07-11 17:54:56 -04:00
  • 1263d82d06 Add comments on StudentModuleCache arguments Calen Pennington 2012-07-11 17:54:17 -04:00
  • f0717570c0 Clean up how mapping from metadata to xml attributes is done Calen Pennington 2012-07-11 17:45:34 -04:00
  • a4d2245b44 Add comment about LazyLoadingDict Calen Pennington 2012-07-11 13:20:34 -04:00
  • cdd55373c6 Make it clear that the module for backwards compatability is just that Calen Pennington 2012-07-11 13:17:50 -04:00
  • 8e4c7c878e Add comment about location invalid chars Calen Pennington 2012-07-11 10:23:06 -04:00
  • 8119e6b939 Adding comment about future of user groups Calen Pennington 2012-07-11 10:21:39 -04:00
  • 780eb646fc Add note that metadata dictionary is scaffolding Calen Pennington 2012-07-11 09:53:03 -04:00
  • c7df948030 Run pep8 and pylint per environment Calen Pennington 2012-07-03 08:37:32 -04:00
  • 77fea77726 Define type of resource_fs in export_to_xml docstring Calen Pennington 2012-07-02 20:52:18 -04:00
  • 3cef71431e Make mapping from xml attributes to metadata values less manual Calen Pennington 2012-07-02 20:46:41 -04:00
  • e7d44a2606 Remove explain attribute in favor of solution stanza as exemplified in edx4edx Calen Pennington 2012-07-02 20:28:38 -04:00
  • 1d90b68623 Renaming the mongo database and collection used for the xmodule module store Calen Pennington 2012-07-02 20:25:13 -04:00
  • 9fdd5b1134 Don't dump the entire LoncapaProblem text in the unicode string Calen Pennington 2012-07-02 20:23:19 -04:00
  • c3964c5447 Clarify CapaModule docstring Calen Pennington 2012-07-02 20:21:09 -04:00
  • aeae2e02e2 Add docstrings to abtest with xml and json formats Calen Pennington 2012-07-02 20:19:47 -04:00
  • 5463f2f348 Log the correct id attribute in capa_problem Calen Pennington 2012-07-02 20:15:28 -04:00
  • 78f2a1ebe7 Add comments to LoncapaProblem constructor with types Calen Pennington 2012-07-02 20:14:40 -04:00
  • 0e05d092ca Remove temporary export url in favor of export round trip test Calen Pennington 2012-07-02 20:12:29 -04:00
  • 41be962d89 Merge pull request #170 from MITx/cpennington/cms-save-performance ichuang 2012-07-11 18:34:09 -07:00
  • f25bae9c3e Merge pull request #171 from MITx/arjun/fix_marketing David Ormsbee 2012-07-11 14:38:38 -07:00
  • 8fa9f19b65 Oops, committed a bad version. Arjun Singh 2012-07-11 17:04:37 -04:00
  • d0630c44be Temporary fix to allow pages that inherited the marketing template to display (though poorly) Arjun Singh 2012-07-11 17:00:46 -04:00
  • 35ffa4dc0e Micro optimization of Location initialization from dictionaries Calen Pennington 2012-07-11 16:41:25 -04:00
  • d739e61ebd Added check to make sure utf8 migration only runs on mysql. Had to add in certificates module. Bridger Maxwell 2012-07-11 16:33:46 -04:00
  • 58167e1d42 Make django-admin commands clear out pyc files and install the latest xmodule setup.py Calen Pennington 2012-07-11 16:22:56 -04:00
  • f8e9313dad Minimize the number of roundtrips to mongo during cms save by prefetching children Calen Pennington 2012-07-11 16:22:24 -04:00
  • 00f381dd7f Merge pull request #169 from MITx/jarv/remove-scss Calen Pennington 2012-07-11 12:59:57 -07:00
  • c6bf160002 removing {marketing,marketing-ie,print}.scss from PIPELINE_CSS John Jarvis 2012-07-11 15:53:56 -04:00
  • ae955ec4a5 Now using the course name as the default wiki namespace. Bridger Maxwell 2012-07-11 15:32:59 -04:00
  • 5bf6c73259 Merge with master. Bridger Maxwell 2012-07-11 15:26:26 -04:00
  • a21d37e23b adding html5shiv.js to static/js John Jarvis 2012-07-11 15:26:18 -04:00
  • c6f9f3ebe1 Renamed migrations since branch, making dev machine databases un-migratable. Bridger Maxwell 2012-07-11 15:17:44 -04:00
  • c31fb7684d Added utf8 conversion from stable branch. Bridger Maxwell 2012-07-11 15:08:10 -04:00
  • b96f626425 Update UserProfile demographic fields: Matthew Mongeau 2012-07-11 14:08:34 -04:00
  • 07eeaf7573 -f should be -r in requirements.txt John Jarvis 2012-07-11 11:39:51 -04:00
  • efc85b0483 Remove old scss files Calen Pennington 2012-07-11 10:28:01 -04:00
  • 09efd867c8 Merge pull request #165 from MITx/cpennington/lms-collectstatic David Ormsbee 2012-07-11 07:18:41 -07:00
  • 100422a7f3 Make collectstatic run to completion Calen Pennington 2012-07-11 10:14:51 -04:00
  • 8fd9b05e15 Merge pull request #164 from MITx/dormsbee/multicourse Calen Pennington 2012-07-11 07:04:29 -07:00
  • 61e593ca39 Merge branch 'dormsbee/multicourse' of github.com:MITx/mitx into dormsbee/multicourse John Jarvis 2012-07-11 09:23:28 -04:00
  • 039cc40598 rakefile updated so that python modules in the package will be installed at package install time John Jarvis 2012-07-11 09:23:20 -04:00
  • 488e357519 Merge pull request #163 from MITx/dormsbee/multicourse Calen Pennington 2012-07-11 06:18:43 -07:00
  • 9c883420fd Fix typo when reading showanswer out of capa problem metadata Calen Pennington 2012-07-11 09:17:30 -04:00
  • 06edcc0f9b adding repo-requirements for modules that are checked into the repo John Jarvis 2012-07-11 09:16:54 -04:00
  • bbe589ddc3 Make dashboard require login Calen Pennington 2012-07-11 09:05:39 -04:00
  • 5d8fd7d53c Don't error out trying to retrieve remember parameter in login request Calen Pennington 2012-07-11 08:53:49 -04:00
  • 2d56a21f92 Removing old js files that used to be used by the LMS Calen Pennington 2012-07-11 08:46:42 -04:00
  • 853a452699 Use appropriate indexes in mongo modulestore Calen Pennington 2012-07-11 08:39:46 -04:00
  • f0a049a29e Don't depend on the mitx directory being named that, so that tests will run in jenkins where mitx is checked out as workspace Calen Pennington 2012-07-11 08:39:29 -04:00
  • 4f830eb316 fix static_replace use of re.subs flags to be python2.6 compatible ichuang 2012-07-10 22:32:46 -04:00
  • 84838cf222 add CourseEnrollment and UserTestGroup to django admin view ichuang 2012-07-10 22:31:28 -04:00
  • 314c572825 fix capa_problem to call each responder's get_answers() just once ichuang 2012-07-10 22:30:32 -04:00
  • 7a5d645b9f removes user avatar, imporves dashboard design Galen Frechette 2012-07-10 19:59:28 -04:00
  • 7f4de5df30 simplifies jobs page Galen Frechette 2012-07-10 15:03:34 -04:00
  • 597c1db585 updates basic html structure and base color Galen Frechette 2012-07-10 14:38:26 -04:00
  • d8d3eb144c type tweeks in modals Galen Frechette 2012-07-10 13:16:30 -04:00
  • 8faa539a1a makes some tweeks to global nav style, home page header and font styles Galen Frechette 2012-07-09 21:02:46 -04:00
  • f7a1873aee adds banner images to and refines header on find courses pages, various visual tweeks and imporvements Galen Frechette 2012-07-09 18:22:19 -04:00
  • 5484cfd08e adds links to university profile page Galen Frechette 2012-07-06 22:09:19 -04:00
  • 6afb8f7d94 fixes university attributes in course.html Galen Frechette 2012-07-10 13:58:46 -04:00
  • 1be9196d3c wip header, wip header refactoring, improves course object visual design, improves footer Galen Frechette 2012-07-06 18:28:34 -04:00
  • 897a89c5ca remove out of repo symlinks from static David Ormsbee 2012-07-10 18:39:06 -04:00
  • 65e2de9058 Merge branch 'dormsbee/multicourse' of github.com:MITx/mitx into dormsbee/multicourse John Jarvis 2012-07-10 18:11:36 -04:00
  • ec47b72caf updating rakefile so that starting gunicorn is non-fatal John Jarvis 2012-07-10 18:11:29 -04:00
  • 3dd923d9b9 typo fix (it was just really bugging me) David Ormsbee 2012-07-10 17:50:42 -04:00
  • 347483203a Unscope URLCONF from mitx Matthew Mongeau 2012-07-10 17:37:42 -04:00
  • 1ac6e0a083 Add extra_filters_jinja needed for compressed_css filter Calen Pennington 2012-07-10 16:22:05 -04:00
  • a9eab86aee Merge branch 'dormsbee/multicourse' of github.com:MITx/mitx into dormsbee/multicourse Bridger Maxwell 2012-07-10 15:47:39 -04:00
  • a74024687e Make rake clobber remote test_root/*_repo directories that are used and should be cleaned up by tests Calen Pennington 2012-07-10 15:03:35 -04:00
  • 824f049289 Make packaging task not verbose Calen Pennington 2012-07-10 15:00:47 -04:00
  • 6dd141247d Fixing github_sync to work with multiple course data directories Calen Pennington 2012-07-10 14:58:07 -04:00
  • aff904a69d Merge Bridger Maxwell 2012-07-10 14:40:31 -04:00
  • 8589a1d9a9 reorder requirements to make it a little easier to see django-related reqs David Ormsbee 2012-07-10 14:36:18 -04:00
  • caad217ec2 add other django-* dependencies from my pip freeze results David Ormsbee 2012-07-10 14:34:05 -04:00
  • 15b0801ecb add django-keyedcache dependency David Ormsbee 2012-07-10 14:31:35 -04:00
  • 23f0bee8a9 django-followit David Ormsbee 2012-07-10 14:29:58 -04:00
  • 9ec0ecdc6e fix dependency for django-kombu David Ormsbee 2012-07-10 14:26:55 -04:00
  • fd7eec72e6 add djkombu dependency David Ormsbee 2012-07-10 14:23:55 -04:00
  • 7867277611 add django-countries dependency David Ormsbee 2012-07-10 14:18:52 -04:00
  • efba36eb20 add South dependency for migrations David Ormsbee 2012-07-10 14:17:47 -04:00
  • 56d873097c add pyparsing to requirements for capa lib David Ormsbee 2012-07-10 14:12:32 -04:00
  • 2f90b27707 Only load DATA_DIR subdirs if DATA_DIR exists (so not during tests) David Ormsbee 2012-07-10 13:56:51 -04:00
  • fdd9663699 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse Calen Pennington 2012-07-10 13:39:19 -04:00
  • 74593d18af Fix url in CapaModule error message Calen Pennington 2012-07-10 13:15:40 -04:00
  • da360b1d56 Allow for a user to enroll in multiple courses Calen Pennington 2012-07-10 13:11:57 -04:00
  • c4ebfe1bd4 Actually add the schematic.js file used in the main.html template Calen Pennington 2012-07-10 12:58:25 -04:00
  • 5406b9bb40 Make /static/ urls work in the courseware Calen Pennington 2012-07-10 12:54:47 -04:00
  • dbfcd78c88 Get custom_tag templates using system.filestore so that they work in multicourse Calen Pennington 2012-07-10 10:46:18 -04:00
  • 239c5ef172 Require login for enrollment Calen Pennington 2012-07-10 10:19:15 -04:00