Commit Graph

140 Commits

Author SHA1 Message Date
John Jarvis
67f8d48840 Merge pull request #367 from edx/jarv/gce-email-backend
adding option for file based backend
2013-07-11 08:02:47 -07:00
Jason Bau
4b59a85dae Merge pull request #336 from edx/fix/jbau/parameterize-s3-upload-bucket-name
Parameterize aws s3 bucket name for forum uploads
2013-07-10 14:51:08 -07:00
John Jarvis
5b16fbe369 adding option for file based backend 2013-07-10 16:05:37 -04:00
Jason Bau
7bc52394ad Parameterize aws s3 bucket name for forum uploads
especially since s3 namespace is _global_
2013-07-03 15:26:32 -07:00
Carlos Andrés Rocha
a844548fb8 Add setting to set the virtual host of a Celery broker 2013-06-27 17:58:51 -04:00
Jason Bau
23631b839a AWS settings hook for addl installed apps + lms/wsgi_apache.py
wsgi_apache.py passes an apache env variable for SERVICE_VARIANT
to the os environment, where it's normally set when we use gunicorn
2013-06-19 00:48:17 -07:00
Renzo Lucioni
97f4291b2a Add comment clarifying which Segment.io key is in use 2013-06-17 15:35:04 -04:00
John Jarvis
ffeabae069 moving settings into the auth tokens section 2013-06-17 09:07:02 -04:00
John Jarvis
770b9f1f87 fixing segment io settings bug
* Moving to the auth tokens section
* Removing the feature flag logic since all features are loaded earlier
```
    for feature, value in ENV_TOKENS.get('MITX_FEATURES', {}).items():
        MITX_FEATURES[feature] = value
```
2013-06-17 09:01:20 -04:00
Feanil Patel
e5c20e051c Update to look for segment io key in auth data. 2013-06-14 14:28:38 -04:00
Victor Shnayder
4ffe3c51b5 Adds segment-io integration into the LMS
Tell segment IO whenever a page is loaded.  Once this works, we
can add more detailed instrumentation for events we care about.

Will be turned off in prod until the SEGMENT_IO_LMS feature flag is
set to True and a SEGMENT_IO_LMS_KEY is set.
2013-06-06 11:34:03 -04:00
chrisndodge
7fc994831f Merge pull request #75 from edx/feature/cdodge/allow-setting-of-session-cookie-name
seems like there's a Django bug and the SESSION_COOKIE_NAME needs to be ...
2013-06-05 11:35:26 -07:00
Chris Dodge
ffdeac3dcd seems like there's a Django bug and the SESSION_COOKIE_NAME needs to be an explicit str() 2013-06-05 14:31:32 -04:00
Nate Hardison
96c4c53505 Use default PLATFORM_NAME in AWS settings
Rather than require the `PLATFORM_NAME` to be specified in the
`ENV_TOKENS`, allow the default setting in `common.py` to be used.
2013-06-05 10:56:24 -07:00
Nate Hardison
4031c193a1 Adjust available routes based on theme presence
Themes do not necessarily want all of the available LMS routes, such
as `/jobs` and `/university_profiles`. This change splits up the
`lms/urls.py` file and selectively enables/disables routes based on
whether or not a theme is enabled. This is a naive solution for now;
a better solution gives themes a way to selectively overrides such
routes.

Additionally, with the `MKTG_URL_LINK_MAP` setting that hits certain
routes immediately on each page render (whenever the `marketing_link`
helper function is called), themes may crash if they don't leave
all marketing link routes present in `lms/urls.py`. This change also
provides the ability to override the `MKTG_URL_LINK_MAP` in the
settings.

Finally, modify the mitxmako marketing URL middleware to not try to
reverse disabled URLs, which are those keys in the map whose values
are `None`.
2013-06-05 10:55:12 -07:00
Nate Hardison
07511e20be Add settings for contact and bugs emails
Allow themes to override contact and bugs email addresses via the
settings.
2013-06-05 10:27:24 -07:00
Nate Hardison
41a6a352de Add setting for technical support email config
Configure the technical support email address in the settings so that
themes can override with an email of their own in the appropriate
env.json file in production.
2013-06-05 10:27:24 -07:00
Nate Hardison
3934770d05 Add the PLATFORM_NAME setting for display config
This setting is used to control the display name of the platform. The
default is "edX", but themes may wish to override. For example,
Stanford will use "Stanford Online" for the time being.
2013-06-05 10:27:22 -07:00
Nate Hardison
a3ca0843ae Use a setting for the favicon path
The `FAVICON_PATH` setting determines the location of the favicon for
the site. It's automatically adjusted when a theme is enabled,
establishing the convention that themes will place their favicon in
`static/images/favicon.ico`.
2013-06-05 10:17:15 -07:00
Chris Dodge
6fb97d52c0 fix typos 2013-06-05 11:21:35 -04:00
Chris Dodge
3c9bd1ddf8 allow configuration settings to specify a session cookie name. This is to avoid problems we are experiencing between simultaneous login sessions between edx.org and edge.edx.org on certain browsers (i.e. Firefox) 2013-06-05 10:26:30 -04:00
Nate Hardison
ea3506d2b9 Add general theming capabilities
This commit adds the requisite settings and startup features to
enable integration of themes into the edX platform. It does not
yet provide hooks in any of the templates, but it does cause the
main `lms/static/sass/application.scss` file to `@import` a theme's
base Sass. Template hooks will come down the road.

