Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5315 Commits

Author SHA1 Message Date
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
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
610ebc3b06 ECOM-621 localized neat to partials that use them 2014-11-10 09:00:27 -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
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
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
Renzo Lucioni
0459094968 Fix logistration Jasmine tests 
Includes several bug fixes caught during test writing, general clean-up, and adds js-url, a lightweight URL parser
Moved to setting ajaxType with passed in method for models and now handling form load fail errors
Added tests.
 2014-11-07 08:47:16 -05:00
Renzo Lucioni
f9ecd8849a Fix logistration Jasmine tests 
Includes several bug fixes caught during test writing, general clean-up, and adds js-url, a lightweight URL parser
 2014-11-06 12:07:49 -05:00
Renzo Lucioni
5edb7b9c87 Track logistration form toggles and password reset form views 2014-11-06 10:00:42 -05:00
AlasdairSwan
62b5e27cf9 Updated templates in light of accessibility review 2014-11-05 15:53:55 -05:00
Sarina Canelake
90b40e7d57 Merge pull request #5823 from edx/sarina/delete-unused-lms-assets 
Remove unused static assets (LMS)
 2014-11-05 15:36:42 -05:00
AlasdairSwan
8a62991ff9 ECOM-585, ECOM-587 and ECOM-588 Changed order of forms based on url, fixed tabbing issue with forgot password link and moved third party quth error message so now does not load buttons if they do not have a url 2014-11-05 11:47:26 -05:00
Sarina Canelake
ad8bc69f93 Move all lms image files into lms/static/images [OPEN-303] 2014-11-05 09:10:15 -05:00
frances botsford
6047664b99 Merge pull request #5835 from OmarIthawi/omarithawi/fixed-rtl-icon-spacing-in-discussion 
Fixed spacing of RTL icon in discussion
 2014-11-04 16:44:17 -05:00
AlasdairSwan
588e1db629 ECOM-583 Fixes the CSS bugs 2014-11-04 14:56:34 -05:00
Diana Huang
a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/course_modes/views.py
 2014-11-04 10:50:09 -05:00
Omar Al-Ithawi
b79180bb97 Fixed spacing of RTL icon in discussion 2014-11-04 14:30:23 +02:00
Sarina Canelake
aeb3a7f575 fixup! Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4) 2014-11-03 16:49:18 -05:00
Sarina Canelake
15495e6ff3 Remove old 404 page 2014-11-01 00:13:06 -04:00
Sarina Canelake
6a06ff6a75 Remove unused static assets 2014-11-01 00:11:23 -04:00