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

26886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
d50137bb64 Redirect to a valid URL when cancelling third party auth 2014-11-12 09:33: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
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
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
Will Daly
8f1cbada35 Merge pull request #5907 from edx/will/logistration-zoom-fixup 
Include zoom only if the page is marked as responsive
 2014-11-10 14:13:33 -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
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
Will Daly
c150ea76aa Merge pull request #5890 from edx/will/logistration-auto-enroll-register 
Logistration: Auto-enroll fails after registering a new account
 2014-11-10 12:23:28 -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
Sarina Canelake
2f78b96778 Merge pull request #5897 from edx/sarina/20141110-update-translations 
Update translations (autogenerated message)
 2014-11-10 11:57:57 -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
Renzo Lucioni
031195d0d8 Fix Jasmine test 2014-11-10 11:25:39 -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
Sarina Canelake
371805a8c3 Update translations (autogenerated message) 2014-11-10 10:52:34 -05:00
Will Daly
95a435abc5 Include course ID in analytics events for logistration 2014-11-10 10:23:34 -05:00
Usman Khalid
96b1a17b66 Merge pull request #5816 from edx/usman/plat71-mongo-autoreconnect-errors-2 
Proxy to retry on mongo Autoreconnect errors.
 2014-11-10 19:56:11 +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
Will Daly
ad3c11e58e Merge pull request #5892 from edx/will/logistration-remove-whitespace-from-form 
Logistration: Remove extra whitespace from textarea fields in registration form
 2014-11-10 09:16:10 -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
Waheed Ahmed
57ce9aefcf Merge pull request #5893 from edx/waheed/tnl765-fix-null-answer-in-checkbox-problem 
Fixed null answer in checkbox problem as incorrect.
 2014-11-10 19:03:00 +05:00
AlasdairSwan
610ebc3b06 ECOM-621 localized neat to partials that use them 2014-11-10 09:00:27 -05:00
Waheed Ahmed
c397495eb9 Fixed null answer in checkbox problem as incorrect. 
TNL-765
 2014-11-10 18:41:26 +05:00
Will Daly
dca9a554cf Remove extra whitespace from textarea fields in registration form 2014-11-10 08:18:43 -05:00
Will Daly
b8f5be2cdd Allow inactive users to modify their own enrollments 2014-11-10 08:10:47 -05:00
Waheed Ahmed
9688b868aa Merge pull request #5861 from edx/waheed/tnl778-fix-youtube-stub-server 
Fixed youtube stub server and removed unused variable.
 2014-11-10 13:01:24 +05:00
Waheed Ahmed
3a71901f93 Fixed youtube stub server and removed unused variable. 
TNL-778
 2014-11-10 11:43:58 +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
Mark Hoeber
ec8d954f84 Merge pull request #5793 from edx/markhoeber-doc1160 
WIP - Split Mongo Documentation
 2014-11-07 19:38:22 -05:00
Mark Hoeber
3b84d60ce6 Split mongo overview documentation 2014-11-07 19:37:38 -05:00
Ned Batchelder
757e8f10e5 Merge pull request #5826 from edx/ned/no-which-dot-py 
No need to use which on a .py file
 2014-11-07 16:41:14 -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
Adam
9a6acf2dff Merge pull request #5837 from edx/adam/sandbox 
change djfs settings not to throw an error when the app starts up
 2014-11-07 13:49:53 -05:00
AlasdairSwan
b77fc22fd1 Merge pull request #5887 from edx/alasdair/logistration-error-scroll 
Updated so is submission prevented by JS due to errors it scrolls to the...
 2014-11-07 13:46:14 -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
4c51f8731f Merge pull request #5883 from edx/will/logistration-enrollment-cleanup 
Logistration: enrollment cleanup and a few fixes
 2014-11-07 13:03:06 -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