CHANGELOG
---------
Define a new `MITX_FEATURE`, `USE_CUSTOM_THEME`, that when enabled,
can be used in templates to determine whether or not custom theme
templates should be used instead of the defaults.

Also define a new setting, `THEME_NAME`, which will be used to
locate theme-specific files. Establish the convention that themes
will be stored outside of the `REPO_ROOT`, inside the `ENV_ROOT`,
in a directory named `themes/`. `themes/<THEME_NAME>` will store
the files for a particular theme.

Provide a function, `enable_theme`, that modifies the template and
static asset load paths appropriately to include the theme's files.

Move the main LMS Sass file to a Mako template that conditionally
`@import`s the theme's base Sass file when a theme is enabled.

Add logic to the assets Rakefile to properly preprocess any Sass/
Mako templates before compiling them.
2013-05-22 12:22:27 -07: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
e0d
f8e9c4d4d1 Merge pull request #2078 from edx/hotfix/rocha/celery-default-queue-name
Set the default celery queue name in addition to the default routing key
2013-05-17 15:02:31 -07:00
Carlos Andrés Rocha
34d39dde9a Set the default celery queue name in addition to the default routing key 2013-05-17 17:59:51 -04:00
Greg Price
372084e0b6 Merge branch 'drupal-new'
Conflicts:
	lms/envs/common.py
2013-05-17 16:17:35 -04:00
Greg Price
de5b4d7d27 Merge branch 'master' into drupal-new 2013-05-17 16:10:56 -04:00
Carlos Andrés Rocha
c05efbc31e Added base Celery settings 2013-05-17 11:33:14 -04:00
Ned Batchelder
e947218285 Merge master to here. 2013-05-16 14:21:51 -04:00
Greg Price
a0fb4d6c85 Merge branch 'master' into drupal-new
Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html
2013-05-10 10:30:10 -04:00
Jason Bau
1354cd412a Set SERVER_EMAIL so that mail_admins works 2013-05-08 14:16:20 -07:00
Diana Huang
2947ce246f Better error handling for when marketing urls are missing from the settings. 2013-05-07 13:17:30 -04:00
Ned Batchelder
91db1eed4c The new settings will only be read from .json files if aws.py handles them. 2013-05-06 18:06:08 -04:00
Greg Price
ec3c8458e7 Merge pull request #1911 from edx/feature/gprice/feedback-button 2013-05-06 11:03:41 -07:00
Greg Price
87072a9a58 Add an endpoint for submission of Zendesk tickets by end users
This functionality requires the Zendesk URL, user, and API key to be specified
in django.conf.settings. Also, add a flag to MITX_FEATURES (enabled by default)
to control the endpoint and the front-end feature (yet to be added).
2013-05-06 13:35:51 -04:00
Jason Bau
7720c0fc8d Inserts overrides in env.lms.aws for email settings and timezone
overrides what is set in env.lms.common using the lms.env.json
file
2013-05-03 11:45:21 -07:00
John Jarvis
54e5e3d31f Adding the EDX_MKTG feature flag and links back to the marketing site 2013-04-10 14:29:55 -04:00
Carlos Andrés Rocha
4050da6b4c Enable meta-universities (organizations that contain other) 2013-03-28 13:23:50 -04:00
David Ormsbee
8d4e0f8386 Add ANALYTICS_API_KEY to config files and dashboard analytics call 2013-03-13 16:55:40 -04:00
David Ormsbee
a0dd6d9832 add entry for ANALYTICS_SERVER_URL to aws.py 2013-03-11 10:05:36 -04:00
Vik Paruchuri
4d57f1b9ee Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule 2013-02-19 10:43:55 -05:00
Vik Paruchuri
ba650202b4 Add in logic to pass settings to peer grading xmodule 2013-02-11 18:09:57 -05:00
Vik Paruchuri
9bca4ebf21 Start to refactor grading settings 2013-02-11 17:32:11 -05:00
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