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
d21c5761df
Minor bug fixes from edge-configs merge
2012-10-11 12:49:48 -04:00
Calen Pennington
cf19a43268
Set SESSION_COOKIE_DOMAIN from env.json
2012-10-11 12:32:23 -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
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
20f84b2055
Use the right config as the base for lms.envs.cms.aws
2012-10-11 12:31:52 -04:00
Calen Pennington
eece835d9b
Put in an empty contentstore for the LMS by default
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
f5a63f7375
Remove all askbot common settings
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
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
05b9e6cab2
Standardize more of css between lms and cms
2012-10-01 15:17:40 -04:00
Calen Pennington
44805ca383
Make discussion js work for cms as well as lms so that inline discussion xmodules load
2012-10-01 15:16:54 -04:00
Calen Pennington
2554413291
Hook up link to create modules from templates
2012-09-25 10:10:44 -04:00
Victor Shnayder
a8aced9bba
Also make the actual ?next redirection work with caching
...
- use js instead of django to do the redirection
2012-09-24 09:15:06 -04:00
Ibrahim Awwal
91de5633b5
DjDT redirect intercept is annoying, especially for tests, so disable it
2012-09-21 00:15:12 -07:00
Bridger Maxwell
5ef6a42c8f
Disabled pipeline wrapper for compressed CSS. It now works more like dev environment.
2012-09-18 13:28:54 -04:00
Victor Shnayder
ba92bdc2dc
Merge pull request #708 from MITx/feature/cale/cms-bug-fixes
...
Feature/cale/cms bug fixes
2012-09-18 06:20:15 -07: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
David Ormsbee
5fbbd0ddbd
Merge pull request #646 from MITx/feature/dave/disable_query_count
...
Move QueryCountDebugMiddleware inclusion to dev.py instead of common.py ...
2012-09-17 06:42:32 -07:00
David Ormsbee
3ee0f39b18
Merge pull request #696 from MITx/feature/dave/new-discussions
...
Add AWS storage bucket name for S3 to make file uploads work
2012-09-14 16:56:31 -07:00
David Ormsbee
239e6e8cc5
Add AWS storage bucket name for S3 to make file uploads work
2012-09-14 19:55:13 -04:00
Arjun Singh
46d830df13
Merge branch 'master' into feature/arjun/new-discussions
2012-09-14 15:15:21 -07:00
Carlos A. Rocha
67cbf50b83
Fix swfobject and django-pipeline - Cosmetic fix for youtube player
2012-09-13 01:08:59 -04:00
Victor Shnayder
e47134bd10
turn off psychometrics in dev.py--the necessary migration is not present
2012-09-12 13:20:15 -04:00
Arjun Singh
7ad9b39b98
Merge master
2012-09-10 15:33:59 -07:00
Carlos Andrés Rocha
e55e1a99cb
Fix django pipeline configuration for discussion forum coffescript includes
2012-09-10 12:12:31 -07:00
ichuang
ab0a58fb7a
add psychometrics - grade histograms, check time diffs, and IRT plots
2012-09-08 22:31:45 -04:00
Calen Pennington
b27802b319
Merge pull request #604 from MITx/feature/cale/content-static-dir
...
Set the course static file dir to /static directories in course repos if...
2012-09-07 13:50:21 -07:00
David Ormsbee
994102b16e
Move QueryCountDebugMiddleware inclusion to dev.py instead of common.py -- it was too chatty in the logs
2012-09-07 16:02:00 -04:00
Calen Pennington
8500a1b300
Make tests not use syslog when they're running
2012-09-07 14:38:53 -04:00
David Ormsbee
8312ddf01d
Merge pull request #629 from MITx/feature/victor/save-course-position
...
Feature/victor/save course position
2012-09-07 06:42:48 -07:00
Victor Shnayder
8b7390c966
Turn of discussion service in test env
...
- add a check for the feature flag before trying to save user info to the service
2012-09-06 17:11:21 -04:00
David Ormsbee
3a40a55c76
Merge pull request #620 from MITx/jarv/add-local-logging
...
Jarv/add local logging
2012-09-06 08:25:17 -07:00
Calen Pennington
4088ac5428
Isolate manual git reload behind a feature flag
2012-09-05 15:16:40 -04:00
John Jarvis
f7baa0d8f0
* By default local dev environments will be setup to send tracking
...
logs and application logs (DEBUG) to ENV_ROOT/log. Logs are rotated
using the RotatingFileHandler
* For non dev environments logging will continue to be handled by
rsyslogd
2012-09-05 11:25:33 -04:00
Calen Pennington
54e8819fb1
Merge pull request #615 from MITx/feature/ichuang/instructor-dashboard-upgrade
...
Upgrade to instructor dashboard
2012-09-05 08:03:55 -07:00
ichuang
0c3d054253
fix: university domain should not be determined by HTTP_HOST for dev or behind proxy
2012-09-04 18:36:26 -04:00
John Jarvis
54f5e30992
* Removed tracking log comment
...
* Additional PEP8 format cleanup
* Removed imports that are no longer necessary.
2012-09-04 09:39:54 -04:00
David Ormsbee
bce4e0f1bc
Merge pull request #595 from MITx/feature/ibrahim/discussion_sort_preferences
...
Feature/ibrahim/discussion sort preferences
2012-09-03 10:25:04 -07:00
ichuang
2efe481237
move instructor dashboard into its own lms djangoapp; add new
...
functionality - grade dump and download as csv, manage staff list,
force reload of course from xml
2012-09-02 19:05:34 -04:00
Ibrahim Awwal
f6ee08271d
Ensure that js files are returned in alphabetical order by django-pipeline.
...
On most systems this seems to be the default behavior, but glob2.glob's order isn't guaranteed and on my machine the order seems to be random, which causes javascript which depends on include order to fail.
2012-08-31 15:25:07 -07:00
David Ormsbee
69ea7aa873
Merge pull request #597 from MITx/feature/victor/nested-links
...
Feature/victor/nested links
2012-08-31 13:48:05 -07:00
Tom Giannattasio
b167e0f70a
added filter drop; tweaked sidebar coordinate settings to accommodate new post
2012-08-31 15:20:53 -04:00
John Jarvis
164dae71fb
Fixing syntax error
2012-08-31 10:09:15 -04:00
John Jarvis
66c5894e91
syntax error
2012-08-31 10:03:14 -04:00
