Chris Dodge
|
0394e33652
|
remove CSRF cookie domain setting in aws.py
|
2013-02-07 11:15:23 -05:00 |
|
John Jarvis
|
f525b17b1a
|
pep8 cleanup
|
2013-02-01 13:13:16 -05:00 |
|
e0d
|
969737c58e
|
service variant code for loading different config
|
2013-01-31 21:43:35 -05:00 |
|
e0d
|
956ccb06e9
|
explicitly set the domain for the csrf cookie to match the session domain.
|
2013-01-26 21:10:14 -05:00 |
|
Ashley Penney
|
b02ebc4618
|
Add these two options in as well.
|
2013-01-24 15:20:27 -05:00 |
|
Calen Pennington
|
fc2d5c43f1
|
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
lms/envs/aws.py
|
2013-01-14 12:51:19 -05:00 |
|
Vik Paruchuri
|
1316728aaa
|
Minor naming fix
|
2013-01-14 12:32:31 -05:00 |
|
Vik Paruchuri
|
0e11deffcf
|
Fix staff and peer grading settings to not fail catastrophically
|
2013-01-14 12:31:50 -05:00 |
|
Chris Dodge
|
7229a9cdaf
|
perform a new merge from master, resolve conflicts
|
2013-01-03 10:43:03 -05:00 |
|
Victor Shnayder
|
53580af952
|
fix aws setting name
|
2012-12-07 10:35:44 -05:00 |
|
Victor Shnayder
|
d28cd4f429
|
use a dict for backend config. Load it on aws.
|
2012-11-30 10:03:31 -05:00 |
|
Chris Dodge
|
2524cd614a
|
fix edit conflict
|
2012-11-26 09:36:59 -05:00 |
|
Calen Pennington
|
0fff578e7d
|
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
.gitmodules
lms/envs/aws.py
lms/envs/common.py
lms/static/sass/course.scss
lms/urls.py
|
2012-11-16 09:03:15 -05:00 |
|
David Ormsbee
|
156dc1fb6c
|
Merge branch 'master' into feature/victor/actual-askbot-removal
Conflicts:
lms/envs/aws.py
|
2012-11-15 14:24:55 -05:00 |
|
Calen Pennington
|
dbcb1adfaf
|
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
lms/static/sass/course/courseware/_courseware.scss
|
2012-11-13 10:22:42 -05:00 |
|
Victor Shnayder
|
2846c61d15
|
Revert "remove (almost) all references to askbot."
This reverts commit 793354a0dc.
|
2012-11-09 18:18:37 -05:00 |
|
John Jarvis
|
01dcf291b6
|
Adding setting variable for CERT_QUEUE
|
2012-11-09 18:18:36 -05:00 |
|
Victor Shnayder
|
76f0cf4a86
|
remove (almost) all references to askbot.
|
2012-11-09 18:18:33 -05:00 |
|
Calen Pennington
|
171e932266
|
Merge branch 'master' into feature/cale/cms-master
Conflicts:
rakefile
|
2012-11-08 12:28:40 -05:00 |
|
David Ormsbee
|
ab0e7cf4ae
|
Change AUTH_TOKENS index reference to a get so it doesn't explode the whole app if I did Puppet incorrectly.
|
2012-11-07 17:36:50 -05:00 |
|
David Ormsbee
|
4b02b2af2a
|
Rearrange how we handle the auth tokens for our fake Pearson preliminary testing
|
2012-11-07 17:20:49 -05:00 |
|
David Ormsbee
|
528fcd7f4e
|
Create a config option for enabling a Pearson login in a totally hacky manner.
|
2012-11-07 14:08:55 -05:00 |
|
Victor Shnayder
|
793354a0dc
|
remove (almost) all references to askbot.
|
2012-10-30 18:23:07 -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
|
cf19a43268
|
Set SESSION_COOKIE_DOMAIN from env.json
|
2012-10-11 12:32:23 -04:00 |
|
Calen Pennington
|
658bb622ba
|
Always import logsettings after common, so that paths are set
|
2012-10-11 12:31:52 -04:00 |
|
Calen Pennington
|
bc69ed8c9e
|
Move logsettings to common, so that it's shared between cms and lms
|
2012-10-11 12:31:52 -04:00 |
|
Calen Pennington
|
46668d2634
|
Read CONTENTSTORE from auth.json in lms
|
2012-10-11 12:31:51 -04:00 |
|
Calen Pennington
|
0162e4c031
|
Remove more askbot remnants
|
2012-10-11 12:31:51 -04:00 |
|
Calen Pennington
|
1114f66a98
|
Enable specification of modulestore in LMS aws config
|
2012-10-11 12:31:51 -04:00 |
|
David Ormsbee
|
239e6e8cc5
|
Add AWS storage bucket name for S3 to make file uploads work
|
2012-09-14 19:55:13 -04:00 |
|
John Jarvis
|
27725ab686
|
making loglevel configurable for local logging
|
2012-08-29 13:09:00 -04:00 |
|
John Jarvis
|
4c21abc433
|
empty default for comments_service_key and comments_url because it was breaking configs that do not have it in env.json
|
2012-08-24 15:05:18 -04:00 |
|
Bridger Maxwell
|
268a87442e
|
Added SECURE_PROXY_SSL_HEADER to env/aws.
|
2012-08-24 14:18:49 -04:00 |
|
David Ormsbee
|
ec4858801e
|
read the comment service shared key from django config
|
2012-08-23 08:02:19 -04:00 |
|
Calen Pennington
|
f4e75f5c39
|
Add subdomain_branding key to aws settings
|
2012-08-23 06:30:43 -04:00 |
|
Calen Pennington
|
188584c77d
|
Allow puppet to set COURSE_LISTINGS
|
2012-08-21 16:21:43 -04:00 |
|
David Ormsbee
|
66a9512e57
|
disable askbot and enable berkeley forum in AWS config
|
2012-08-20 19:30:45 -04:00 |
|
David Ormsbee
|
b6dfa50a73
|
Adjust settings so we can change the comments service URL from Django config
|
2012-08-20 17:33:45 -04:00 |
|
David Ormsbee
|
83ea5efac6
|
add course-specific askbot URLs for AWS course servers
|
2012-08-17 14:34:58 -04:00 |
|
Calen Pennington
|
91b6bb649c
|
Move queue interface url and auth into configuration, rather than hardcoding it
|
2012-08-14 11:59:46 -04:00 |
|
Calen Pennington
|
012036a478
|
Clean up minor whitespace stuff in settings
|
2012-07-30 12:59:28 -04:00 |
|
John Jarvis
|
dab92102d1
|
reading WIKI_ENABLED from env.json
|
2012-07-25 14:15:49 -04:00 |
|
John Jarvis
|
18b05fe78f
|
enabled_features changed mitx_features
|
2012-07-24 21:50:45 -04:00 |
|
John Jarvis
|
703293f785
|
adding enabled features to aws.py
|
2012-07-24 15:56:42 -04:00 |
|
Calen Pennington
|
54756bf5e2
|
Use relative includes in settings files
|
2012-06-06 14:16:28 -04:00 |
|
Calen Pennington
|
5ba03130aa
|
Moving LMS code into subdirectory
|
2012-06-06 14:09:01 -04:00 |
|