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

3246 Commits

Author SHA1 Message Date
David Baumgold
03aeae4bd7 Merge pull request #8271 from edx/sass-theming 
Comprehensive Theming
 2015-09-21 10:55:18 -04:00
Peter Fogg
0a2cfbe31c Merge pull request #9738 from edx/peter-fogg/change-studio-help-links 
Remove Tender and change Studio help links.
 2015-09-17 22:42:57 -04:00
Kevin Falcone
81abdbe81b Merge pull request #9819 from edx/release 
Release
 2015-09-17 21:30:48 -04:00
Peter Fogg
fec5129a49 Remove Tender and change Studio help links. 
TNL-2695
 2015-09-17 16:30:40 -04:00
Brian Talbot
cb921fd7ff Comprehensive Theming: setting sass !default flag on themeable LMS base variables 2015-09-17 15:40:33 -04:00
Brian Talbot
b815a86e8a Comprehensive Theming: re-organizing/minor simplifying of existing LMS Sass variables 2015-09-17 15:40:32 -04:00
Ned Batchelder
c0856232e1 Use sass interpolation instead of concatenation for -path 2015-09-17 15:39:04 -04:00
Ned Batchelder
5d64f9a80b Minor changes, responding to pull request comments 2015-09-17 15:39:03 -04:00
David Baumgold
6ebf2515f4 Comprehensive theming 
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
 2015-09-17 15:39:03 -04:00
Clinton Blackburn
d0536c50a5 Updated credit provider logo styling on receipt page 
ECOM-2172
 2015-09-16 21:36:19 -04:00
Clinton Blackburn
12a4e85d94 Fixed payment page bug 
Using SKU to choose course mode when creating an order.

ECOM-2172
 2015-09-16 21:36:19 -04:00
John Eskew
6b12ec97cc Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 16:23:52 -04:00
John Eskew
7c0663f25e Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 15:58:08 -04:00
Clinton Blackburn
011062e570 hotfix/2015-09-16-2: Credit Fixes 
- Updated checkout page to disallow purchase of credit seats (the credit payment page is hosted in ecommerce)
- Corrected path to providers endpoint
- Cleaned receipt page styling
- Updated receipt page copy
- Added provider thumbnail to receipt page

ECOM-2172
 2015-09-16 14:26:59 -04:00
Eric Fischer
c82e928bd6 Merge pull request #9749 from edx/efischer/teams-iesearch-clear 
Removing extraneous IE search clear button
 2015-09-15 11:04:14 -04:00
Bill DeRusha
f3f7ef5a6d Merge pull request #9750 from edx/bderusha/align-team-links 
Right align text above action buttons
 2015-09-14 16:47:05 -04:00
Eric Fischer
8285c9d829 Removing extraneous IE search clear button 
Taken from http://stackoverflow.com/questions/14007655/remove-ie10s-clear-field-x-button-on-certain-inputs.
Not yet tested, but will be soon.
 2015-09-14 15:32:44 -04:00
David Baumgold
1c21a0d250 Remove trailing whitespace from Sass files 2015-09-14 15:17:10 -04:00
Bill DeRusha
21b143e40a Right align text above action buttons 
TNL-3234
 2015-09-14 15:10:52 -04:00
Frances Botsford
77384f1a75 update styling for tabs as buttons 2015-09-14 14:34:10 -04:00
Daniel Friedman
e7bfd2d62e Make tabbed view accessible 
TNL-3150
 2015-09-14 14:34:05 -04:00
Eric Fischer
abb44ce61e Fixing bad button style 
Removing unneeded styling on confirmation button; making the
appearance and hover/focus behavior of the button match that
of the confirmation dialog in studio.

TNL-3189
 2015-09-14 12:56:47 -04:00
Eric Fischer
4fe575d8c5 Fixing bad button style 
Removing unneeded styling on confirmation button; making the
appearance and hover/focus behavior of the button match that
of the confirmation dialog in studio.

TNL-3189
 2015-09-14 12:32:44 -04:00
Muhammad Shoaib
e6d8841bac Merge pull request #9678 from edx/muhhshoaib/css-issue-for-allowances-in-instructor-dashboard 
fixed the allowances table css issue in instructor dashboard
 2015-09-14 19:15:22 +05:00
Peter Fogg
0612e914dc Various accessibility fixes for Teams. 
Update teams breadcrumb aria-label, make team membership display as a
<ul>, fix contrast issues, and remove an extraneous angle bracket.
 2015-09-11 15:25:30 -04:00
