Commit Graph

474 Commits

Author SHA1 Message Date
e0d
6700a3ec14 Fixes for the AWS environment config. 2013-10-18 15:56:15 -04:00
brianhw
f831a0adcb Merge pull request #1406 from edx/post-release-2013-10-17-master
Post release 2013 10 17 master
2013-10-18 11:16:24 -07:00
Brian Wilson
aa172272f3 Update master with hotfixes from release-2013-10-17. 2013-10-18 11:50:42 -04:00
Gabe Mulley
c1450c8375 Merge pull request #1349 from mulby/gabe/course-id-context
add course_id to all emitted events
2013-10-17 15:45:37 -07:00
Gabe Mulley
d2b03e28fb add course_id to event context 2013-10-17 17:44:01 -04:00
Brian Talbot
58548af9c7 LMS - revises pipeline vendor file references 2013-10-17 15:55:37 -04:00
Adam Palay
1fc993ce18 add functionality to disable users
add middleware to detect students with disabled accounts

add tests
2013-10-16 16:57:11 -04:00
Jason Bau
ec8871206a use context processor instead of middleware 2013-10-16 12:16:10 -07:00
brianhw
97e01be147 Merge pull request #1359 from edx/brian/bulk-email-rc
Bulk Email improvements for release
2013-10-16 10:26:28 -07:00
Sarina Canelake
86c4a03eba admin-console support for enabling email per course 2013-10-16 13:02:41 -04:00
Brian Wilson
87a72b7e99 Rename some constants, and refactor bulk email task flow. 2013-10-16 13:02:40 -04:00
Brian Wilson
bc599a0662 Update tests with more complete coverage. 2013-10-16 13:02:40 -04:00
Brian Wilson
c5debc22e7 Add settings to cap infinite retries. 2013-10-16 13:02:36 -04:00
Brian Wilson
a4c35ac4ff Use separate retry count for calculating retry delay. 2013-10-16 13:01:59 -04:00
Julia Hansbrough
8a30e9ba8f Legacy email tests, removed duplicate code, updated comments, fixed CSS 2013-10-16 13:01:57 -04:00
Julia Hansbrough
91c31e12d5 Implemented bulk email interface for new dashboard 2013-10-16 13:01:14 -04:00
Brian Talbot
ef2218296f LMS: revises CSS reference/pipeline architecture to handle IE9 selector limits 2013-10-16 12:29:49 -04:00
Jason Bau
4c664240e1 Move logic that decides whether to show shoppingcart to middleware
Middleware is a better place for this, rather than navigation.html
template
2013-10-15 17:11:48 -07:00
Sarina Canelake
c24087a912 django-admin command for enabling email per course 2013-10-11 16:39:12 -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
chrisndodge
82e42cc580 Merge pull request #1156 from edx/feature/cdodge/add-preview-configs-via-middleware
add some middleware to determine whether draft modulestore or non-draft ...
2013-10-10 10:24:51 -07:00
David Baumgold
838f4df6b5 Merge pull request #1269 from edx/db/clarify-debug
Clarify USE_I18N settings
2013-10-09 13:55:30 -07:00
David Baumgold
cbaa3089ba Updated comment 2013-10-09 15:54:01 -04:00
Sarina Canelake
650c913110 Merge pull request #1260 from edx/sarina/email_FROM_address
Change the default FROM address for bulk email
2013-10-09 08:57:00 -07:00
Chris Dodge
8f9d815f10 add some middleware to determine whether draft modulestore or non-draft modulestore should be used
change to use regex to do the domain mappings. Also add config to AWS to be able to set from configuration file.

handle cases where HTTP_HOST is none, like in unit tests

add linefeed at end

fix up regex matches

switch to use thread local storage to hold the request itself

.

.

convert over to use open source 3rd party library

convert over to use django-cum

add unit test

remove comment

.

add comment to config setting

fix comment

use better regex for localdev

no need to break

no need to wrap an imported function, it's visible to any file that is importing us

add comment

add unit test

clean up test

use a separate env file to set the preview hostname
2013-10-09 11:53:26 -04:00
David Baumgold
16ca0252b3 Clarify USE_I18N settings
@jzoldak showed me that setting `USE_I18N = DEBUG` didn't actually accomplish
what I had hoped it would -- changing DEBUG didn't also change USE_I18N.
This pull request accomplishes what I was trying to accomplish, without being
quite so clever about it.
2013-10-09 09:04:12 -04:00
Sarina Canelake
c9172b79e6 Change the default FROM address for bulk email 2013-10-08 16:38:08 -04:00
David Baumgold
fd7e8baccb Tie the USE_I18N setting to DEBUG setting
We want USE_I18N to be on in development, but off in production. Tying
this setting to the DEBUG setting accomplishes that neatly.
2013-10-07 15:04:15 -04:00
Adam Palay
197f9015aa disable buttons for large courses on legacy and beta instr dash
set max enrollment for downloads to 200
2013-10-07 10:11:08 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Ned Batchelder
a1be970153 Merge pull request #1194 from edx/ned/quiet-tests
Quiet down exceptions at startup, and during tests
2013-10-03 08:21:37 -07:00
David Ormsbee
634da27347 Add AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING flag so that acceptance tests can run through certificate identity verification flow. 2013-10-02 18:09:00 -04:00
Ned Batchelder
50aa37be57 Quiet down exceptions at startup, and during tests
There's no need to display a traceback for every failed content load,
the comment before the log line even says so.

The exceptions shown before tests are run are because of the eager
initialization of the modulestores.  They don't need to be initialized
then, that just speeds the responsiveness of servers.  Putting off the
initialization means they get inited as needed, and the log lines get
2013-10-01 18:13:06 -04:00
Usman Khalid
316b4eee95 Merge pull request #1073 from edx/usman/lms1026-find-courses-link-optional
Added setting to disable 'find courses' links
2013-09-27 12:40:07 -07:00
Calen Pennington
d77491e46a Pull XModule attributes out into a mixin that can be applied to xblocks 2013-09-27 13:11:05 -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
Renzo Lucioni
f1ccf1c06b Integrate split testing and LMS tabs experiments 2013-09-25 00:27:36 -04:00
Usman Khalid
3ff203d11f Renamed setting ENABLE_STUDENT_SELF_ENROLLMENT to COURSES_ARE_BROWSABLE 2013-09-23 15:04:11 +00:00
Julian Arni
7a8d463260 Put static server middleware after the middleware it requires 2013-09-20 17:22:51 -04:00
jmclaus
7af892e66a Disabled video autoplay for students 2013-09-20 14:04:57 +02:00
Usman Khalid
d2cd8a6a58 Added setting to disable find courses links 2013-09-20 15:59:34 +05: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
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
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
f3af24f692 Merge pull request #842 from edx/jbau/shib-revamp
Revamped + Enhanced Shibboleth support
2013-09-10 12:27:07 -07:00
David Ormsbee
48f867bd6b Merge branch 'master' into ormsbee/verifyuser3
Conflicts:
	lms/envs/common.py
2013-09-09 10:18:25 -04:00