Commit Graph

9370 Commits

Author SHA1 Message Date
Ben Patterson
4db5b31138 Don't use 'test' db for mysql since it's reserved.
This db name is reserved and used by mysql installations. This can cause
conflicts when trying to populate our own 'test' database on mysql.

Conflicts:
	scripts/reset-test-db.sh
2014-11-17 11:28:23 -05:00
Adam Palay
e7b23faa86 disable "go to payment button" on click (ECOM-643) 2014-11-17 10:38:44 -05:00
Diana Huang
da5bfd45aa Fix pylint violation. 2014-11-12 09:17:56 -05:00
chrisndodge
257b22e228 Merge pull request #5922 from edx/cdodge/fix-import-error
try importing the exact references we need rather than deferencing it fr...
2014-11-12 09:04:19 -05:00
Chris Dodge
a93faad78b try importing the exact references we need rather than deferencing it from the djangoapp module 2014-11-11 21:49:13 -05:00
AlasdairSwan
790ac3f3ef Merge pull request #5915 from edx/alasdair/rwd-trackselection
ECOM-574 Updated track selection page to be responsive
2014-11-10 16:41:50 -05:00
chrisndodge
81c1ae35d8 Merge pull request #5903 from edx/cdodge/shoppingcart-isolation
harden down access to the shoppingcart if the ENABLE_PAID_COURSE_REGISTR...
2014-11-10 16:03:38 -05:00
AlasdairSwan
23081f076b ECOM-574 Updated track selection page to be responsive 2014-11-10 15:39:17 -05:00
Chris Dodge
58b4982d2d harden down access to the shoppingcart if the ENABLE_PAID_COURSE_REGISTRATION flag is not set (either via the main Django configuration settings) or through microsite overrides 2014-11-10 15:09:48 -05:00
Diana Huang
bd87a9dd29 Record processor response on both successful and
unsuccessful orders.
2014-11-10 14:36:12 -05:00
Adam Palay
cc48800d54 add logging for orders when 'purchase' is called on them multiple times ECOM-630 2014-11-10 12:40:38 -05:00
chrisndodge
6df676b9b8 Merge pull request #5712 from edx/cdodge/change-shoppingcart-context-processor-to-be-microsite-aware
allow for overrides on ENABLE_PAID_COURSE_REIGSTRATIONS via mircosites
2014-11-10 09:08:16 -05:00
Sarina Canelake
0cedffc555 Merge pull request #5824 from edx/sarina/remove-unused-lms_static_images
Remove unused images from lms/static/images
2014-11-10 09:06:51 -05:00
Chris Dodge
3d955523d1 allow for overrides on ENABLE_PAID_COURSE_REIGSTRATIONS via mircosites 2014-11-09 21:05:45 -05:00
chrisndodge
c4a957c159 Merge pull request #5876 from edx/cdodge/catalog-visibility
Add new course_module field which describes what the catalog visibility ...
2014-11-09 21:02:49 -05:00
Chris Dodge
3c36f7cbad Add new course_module field which describes what the catalog visibility should be (both, about, none) 2014-11-09 10:36:00 -05:00
Carlos Andrés Rocha
1b858e5497 Merge pull request #5749 from rocha/cache-oauth2-handler-course-values
Cache user course privileges during OpenID Connect authorization.
2014-11-07 14:38:09 -05:00
Sarina Canelake
efbf129ae7 Last references removed in 982d22df38 2014-11-07 12:57:37 -05:00
Sarina Canelake
691ab78c6b Last references removed in dc60d107e9 2014-11-07 12:57:16 -05:00
Sarina Canelake
718e8012db Rename homepage hero video thumbnail image 2014-11-07 11:18:50 -05:00
Sarina Canelake
6dde904f1b Last reference removed in e1113d9ca9 2014-11-07 11:18:50 -05:00
Sarina Canelake
fefceca0a3 Last referenced in 186e5fc5e1 2014-11-07 11:18:50 -05:00
Sarina Canelake
8275bcb1a0 Last reference removed in 770ec2dbb3 2014-11-07 11:18:49 -05:00
Sarina Canelake
0551bc9092 Last references removed in b841591b0a 2014-11-07 11:18:49 -05:00
Sarina Canelake
a2f6d77ea6 Last reference removed in 2a1ddab224 2014-11-07 11:18:49 -05:00
Sarina Canelake
b432c18a3b Last reference removed in 05b9e6cab2 2014-11-07 11:18:49 -05:00
Sarina Canelake
92c1efe85c Last reference removed in 94886643b0 2014-11-07 11:18:49 -05:00
Sarina Canelake
20c13096ed Last references removed in ab2995fc85 2014-11-07 11:18:49 -05:00
Sarina Canelake
d5ba04874e Last references removed in ab2b7f344d 2014-11-07 11:18:49 -05:00
Sarina Canelake
1843dc4dda Last references removed in 854621be60 2014-11-07 11:18:49 -05:00
Sarina Canelake
47e185d12b Last reference removed in 1bc0b323b1 2014-11-07 11:18:48 -05:00
Sarina Canelake
6d415e484c Last reference removed in 2bfe0cb92d 2014-11-07 11:18:48 -05:00
Sarina Canelake
b16d04afec Last reference removed in 300d55cbd5 2014-11-07 11:18:48 -05:00
Sarina Canelake
826251c166 Last reference removed in 81a56a35ab 2014-11-07 11:18:48 -05:00
Sarina Canelake
ae1343ba2c Last references removed in 14345401cc 2014-11-07 11:18:48 -05:00
Sarina Canelake
f15ddb8e8c Last reference removed in e21e5284de 2014-11-07 11:18:48 -05:00
Sarina Canelake
4ebd5c188d Last reference removed in 89ba90a695 2014-11-07 11:18:48 -05:00
Sarina Canelake
6584df39e1 Last reference removed in 58c5066e66 2014-11-07 11:18:48 -05:00
Sarina Canelake
92b86af2c1 Last reference removed in 5ef94f1496 2014-11-07 11:18:47 -05:00
Sarina Canelake
f3aa21f5ba Last reference removed in 988e4e6da5 2014-11-07 11:18:47 -05:00
Sarina Canelake
a0b3ab2a0a References removed in 4dc527d119 2014-11-07 11:18:47 -05:00
Sarina Canelake
759fae2978 Can't find any references (current or historical) to these files 2014-11-07 11:18:47 -05:00
Sarina Canelake
6a5bb4f20d References removed in e1113d9ca9 2014-11-07 11:18:47 -05:00
Sarina Canelake
b69169a690 Remove unused images
Moved images in folders to top level where appropriate, and change references.

OPEN-297
2014-11-07 11:18:47 -05:00
Sarina Canelake
5cedbc7ee6 Rename branded asset; moved to LMS as that's where it is referenced [OPEN-302] 2014-11-07 09:50:45 -05:00
chrisndodge
01c029aa9f Merge pull request #5805 from edx/cdodge/make-customizeable-region-in-receipt-page
allow for a customized region on the receipt page that is microsite bran...
2014-11-06 21:13:43 -05:00
Adam
893cb9c21a Merge pull request #5873 from edx/release
Release
2014-11-06 16:53:05 -05:00
Christina Roberts
fd587b976c Merge pull request #5710 from edx/christina/general-component-errors
Support validation messages for any xblock (on container page).
2014-11-06 16:47:49 -05:00
cahrens
08ce09bde7 Display validation messages for any xblock on the container page.
TNL-683
2014-11-06 15:48:55 -05:00
Don Mitchell
e4e45018fe Merge pull request #5871 from edx/dhm/remove_test
Remove multi-threading test as unnecessary and flakey
2014-11-06 14:21:13 -05:00