Commit Graph

3531 Commits

Author SHA1 Message Date
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
Julia Hansbrough
f397e66127 Merge pull request #1215 from edx/flowerhack/feature/bulkemailnewdash_testingcoverage
Flowerhack/feature/bulkemailnewdash testingcoverage
2013-10-10 11:26:21 -07:00
Julia Hansbrough
c18f45095c Removed email acceptance test 2013-10-10 17:40:25 +00:00
John Jarvis
92a7d75b5d Merge pull request #1305 from edx/jarv/revert-1240
Revert "Merge pull request #1240 from edx/dhm/config_separation"
2013-10-10 10:27:58 -07: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
John Jarvis
a517dc2085 Revert "Merge pull request #1240 from edx/dhm/config_separation"
This reverts commit ec01253e30, reversing
changes made to ae8c9710e5.
2013-10-10 13:14:08 -04:00
Julia Hansbrough
fbeb2206d4 Legacy email tests, removed duplicate code, updated comments, fixed CSS 2013-10-10 17:06:41 +00:00
Will Daly
c66b5dc3d4 Added acceptance tests for bulk email (through beta dashboard) 2013-10-10 17:06:38 +00:00
Julia Hansbrough
e325317bde Changed GET to POST and xmodule HTML editor call, section CSS 2013-10-10 17:06:37 +00:00
Julia Hansbrough
dba11a9677 Implemented bulk email interface for new dashboard 2013-10-10 17:06:34 +00: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
Don Mitchell
ec01253e30 Merge pull request #1240 from edx/dhm/config_separation
Segregate the mongo db config from the modulestore config
2013-10-09 13:24: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
Carlos Andrés Rocha
fd7293144e Merge pull request #1263 from rocha/add-config-root-env-variable-to-aws-config
Add variable to set location of config files on aws
2013-10-09 07:45:16 -07:00
Gabe Mulley
5359e2ebef Merge pull request #1207 from mulby/gabe/tracking-tests
add acceptance tests for event tracking
2013-10-09 07:08:49 -07: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
Gabe Mulley
17a0479849 add acceptance tests for event tracking 2013-10-09 08:09:14 -04:00
Sarina Canelake
c9172b79e6 Change the default FROM address for bulk email 2013-10-08 16:38:08 -04:00
Don Mitchell
44d0494d33 Segregate the mongo db config from the modulestore config
as a first step to separating db connection from modeling
and to support location mapper and contentstore using same db config as modulestore
2013-10-08 15:01:48 -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
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
Will Daly
b0878d3d43 Allow rake test to run individual tests again 2013-10-03 16:15:33 -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
Calen Pennington
67ccf1e3bb Move nose/django arguments for tests out of rake so that raw manage.py works when running tests 2013-09-27 15:41:58 -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
c1d555beef Merge pull request #1118 from edx/jbau/shoppingcart-stanford
Stanford paid course registration
2013-09-27 07:31:17 -07: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
Don Mitchell
2379e7c3fc Merge pull request #1029 from edx/dhm/migrate_mongo
Migrate courses from old mongo to split
2013-09-26 10:35:52 -07:00
Don Mitchell
59b31474ca Separate db config from modulestore config parms
use to instantiate loc_mapper
test loc_mapper injection into split modulestore
2013-09-26 12:57:40 -04: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
Julian Arni
bf633f9c5d Perform auth checks in middleware
Includes static server tests.
2013-09-20 17:22:08 -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
Jay Zoldak
4c411e2121 Add ability to run against generic selenium grid 2013-09-18 13:49:34 -04: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