Commit Graph

116 Commits

Author SHA1 Message Date
Gabe Mulley
b1a76f1258 Merge pull request #925 from mulby/fix/gabe/configurable-tracking-filter
Make URL patterns to exclude from tracking configurable
2013-09-13 11:10:59 -07:00
Gabe Mulley
761a4dcc97 Make URL patterns to exclude from tracking configurable
* Add unit test coverage for this "exclusion from tracking" logic
* Exclude based on regex match instead of raw string comparison
* Exclude heartbeat requests from tracking
2013-09-13 11:24:51 -04:00
Jason Bau
2f230836e0 fix default for VERIFY_STUDENT in lms/envs/aws.py 2013-09-12 16:49:30 -07:00
Sarina Canelake
193f7166d7 Merge pull request #962 from edx/sarina/fix-datadog-import
Don't assign variable to .update() call
2013-09-12 13:46:44 -07:00
Diana Huang
90951a7bdb Merge branch 'release'
Conflicts:
	CHANGELOG.rst
	common/lib/xmodule/xmodule/js/fixtures/lti.html
	common/lib/xmodule/xmodule/js/spec/lti/constructor.js
	common/lib/xmodule/xmodule/js/src/lti/lti.js
	common/lib/xmodule/xmodule/lti_module.py
	lms/djangoapps/courseware/features/certificates.py
	lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
	lms/djangoapps/courseware/tests/test_lti.py
	lms/djangoapps/shoppingcart/models.py
	lms/envs/aws.py
2013-09-12 16:03:39 -04:00
Sarina Canelake
484bc91ab3 Don't assign variable to .update() call 2013-09-12 16:03:22 -04:00
Carlos Andrés Rocha
87fcf1ab9e Merge pull request #905 from rocha/datadog-statsd
Remove dogstatsd-python in favor of dogapi
2013-09-12 06:53:02 -07:00
David Ormsbee
5942a87071 Pull VERIFY_SETTINGS from AUTH_TOKENS 2013-09-12 01:04:01 -04:00
Carlos Andrés Rocha
ee0004e2f8 Remove dogstatsd-python in favor of dogapi
Also added datadog application to commom django apps and set it to use
a local statsd server by default.
2013-09-11 19:28:58 -04:00
Carlos Andrés Rocha
fbc243dbeb Add event tracking with configurable backends 2013-09-11 10:02:15 -04:00
Jason Bau
b0f9fd0df5 Add link in lms legacy instructor dashboard to cms course_index
A one-click way of getting to editing the course
2013-08-31 01:07:34 -07:00
Jason Bau
d341d6d26d Change optout to use user.id instead of email.
Includes Data + Schema migrations for optout email -> user.id change.
Note that migrations should be reversible.
2013-08-29 12:40:33 -04:00
Sarina Canelake
e6bde93837 Change bulk email model field names and add migrations 2013-08-29 12:40:33 -04:00
Kevin Luo
907bf6e1b7 Add bulk email feature for instructors, with optout option
Adds a new Email link to the instructor dashboard for frontend interface to send
email to course members. Adds a feature flag ENABLE_INSTRUCTOR_EMAIL to toggle this.
Creates a new djangoapp bulk_email that handles this action by getting the recipient
list and batching the emails to different celery tasks to do the actual sending.
Requires lynx package to convert HTML email to plaintext. Handles SMTP errors by
retrying or falling through to the next email. Adds the option to opt out of course
specific emails in the user dashboard with an Email Settings link for each course.
Uses severable configurable settings with defaults. DEFAULT_BULK_FROM_EMAIL
specifies the from address for email. EMAILS_PER_TASK specifies the number of emails
each celery task takes on. EMAIL_HOST, EMAIL_PORT, EMAIL_HOST_USER,
EMAIL_HOST_PASSWORD, and EMAIL_USE_TLS for the SMTP email backend settings.

Co-authored-by: Akshay Jagadeesh <akjags@gmail.com>
2013-08-29 12:40:31 -04:00
Jason Bau
e4e22f0f85 Lots more verification of CyberSource reply + receipt generation 2013-08-22 15:39:55 -04:00
Jason Bau
41b9f9f071 factor out cybersource processor from cart 2013-08-22 15:39:55 -04:00
Jason Bau
ea7cf3a24e add parameterization of cybersource creds 2013-08-22 15:39:54 -04:00
e0d
8abd7bb6fe these values are set implicitly at :147, setting them here clobbers them 2013-07-31 16:40:54 -04:00
e0d
f1962a7bd7 removing an unneeded line that does damage 2013-07-30 16:20:18 -04:00
Jim Abramson
77a796e2c7 Merge pull request #520 from edx/feature/kevin/email_notifications_panel
Feature/kevin/email notifications panel
2013-07-30 05:30:56 -07:00
jsa
33d4ae69dd add feature flag to enable/disable discussion home panel 2013-07-29 18:13:12 -04:00
Jim Abramson
8ccaf623f1 add EDX_API_KEY to aws.py 2013-07-29 15:16:37 -04:00
ihoover
aad6dc4345 Merge pull request #417 from edx/ihoover/feature_flag_auto_auth
Ihoover/feature flag auto auth
2013-07-25 08:11:22 -07:00
Jason Bau
034de2cfd2 Allow session backend to be configurable and also add PLATFORM_NAME
to cms settings (it was throwing 500s for Stanford when the CMS
calls render_from_lms)
2013-07-19 17:43:37 -07:00
ihoover
b42eacaa8f moved MAX_AUTO_AUTH_USERS to ENV_TOKENS 2013-07-17 10:00:24 -04:00
ihoover
e5f44165f8 Made activation flag and ENV_TOKEN 2013-07-16 15:29:38 -04:00
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