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

4330 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Carlos Andrés Rocha
fac73e88d0 Cache user course privileges during OpenID Connect authorization. 2014-11-06 13:46:32 -05:00
Dennis Jen
d3e051ce29 fixed quaility errors in instructor_dashboard.py, moved test_instructor_dashboard under tests/views directory 2014-11-06 13:42:00 -05:00
Don Mitchell
396a8aca07 Remove multi-threading test as unnecessary and flakey 
also fix other users of check_mongo_calls to use None if they don't care about sends
PLAT-239
 2014-11-06 13:22:48 -05:00
Diana Huang
e932820ae1 Add a created field to OrderItem. 2014-11-06 11:29:31 -05:00
Adam Palay
31b200cdcb add logging for cybersource errors; fix minor unicode bug 2014-11-06 10:25:42 -05:00
Nimisha Asthagiri
82a9b84f34 Fix broken test (due to merge conflict). 2014-11-06 09:19:40 -05:00
Ben Patterson
bba4014d1e Skip test broken on master. Sent to team for review. 2014-11-06 08:56:55 -05:00
Dennis Jen
66b3e3828f added tests for instructor_dashboard.py, added docstring for _is_small_course, removed check for settings.ANALYTICS_DASHBOARD_URL when creating dashboard link 2014-11-05 17:14:33 -05:00
Akiva Leffert
58d84e4747 Merge pull request #5798 from edx/aleffert/mobile-beta-enrollments-access 
https://openedx.atlassian.net/browse/MA-76
 2014-11-05 14:39:55 -05:00
Akiva Leffert
ffd6d89451 Update course enrollments API to allow beta users to see a course. 
Also adds me as an author
JIRA: https://openedx.atlassian.net/browse/MA-76
 2014-11-05 13:04:51 -05:00
Daniel Friedman
eaa63da463 Merge branch 'release' 2014-11-05 12:10:55 -05:00
Muhammad Ammar
e8e7e78e09 Merge pull request #5655 from edx/ammar/unit-improvements 
Unit Test Improvements
 2014-11-05 19:55:39 +05:00
Renzo Lucioni
d9d09e2b4b Fix track selection tests 2014-11-04 15:25:38 -05:00