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

2561 Commits

Author SHA1 Message Date
Sarina Canelake
5106710d13 Move wiki icons to the LMS, where they are used 
OPEN-328
 2014-12-09 22:28:08 -05:00
Sarina Canelake
0c535e44d5 Remove duplicate image files 
spinner.gif and spinner-on-grey.gif are the same file.
Explicitly give the LMS a spinner.gif file.

OPEN-328
 2014-12-09 22:28:08 -05:00
Sarina Canelake
a790d9f8fb Move images from common to LMS that are only used in LMS 
OPEN-328
 2014-12-09 22:28:08 -05:00
Clinton Blackburn
fc242ea23e Merge branch 'release' 
Release 2014-12-10
 2014-12-09 17:39:17 -05:00
Brian Talbot
a5913a4836 LMS: adding in basic is-deprecated visual styling 2014-12-09 13:57:20 -05:00
Sarina Canelake
3474601321 Add CSS rules for legacy dash deprecation warnings 2014-12-09 13:57:20 -05:00
Clinton Blackburn
5110632ecf Merge pull request #6197 from edx/talbs/fix-lms-calculator-toggle 
FIX - LMS: removing un-needed utility Sass mixin from calc styling
 2014-12-09 09:55:06 -05:00
jmclaus
082cb3b9ed Load OVA JS with requireJS in LMS. 2014-12-09 09:49:45 -05:00
Brian Talbot
39125bcc0a LMS: removing un-needed utility Sass mixin from calc styling 2014-12-09 09:41:57 -05:00
chrisndodge
099d02d13d Merge pull request #6124 from edx/muhhshoaib/WL-164 
Unpurchased items in the shoppingcart should be removed if the enrollment period has closed
 2014-12-09 09:25:46 -05:00
Waheed Ahmed
222b05a158 Added IMG tag instead of css background property for important visual indicator. 
TNL-892
 2014-12-09 12:38:54 +05:00
Muhammad Shoaib
829f7dba5f Remove items from the shopping cart if they are for a course whose course enrollment window has closed 
changed the url name to verify_cart and change the color of the message in the shopping cart
 2014-12-09 12:20:37 +05:00
Chris
c45e34bf2e Merge pull request #5842 from Stanford-Online/giulio/prerequisites-style-fixes 
Remove extra prerequisites style and class
 2014-12-05 09:03:14 -05:00
Giulio Gratta
54b7a578a2 Remove extra prerequisites style and add classes 2014-12-04 14:25:26 -08:00
Brian Talbot
93c33cdfd8 LMS: fix - visually hiding calculator toggle label 2014-12-04 16:15:46 -05:00
chrisndodge
f7f9bec6ea Merge pull request #5774 from edx/cdodge/shopping-cart-touchups 
Cdodge/shopping cart touchups
 2014-12-04 14:02:19 -05:00
srpearce
f2e20f333e Merge pull request #5998 from edx/sylvia/docs/1162 
Sylvia/docs/1162
 2014-12-04 12:19:39 -05:00
Waheed Ahmed
c2c40eba1b Fixed instructor dashboard tooltip far away issue. 
TNL-558
 2014-12-04 12:08:13 +05:00
Muhammad Shoaib
cd30164b5f Improvements and bug fixes for shopping cart: WL-117, WL-114, WL-116, WL-115, WK-122 2014-12-04 01:11:49 -05:00
Brian Talbot
8d947f0215 LMS: revising styling of calculator tooltip content 2014-12-03 16:09:07 -05:00
Will Daly
84301e7698 Merge pull request #6070 from edx/will/verified-messaging-per-course 
Student verification status
 2014-12-02 16:08:25 -05:00
AlasdairSwan
96afb82dbd Added styles for email opt in/out checkbox label 2014-12-02 11:50:31 -05:00
AlasdairSwan
962dc221d4 ECOM-677 ECOM-678 styled the new messages 2014-12-02 09:43:57 -05:00
stephensanchez
32c9230cd1 Hooking the logistration page into the new HTTP endpoint for email opt in. 
Update the PR based on Code Review comments, and additional tests.

