Commit Graph

140 Commits

Author SHA1 Message Date
Ned Batchelder
9a106a32d5 Merged master to rc/2013-11-21 2013-11-25 14:56:09 -05:00
David Ormsbee
e0aa8cf78a Grade report celery task and direct file push to S3 from the new instructor dashboard.
Hook up display of grade files ready for download to new instructor dashboard.

LMS-58
2013-11-22 10:06:10 -05:00
Feanil Patel
729f2e3bfa Merge pull request #1637 from edx/feanil/aws_creds
Set empty aws credentials to None.
2013-11-20 07:57:16 -08:00
John Jarvis
693cfdea50 'ignore' shouldn't be use for ascii conversion
The input string is not expected to contain any unicode characters
2013-11-19 14:34:06 -05:00
John Jarvis
4067a084ee STATIC_URL_BASE for lms config 2013-11-19 13:23:54 -05:00
John Jarvis
5ec77010e3 allow override for STATIC_URL 2013-11-18 10:54:12 -05:00
Feanil Patel
9dd182800b Set empty aws credentials to None. 2013-11-08 12:22:09 -05:00
David Baumgold
3895a3fa52 Merge pull request #1581 from antoviaque/registration-optional
registration-optional: Allow to hide some optional registration fields #os
2013-11-05 10:25:31 -08:00
John Jarvis
f78508116f setting THEME_NAME to None when it's set to an empty string 2013-11-05 11:14:56 -05:00
Xavier Antoviaque
08dffa12cc registration-optional: Allow to hide some optional registration fields
Allow to control which of the optional fields from the registration page
are being displayed to the user. Added the configuration variable
`REGISTRATION_OPTIONAL_FIELDS` to control which ones. The default value
shows all the fields as currently; to not display some of the fields,
set the configuration variable with only the fields you want to display:

```
REGISTRATION_OPTIONAL_FIELDS = [
    'level_of_education',
    'gender',
    'year_of_birth',
    'mailing_address',
    'goals'
]
```
2013-11-05 11:50:29 +01:00
Szczork
b3844af28d Translation overrides
Usefull variables for translation
2013-10-23 12:39:31 -04:00
John Jarvis
68d31b9808 adding STATIC_ROOT_BASE to lms/envs/aws.py 2013-10-23 10:30:05 -04:00
John Jarvis
42e1991953 adding STATIC_ROOT 2013-10-21 14:39:34 -04:00
Carlos Andrés Rocha
0be9daf9d5 Merge pull request #1419 from rocha/fix-config-root-env
Fix error when reading tokens on aws configuration
2013-10-21 08:24:15 -07:00
Carlos Andrés Rocha
b764b9b4cf Fix error when reading tokens on aws configuration
The error was caused by the CONFIG_ROOT environmental variable,
which was incorrectly assumed to be a path.py valid path.
2013-10-21 03:19:22 -04:00
e0d
5995a76254 sanity restored. 2013-10-18 16:26:23 -04:00
e0d
a008cc6b74 path fix. 2013-10-18 16:12:51 -04:00
e0d
6700a3ec14 Fixes for the AWS environment config. 2013-10-18 15:56:15 -04:00
Brian Wilson
58bacb4e67 Rename some constants, and refactor bulk email task flow. 2013-10-10 15:34:16 -04:00
Brian Wilson
03b4330c04 Update tests with more complete coverage. 2013-10-10 15:34:16 -04:00
Brian Wilson
a6bd1c2132 Add settings to cap infinite retries. 2013-10-10 15:34:06 -04:00
Brian Wilson
506f91a95e Use separate retry count for calculating retry delay. 2013-10-10 15:32:59 -04:00
Carlos Andrés Rocha
f2bf95b205 Add variable to set location of config files on aws
The env variable CONFIG_ROOT is used to determine the location of the
JSON configuration files. This is useful when a deployment of the
platform is used to access different environments when executing django
commands.
2013-10-08 14:46:18 -04:00
Jason Bau
667a1eadb5 Stanford paid course registration
With tests, some settings changes
(all should default to not breaking anything for edx)

Added styling for shopping cart User Experience
- Styled shoppingcart list page
- Styled navigation shopping cart button
- Styled receipt page
- Styled course about page for shopping cart courses

Addressed HTML/SCSS issues

Remove offending body class and unnecessary sass changes

Addresses many review comments on stanford shopping cart

* framework for generating order instructions on receipt page
  in shoppingcart.models
* move user_cart_has_item into shoppingcart.models
* move min_course_price_for_currency into course_modes.models
* remove auto activation on purchase
* 2-space indents in templates
* etc

revert indentation on navigation.html for ease of review

pep8 pylint

move logging/error handling from shoppingcart view to model

Addressing @dave changes
2013-09-26 18:25:00 -07:00
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