Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,828 Commits 1 Branch 0 Tags
3ae312caa625f4ec1323a670f7ca2cbd57b3f059
Commit Graph

9395 Commits

Author SHA1 Message Date
Ben Patterson
3ae312caa6 Merge pull request #5954 from edx/benp/mysql56-test-updates 
Don't use 'test' db for mysql since it's reserved.
 2014-11-13 19:50:54 -05:00
Stephen Sanchez
66ff4e67cb Merge pull request #5946 from edx/sanchez/ecommerce_info_to_ga 
Adding new Google Analytics eCommerce event to shoppingcart.
 2014-11-13 16:51:37 -05:00
Ben Patterson
a19b97c61f 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.
 2014-11-13 14:41:50 -05:00
stephensanchez
822f15546a Adding new Google Analytics eCommerce event to shoppingcart. 
Adding new event and test

pylint and comments
 2014-11-13 18:17:52 +00:00
David Ormsbee
43d8c7a712 Merge branch 'release' 
Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
 2014-11-13 10:11:12 -05:00
Stephen Sanchez
fc8b2a5f37 Merge pull request #5720 from edx/sanchez/avoid_event_suppression 
Changing event suppression to signal suppression.
 2014-11-12 12:46:26 -05:00
stephensanchez
6e85ec0739 Changing event suppression to signal suppression. 
Code review changes.

Fix test and pylint.

pylint error.

Updating the test to verify the signal is fired.

Test for all analytics events

Import pylint error.

Pylint error
 2014-11-12 16:26:29 +00:00
Dennis Jen
dd38f52358 Merge pull request #5838 from edx/dsjen/feature-flag-analytics-enrollments 
Feature flagged enrollment counts on instructor dashboard.
 2014-11-12 10:40:04 -05:00
Diana Huang
da5bfd45aa Fix pylint violation. 2014-11-12 09:17:56 -05:00
Adam
4486ce35a7 Merge pull request #5913 from edx/adam/prevent-accidental-course-mode-downgrade 
Prevent instructors from accidentally downgrading enrollment modes throu...
 2014-11-12 09:05:01 -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
zubair-arbi
6dae34a34b Merge pull request #5923 from edx/zub/bugfix/wl-150-survey-form-error-on-info-page 
avoid annonymous user from redirecting to survey form
 2014-11-12 18:14:38 +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
zubair-arbi
b7d526b907 avoid annonymous user from redirecting to survey form 
WL-150
 2014-11-11 14:22:26 +05:00
stv
500499b678 Fix PEP8: E231 missing whitespace after '[:,]' 2014-11-10 19:31:05 -08:00
stv
b388ab9db0 Fix PEP8: E226 missing whitespace around arithmetic operator 2014-11-10 19:30:18 -08:00
stv
00ae488960 Fix PEP8: E225 missing whitespace around operator 2014-11-10 19:30:18 -08:00
stv
41390f0239 Fix PEP8: E222 multiple spaces after operator 2014-11-10 19:30:18 -08:00
stv
1a9f8b61f9 Fix PEP8: E221 multiple spaces before operator 2014-11-10 19:30:17 -08:00
Adam Palay
1d85659b13 Prevent instructors from accidentally downgrading enrollment modes through instructor dash TNL-804 2014-11-10 18:04:22 -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
Sarina Canelake
0bf0d11a20 Merge pull request #5906 from stvstnfrd/pep8/newline 
Fix newline-related PEP8 issues
 2014-11-10 15:29:06 -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
Diana Huang
b0b1744e18 Merge pull request #5902 from edx/diana/record-processor-response 
Record processor response on both successful and
 2014-11-10 14:19:42 -05:00
Diana Huang
b1c44ac74f Record processor response on both successful and 
unsuccessful orders.
 2014-11-10 14:09:42 -05:00
stv
fb9f324f2f Fix PEP8: E303 too many blank lines 2014-11-10 11:00:14 -08:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
stv
d5d6e3f0d8 Fix PEP8: W293 blank line contains whitespace 2014-11-10 10:59:53 -08:00
stv
d87cfa90bf Fix PEP8: W292 no newline at end of file 2014-11-10 10:59:44 -08: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