Using underscore js
 2014-12-01 17:25:57 +00:00
Renzo Lucioni
55922f896d hotfix-2014-11-20 2014-11-20 12:00:19 -05:00
Adam Palay
624360d1d6 serve mathjax from mathjax's cdn (TNL-823) 2014-11-20 09:36:16 -05:00
chrisndodge
4a3700c151 Merge pull request #5969 from edx/muhhshoaib/WL-124-front-end-tests-for-auto-enrollment 
muhhshoaib/wl 124 add front end tests for autoenrollment
 2014-11-19 10:14:22 -05:00
Muhammad Shoaib
97b45cc2a7 WL-124 added the jasmine tests for the autoenrollment csv 
Added bokchoy tests and assets (csv files) for CSV auto reg and enrollment.
Set the env flag "ALLOW_AUTOMATED_SIGNUPS": true in bok_choy.env.json

Resolved quality issues.

resolved cherry pick conflicts

Improved bokchoy tests as per code review suggestions.

added the BDD in the docstrings for all the test scenarios

changed the bok choy test string

Improved bokchoy tests as per further code review suggestions.

Made a MembershipPageAutoEnrollSection a separate PageObject.
 2014-11-18 18:35:31 +05:00
Waheed Ahmed
2d46a79345 Updated open sans webfonts with latest. 
TNL-395
 2014-11-18 12:18:12 +05:00
Will Daly
4a814c24ba Merge pull request #5948 from edx/will/combine-reg-login-form 
Combined Login/Registration Form
 2014-11-17 16:00:20 -05:00
AlasdairSwan
c7f5431102 Merge pull request #5973 from edx/alasdair/logistration-password-scroll 
ECOM-650 updated to add auto scrolling for password reset view
 2014-11-17 09:42:17 -05:00
AlasdairSwan
dff0acf54d ECOM-650 updated to add auto scrolling for password reset view 2014-11-17 09:31:22 -05:00
AlasdairSwan
87af92a1a5 Merge pull request #5971 from edx/alasdair/logistration-css-bugs 
ECOM-651 No longer updating -settings by default
 2014-11-17 09:07:43 -05:00
AlasdairSwan
69446678a4 ECOM-651 No longer updating -settings by default 2014-11-17 09:01:47 -05:00
stephensanchez
2486901602 Adding disable logic for buttons. 
Update tests, clean up approach.

Updating jasmine tests.
 2014-11-14 18:35:55 +00:00
Sarina Canelake
810df8b7de Merge pull request #5885 from edx/sarina/name-branded-assets-in-lms 
Consistently name branded assets in lms
 2014-11-14 13:29:22 -05:00
Adam Palay
bc8d0a9976 disable "go to payment button" on click (ECOM-643) 2014-11-14 12:22:30 -05:00
Sarina Canelake
ab5da97c41 Consistently name edX branded elements within the LMS [OPEN-300] 2014-11-14 10:30:37 -05:00
AlasdairSwan
06cbe161a7 After accessibility review removed required field aria-describedby 2014-11-13 13:12:36 -05:00
Will Daly
a5001bab2a Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss
 2014-11-13 11:16:16 -05:00
AlasdairSwan
ecb6a69fe7 ECOM-369 Reunited the missing line with the rest of the page elements and fixed an error with HTML5 validation override 2014-11-12 15:51:18 -05:00
AlasdairSwan
3eb287151c ECOM-369 accessibility updates 2014-11-12 14:17:41 -05:00
Will Daly
02485be3e3 Clean up redirect logic 2014-11-12 10:27:25 -05:00
AlasdairSwan
1a5c3977af ECOM-632 added asterix explanation footnote 2014-11-12 08:52:51 -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
AlasdairSwan
23081f076b ECOM-574 Updated track selection page to be responsive 2014-11-10 15:39:17 -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
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