Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,917 Commits 1 Branch 0 Tags
54f62a85f6164545151c32a063916cbeec94de46
Commit Graph

11358 Commits

Author SHA1 Message Date
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
Renzo Lucioni
6defcaa0af Final text review 2014-11-10 16:33:37 -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
Will Daly
be0a4ee74e Merge pull request #5909 from edx/will/logistration-ab-test-css-classes 
Logistration: Add CSS classes so we can compare clicks between the old and new login/registration pages
 2014-11-10 15:12:38 -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
Will Daly
5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py
 2014-11-10 15:05:37 -05:00
Diana Huang
bd87a9dd29 Record processor response on both successful and 
unsuccessful orders.
 2014-11-10 14:36:12 -05:00
Will Daly
ed652bbc98 Add CSS classes so we can compare clicks between the old and new login/registration pages 2014-11-10 14:32:56 -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
Will Daly
0c59f10b52 Include zoom only if the page is marked as responsive 2014-11-10 14:02:01 -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
Will Daly
5fdd966544 Merge pull request #5901 from edx/will/logistration-make-marketing-link-easier-to-ab-test 
Logistration: Use href in marketing link if available to make A/B testing easier
 2014-11-10 12:56:57 -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
Will Daly
73163b9bb0 Use href in marketing link if available to make A/B testing easier 2014-11-10 12:04:07 -05:00
AlasdairSwan
b9998b6d5b Merge pull request #5899 from edx/alasdair/logistration-select-validation 
ECOM-626 Added required check for select dropdowns and validation
 2014-11-10 11:54:20 -05:00
Will Daly
2abd023a7b Merge pull request #5895 from edx/will/logistration-include-course-in-analytics 
Logistration: Include course ID in analytics events for login/registration
 2014-11-10 11:22:36 -05:00
AlasdairSwan
cb5c03f0d1 ECOM-626 Added required check for select dropdowns and validation 2014-11-10 11:06:52 -05:00
Will Daly
95a435abc5 Include course ID in analytics events for logistration 2014-11-10 10:23:34 -05:00
AlasdairSwan
bb257b6f48 Merge pull request #5894 from edx/alasdair/logistration-neat-localization 
ECOM-621 localized neat to partials that use them
 2014-11-10 09:46:11 -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
AlasdairSwan
610ebc3b06 ECOM-621 localized neat to partials that use them 2014-11-10 09:00:27 -05:00
Will Daly
dca9a554cf Remove extra whitespace from textarea fields in registration form 2014-11-10 08:18:43 -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
Will Daly
a13f4f2fe6 Merge pull request #5766 from edx/will/logistration-feature-flag 
Put logistration page behind a feature flag
 2014-11-07 14:16:03 -05:00
AlasdairSwan
a1f8211e5f Updated so is submission prevented by JS due to errors it scrolls to the error messages 2014-11-07 13:42:28 -05:00
Will Daly
578c04f62f Put logistration page behind a feature flag 2014-11-07 13:05:17 -05:00
Will Daly
e629ce2ba6 Move redirection/enrollment to AccessView and trigger it using an event. 
Ensure window.isExternal is loaded

Don't set a default for terms of service

For paid courses, add the course to the cart and redirect to the shopping cart view.

Don't send form method and url as form data.

Stub window.analytics in the access view test.
 2014-11-07 12:59:08 -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