Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

953 Commits

Author SHA1 Message Date
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
Will Daly
f2c417b638 Write Django logs to file during acceptance tests 2013-10-16 15:44:35 -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
9c94263d07 Removed email acceptance test 2013-10-16 13:01:57 -04:00
Julia Hansbrough
8a30e9ba8f Legacy email tests, removed duplicate code, updated comments, fixed CSS 2013-10-16 13:01:57 -04:00
Will Daly
3f88b87916 Added acceptance tests for bulk email (through beta dashboard) 2013-10-16 13:01:57 -04:00
Julia Hansbrough
d8a857dba2 Changed GET to POST and xmodule HTML editor call, section CSS 2013-10-16 13:01:52 -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
Will Daly
82535f3bcb Enable and update bulk email acceptance test 2013-10-15 21:30:28 -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
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