Calen Pennington
3e59f3af40
Fix rake lms[cms.dev]
2013-10-21 09:26:57 -04:00
Don Mitchell
8fe99a6be2
Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation""
...
This reverts commit a517dc2085
2013-10-18 09:22:30 -04:00
John Jarvis
92a7d75b5d
Merge pull request #1305 from edx/jarv/revert-1240
...
Revert "Merge pull request #1240 from edx/dhm/config_separation"
2013-10-10 10:27:58 -07:00
chrisndodge
82e42cc580
Merge pull request #1156 from edx/feature/cdodge/add-preview-configs-via-middleware
...
add some middleware to determine whether draft modulestore or non-draft ...
2013-10-10 10:24:51 -07:00
John Jarvis
a517dc2085
Revert "Merge pull request #1240 from edx/dhm/config_separation"
...
This reverts commit ec01253e30ae8c9710e5
2013-10-10 13:14:08 -04:00
Chris Dodge
8f9d815f10
add some middleware to determine whether draft modulestore or non-draft modulestore should be used
...
change to use regex to do the domain mappings. Also add config to AWS to be able to set from configuration file.
handle cases where HTTP_HOST is none, like in unit tests
add linefeed at end
fix up regex matches
switch to use thread local storage to hold the request itself
.
.
convert over to use open source 3rd party library
convert over to use django-cum
add unit test
remove comment
.
add comment to config setting
fix comment
use better regex for localdev
no need to break
no need to wrap an imported function, it's visible to any file that is importing us
add comment
add unit test
clean up test
use a separate env file to set the preview hostname
2013-10-09 11:53:26 -04:00
Don Mitchell
44d0494d33
Segregate the mongo db config from the modulestore config
...
as a first step to separating db connection from modeling
and to support location mapper and contentstore using same db config as modulestore
2013-10-08 15:01:48 -04:00
Don Mitchell
59b31474ca
Separate db config from modulestore config parms
...
use to instantiate loc_mapper
test loc_mapper injection into split modulestore
2013-09-26 12:57:40 -04:00
Chris Dodge
352e56eb4e
address some pylint violations in the mixedmodulestore build report
2013-08-19 23:40:46 -04:00
Chris Dodge
cf715cb727
fix pylint violations
2013-08-15 22:58:04 -04:00
Chris Dodge
cff93d324b
WIP
2013-08-15 22:58:02 -04:00
Chris Dodge
6f11b98b4f
initial commit for a mixed module store which can interoperate with both XML and Mongo module stores
2013-08-15 22:56:32 -04:00
Chris Dodge
db7434fa18
add comment as to why we are turning off this feature flag
2013-07-12 20:02:23 -04:00
Chris Dodge
1060cf5cec
Seems like the Edit/QA links in LMS are triggered by a ENABLE_LMS_MIGRATION feature flag. So when running as mongo-backed, set that to False
2013-07-12 11:51:57 -04:00
Don Mitchell
ddfbe59814
Make DraftModuleStore mongo only
...
DraftModuleStore was originally designed as a mixin, but never used that
way, and with the upcoming changes to use the versioned module store,
never will be. This changes removes a circular dependency between
mongo.py and draft.py.
2013-07-01 12:33:08 -04:00
Don Mitchell
b42fe277d4
Add serial commas to modulestore definitions
2013-06-25 22:34:36 -04:00
Don Mitchell
168cb306d3
Move tz_aware into connection config rather than settings.
...
Make django use_tz
2013-06-10 17:16:35 -04:00
Don Mitchell
28f8910db4
Make pymongo tz_aware
2013-06-10 17:16:34 -04:00
Calen Pennington
241ef68f4f
Start linting envs files, add task to only pylint errors, and move pylintrc file to the correct location
2013-05-21 09:34:12 -04:00
Carlos Andrés Rocha
4050da6b4c
Enable meta-universities (organizations that contain other)
2013-03-28 13:23:50 -04:00
Chris Dodge
3b5e17ef55
Merge branch 'master' into feature/cdodge/cms-master-merge2
...
Conflicts:
.gitmodules
common/djangoapps/__init__.py
common/djangoapps/track/migrations/__init__.py
common/lib/capa/capa/inputtypes.py
common/lib/capa/capa/responsetypes.py
common/lib/capa/capa/templates/openendedinput.html
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/video_module.py
common/static/sass/bourbon/css3/_box-sizing.scss
doc/development.md
lms/djangoapps/instructor/tests.py
lms/envs/aws.py
lms/envs/common.py
lms/templates/video.html
requirements.txt
test-requirements.txt
2013-01-07 12:34:48 -05:00
Jay Zoldak
0a77dd4431
Smart accordion walkthrough working for cms-master branch
...
Conflicts:
lms/envs/cms/acceptance.py
2013-01-02 10:44:19 -05:00
Chris Dodge
b75a814f7a
add django performance metering
2012-11-02 15:08:45 -04:00
Calen Pennington
096d6853eb
Allow for branding subdomains that are longer than a single .
2012-10-11 13:18:27 -04:00
Calen Pennington
9e9825cb88
Enable the edge virtual university landing page in the lms
2012-10-11 13:18:01 -04:00
Calen Pennington
284f0d6a22
Make the lms running alongside the CAS in dev point to the same contentstore, and server up static content
2012-10-11 12:31:52 -04:00
Calen Pennington
20f84b2055
Use the right config as the base for lms.envs.cms.aws
2012-10-11 12:31:52 -04:00
Calen Pennington
b19627ccf3
Add configs for lms and lms preview running against mongo
2012-10-10 12:49:52 -04:00
Calen Pennington
1a8532d8ad
Make it possible to create, edit, and publish a draft
2012-10-10 12:49:51 -04:00
Calen Pennington
0a55e1eae1
Add sub-environments for the lms that is running alongside the lms for debugging
2012-09-17 13:51:33 -04:00