chrisndodge
987808261d Merge pull request #9699 from edx/cdodge/0.9-proctoring 
update edx-proctoring to 0.9.x
 2015-09-11 12:29:07 -04:00
Chris Dodge
68ee28f8b0 update edx-proctoring to 0.9.x 2015-09-11 10:00:05 -04:00
Eric Fischer
17e6453546 Merge pull request #9520 from edx/efischer/teams-instructor-toolbar 
Teams Instructor Tools bar
 2015-09-10 17:24:39 -04:00
Eric Fischer
6edadc2acc Developer-quality css 
Adding my humble attempts at making the tools match the wireframes
given in invision. Only done via changes in _developer.scss, the
real rules will be made by UX team elsewhere.

Includes preliminary accessibility feedback, and basic RTL.
 2015-09-10 16:37:03 -04:00
cahrens
3662fbc133 Edit Membership functionality and tests 
TNL-1913
 2015-09-10 16:36:55 -04:00
Andy Armstrong
55b2ea374f Merge pull request #9684 from edx/andya/fix-teams-i18n 
Fix i18n for last activity date on team cards
 2015-09-10 16:27:00 -04:00
clrux
f8bbbc8729 Merge pull request #9698 from edx/clrux/lms-global-sr-contrast 
LMS: setting fore/background colors for all sr elements
 2015-09-10 14:32:04 -04:00
Chris Rodriguez
e2bffc793d LMS: setting fore/background colors for all sr elements 2015-09-10 13:40:15 -04:00
Peter Fogg
0c3be8e121 Delete Team functionality and tests 
TNL-3164 TNL-3163
 2015-09-10 12:42:33 -04:00
Daniel Friedman
d1d44e7bd0 Merge pull request #9611 from edx/dan-f/add-team-page-viewed-events 
Add page viewed events to teams app.
 2015-09-10 10:37:59 -04:00
Chris Rodriguez
16ae0df38d LMS: updating hover colors for visited links 2015-09-10 08:05:18 -04:00
Daniel Friedman
3b957a7ee9 Add page viewed events to teams app. 
TNL-3188
 2015-09-09 23:04:44 -04:00
Andy Armstrong
6817e89f4a Fix i18n for last activity date on team cards 2015-09-09 17:59:25 -04:00
Muhammad Shoaib
2ee10a6c1d fixed the allowances table css issue in instructor dashboard 2015-09-09 19:22:41 +05:00
Zubair Afzal
dae0285af8 Merge pull request #9473 from edx/zub/story/ecom-2044-login-registration-requirejs 
use the standard syntax to load JavaScript dependencies on logistrati…
 2015-09-08 17:30:33 +05:00
Muhammad Shoaib
f495c135d6 Merge pull request #9458 from edx/muhhshoaib/PHX-update-dialog-box-css 
PHX-120
 2015-09-08 12:41:12 +05:00
zubair-arbi
d2a4790855 use the standard syntax to load JavaScript dependencies on logistration js files 
ECOM-2044
 2015-09-07 18:19:56 +05:00
Calen Pennington
7c62d09eba Merge pull request #8930 from ubc/wmono/lti-sso 
Feature: LTI third-party-auth providers
 2015-09-04 10:40:55 -04:00
Muhammad Shoaib
4427e0e2ec PHX-120 
added the css for the update dialog box for the taking exams as open exam

added the css styling of the buttons to match the pattern library button sass

added the feedback changes

updated the code
 2015-09-04 18:32:25 +05:00
William Ono
4d1194800e Support LTI third-party-auth providers 
PR #8930
 2015-09-03 22:53:45 -07:00
Calen Pennington
821cc59415 Merge master into release-2015-09-02, leaving conflicts 2015-09-03 16:36:56 -04:00
Daniel Friedman
210edb0122 Merge pull request #9546 from edx/dan-f/add-profile-images-to-team-card 
Add membership thumbnails to team cards
 2015-09-03 13:15:28 -04:00
Chris Rodriguez
1c29763441 Overriding white color for messages on dashboard 2015-09-03 11:57:29 -04:00
Frances Botsford
dd78e27155 adjusting team card profile pic styles 2015-09-03 10:58:58 -04:00
Muhammad Shoaib
42181aeafd Merge pull request #9595 from edx/muhhshoaib/MAYN-122-Enrollment-Codes-popup-is-not-completely-visible 
MAYN-122
 2015-09-03 18:56:32 +05:00