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

542 Commits

Author SHA1 Message Date
Calen Pennington
6427dd6742 WIP: Get the cms running. Component previews work 2013-01-02 09:07:02 -05:00
Calen Pennington
2509308ce9 Remove reference to shared_state_key 2013-01-02 09:05:48 -05:00
Calen Pennington
84cb0ce99b Move inheritance logic out into a separate file in the modulestore 2012-12-28 14:56:42 -05:00
Calen Pennington
7f8b79694c Grade problems that have ungraded student modules 2012-12-28 14:55:32 -05:00
Calen Pennington
9c5a922eee Create tables for all known scopes, and add tests of the LmsKeyValueStore 2012-12-28 14:55:32 -05:00
Calen Pennington
7cb95aad47 WIP: Add grade publishing functionality 2012-12-28 14:55:32 -05:00
Calen Pennington
7679fda172 Remove debugging print statements 2012-12-28 14:54:13 -05:00
Calen Pennington
d61c91c139 Fix errors around error descriptors and custom tag modules 2012-12-28 14:53:30 -05:00
Calen Pennington
8693d288c8 Fix errors from running unit tests (some tests still fail) 2012-12-28 14:51:50 -05:00
Calen Pennington
2879853eee Pep8 fixes 2012-12-28 14:51:50 -05:00
Calen Pennington
fbd9499c51 Make debug message use the available request.user object 2012-12-28 14:51:50 -05:00
Calen Pennington
64848a32ee Delete get_instance_module and get_shared_instance_module, as they are obsolete with the new properties 2012-12-28 14:51:50 -05:00
Calen Pennington
13cab34a7d Always use the url form of the location when making StudentModules 2012-12-28 14:51:50 -05:00
Calen Pennington
306dbcff9c Rationalize StudentModule unicode and repr strings 2012-12-28 14:51:50 -05:00
Calen Pennington
3adb1e7109 Make grading not require get_instance_module 2012-12-28 14:51:50 -05:00
Calen Pennington
01411ae66e WIP: Trying to get tests working 2012-12-28 14:48:47 -05:00
Calen Pennington
7e224f5847 Convert a bunch more references from metadata to fields 2012-12-28 14:45:46 -05:00
Calen Pennington
c5e3380b71 WIP: Save student state via StudentModule. Inheritance doesn't work 2012-12-28 14:45:46 -05:00
Calen Pennington
cbfc7b201a WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms 2012-12-28 14:44:31 -05:00
Calen Pennington
8ba4163557 WIP. Data loads, but not all of it 2012-12-28 14:39:13 -05:00
Chris Dodge
95c6719447 initial commit. Add 'import_path' field to the GridFS so that when we export, we know where it originated from 2012-12-12 10:57:06 -05:00
Chris Dodge
2aceb2e44a make sure when defining the course namespace in the replace url methods that we explicitly state the parameter name. There are some optional parameters and if we don't define the parameter name, it'll end put being interpreted as a different parameter 2012-11-29 15:56:03 -05:00
Chris Dodge
46870f4391 be sure to always pass in a course namespace - which can be just the location of the module itself since it has the same org/course pair - when rewriting links. Also, allow for an option parameter in get_module() to disable the wrapping of the module's HTML with the xmodule_display.html. This is needed for ancillary course content such as 'about', 'course info', which are now stored as xmodules, but should not be wrapped in xmodule_display.html as it breaks some styling 2012-11-29 15:09:28 -05:00
Calen Pennington
171e932266 Merge branch 'master' into feature/cale/cms-master 
Conflicts:
	rakefile
 2012-11-08 12:28:40 -05:00
Chris Dodge
87ff18dc56 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 2012-11-07 09:35:21 -05:00
David Ormsbee
53c5170dbc Simple PEP8 issues. 2012-11-06 18:14:57 -05:00
Calen Pennington
bca0134a35 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-06 16:13:31 -05:00
Chris Dodge
55c69a1e13 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 
Conflicts:
	lms/djangoapps/courseware/module_render.py
 2012-11-06 14:20:59 -05:00
Calen Pennington
6212507b55 Merge pull request #1008 from MITx/ie8patch 
merge to master
 2012-11-06 06:18:01 -08:00
Don Mitchell
7f4bb63dff Final ie8 fixes hopefully. Now renders correctly for staff. Moved the 
debug fns from per problem to part of courseware w/ context info passed
as parms. Known issues: ie8 complains that getlog is not defined if you
click on QA and does not show the debug info popup.
 2012-11-05 13:55:09 -05:00
Calen Pennington
0bfa443520 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-02 11:09:19 -04:00
Chris Dodge
b788b9d659 add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc. 2012-11-01 15:08:26 -04:00
Chris Dodge
87dadd40c4 address some of Cale's feedback 2012-10-31 14:11:24 -04:00
Chris Dodge
34c442a1dc removed unneeded trace log. Also don't need StudentModuleCache in 'about' section rendering 2012-10-30 16:04:51 -04:00
Chris Dodge
f0b4371c90 addressed Cale's feedback 2012-10-30 16:01:28 -04:00
Chris Dodge
ba9a03410b remove unneeded debugging traces 2012-10-30 15:56:02 -04:00
Chris Dodge
ee1098c032 remove unused line 2012-10-30 15:37:40 -04:00
Chris Dodge
743f2b56dd make course about view methods render the about content as a module, so we get all the url rewriting goodness. Also, since we're now handling the url re-writing via the module get_html pipelines, we can remove the link rewriting inside the xmodules itself - which is good because there's a wierd bug in lxml.html rewriting 2012-10-30 15:12:13 -04:00
Chris Dodge
f4822c23de lots of tweeks to better support importing of existing courseware 2012-10-30 11:52:31 -04:00
Victor Shnayder
a155265409 minor whitespace + comment fixes 2012-10-29 23:44:38 -04:00
Chris Dodge
ba15735214 implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff 2012-10-25 14:27:26 -04:00
Chris Dodge
fec6c42adc implement importing of course info sections as modules in the course 2012-10-24 20:55:04 -04:00
Vik Paruchuri
dba04ab6d8 added docstrings 2012-10-24 15:14:06 -04:00
Vik Paruchuri
a75acffe01 made requested changes to statsd names, score bucket 2012-10-24 15:11:41 -04:00
Calen Pennington
2802302162 Make LMS access depend on which course run the access is occurring in, so that permissions can be based on the course run, rather than the whole course 2012-10-24 11:51:25 -04:00
Vik Paruchuri
952b3468cf pep8 in views, remove instance state check 2012-10-23 19:07:06 -04:00
Vik Paruchuri
7dec1b3c3f bugfix 2012-10-23 19:00:26 -04:00
Vik Paruchuri
57a78637f2 pep8 fixes and score bucketing 2012-10-23 18:58:11 -04:00
Vik Paruchuri
64b117a7c2 changed metric names, added into render page 2012-10-23 18:14:16 -04:00
Calen Pennington
dab77e7d79 Switch to using staff group names that are only specified by org/course, rather than the full course_id 2012-10-23 13:40:50 -04:00