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

6923 Commits

Author SHA1 Message Date
Matt Drayer
f8e1224f00 Merge pull request #9805 from edx/ziafazal/SOL-1193-escapejs 
escape string literal also
 2015-09-20 22:48:35 -04:00
Sarina Canelake
c480fb8fd5 Remove second tooltip from LMS Sequentials 2015-09-20 10:59:04 -04:00
Peter Pinch
01aea1a494 Merge pull request #9335 from mitocw/error_message_student_notfound_ccx_coach_dashboard 
Added error message in enrollment tab inside CCX coach dashboard
 2015-09-18 09:33:02 -04:00
Kevin Falcone
81abdbe81b Merge pull request #9819 from edx/release 
Release
 2015-09-17 21:30:48 -04:00
Ned Batchelder
bc13f450a7 Fix mako argument syntax 2015-09-17 15:40:33 -04:00
Ned Batchelder
1d6e91404d Rename google_analytics.html to use a hyphen instead. 2015-09-17 15:40:33 -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
Zia Fazal
14c14b07db moved SOCIAL_SHARING_SETTINGS out of FEATURES 
fixed object has no attribute 'get'

fixed 'LazySettings' object has no attribute

add social settings to cms/env/aws
 2015-09-17 19:24:09 +05:00
amir-qayyum-arbisoft
4ab368720e Added error message in enrollment tab ccx coach dashboard 2015-09-17 14:49:55 +05:00
Zia Fazal
eb33c337b5 escape string literal also 2015-09-17 12:57:36 +05: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
Matt Drayer
ac0d926492 Merge pull request #9717 from edx/ziafazal/SOL-1193 
SOL-1193: moved variables from template to view
 2015-09-16 15:06:57 -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
Zia Fazal
cf80c07c14 moved variables from template to view 
fixed broken tests and quality violations

moved twitter_url to view also

escaped string for js
 2015-09-16 20:42:04 +05:00
Ned Batchelder
764cd862bd Mako comments have to be double-hash, or they are included on the page. 2015-09-16 11:24:18 -04:00
Omar Al-Ithawi
5433856306 More descriptive dashboard title 2015-09-16 15:14:59 +03:00
Sarina Canelake
07664389b7 Fix Translator comment syntax in Mako templates [TNL-3277] 2015-09-15 21:16:16 -04:00
Daniel Friedman
e7bfd2d62e Make tabbed view accessible 
TNL-3150
 2015-09-14 14:34:05 -04:00
Chris Dodge
410d692090 fix error where users who received a no-id-professional certificate did not get a link on his/her dashboard to download the PDF 2015-09-14 11:49:35 -04:00
chrisndodge
0afa0ab764 Merge pull request #9674 from edx/muhhshoaib/PHX-141-proctoring-timer-count-down-acccessibility 
PHX-141
 2015-09-09 14:28:43 -04:00
Clinton Blackburn
b5d6b210fd Merge pull request #9681 from edx/release 
Release 2015-09-09
 2015-09-09 12:38:15 -04:00
Christine Lytwynec
8d0bc488e1 Merge pull request #9664 from edx/clytwynec/AC-166 
Remove unicode quotes in courseware html attrs
 2015-09-09 09:43:37 -04:00
Muhammad Shoaib
24195c12ea PHX-141 
added the accessibility element for timer count down
 2015-09-09 15:51:14 +05:00
Christine Lytwynec
9a45e831ac Merge pull request #9497 from edx/clytwynec/AC-155 
Add role="presentation" to .course-wrapper to prevent table
 2015-09-08 15:43:46 -04:00
Christine Lytwynec
3aff77021a Remove unicode quotes in courseware html attrs 2015-09-08 15:41:31 -04:00
chrisndodge
815a3d6cf3 Merge pull request #9646 from edx/muhhshoaib/SOL-1171-return-display-string-from-backbone-view 
SOL-1171
 2015-09-08 14:09:06 -04:00
Sarina Canelake
3015c4a51d Merge pull request #9638 from jolyonb/fixspace 
Fixing spacing in tooltip
 2015-09-08 13:00:05 -04:00
Muhammad Shoaib
1b861b9d81 SOL-1171 
passed the display string to the underscore template so that the word "proctored" is not hard coded in the underscore file.

updated the git tag for proctoring repo
 2015-09-08 11:47:33 -04: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
Zia Fazal
0adea67662 hide shopping cart menu 
Hide shopping cart menu only if request is coming from a micro site and
requested page is from courseware.
 2015-09-07 12:23:45 +05:00
Jolyon Bloomfield
8e04f92167 Fixing spacing in tooltip 2015-09-06 15:37:19 -04: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
Matt Drayer
9cc1859eed Merge pull request #9596 from edx/ziafazal/MAYN-118 
MAYN-118: load header extra file
 2015-09-04 10:37:35 -04:00
Peter Pinch
70d3868b81 Merge pull request #9475 from mitocw/fix/aq/email_ccx_non_members 
Fixed CCX display name issue in enrollment/unenrollment email templates for non EDX members
 2015-09-04 10:00:28 -04:00
Zia Fazal
6e0ef385a2 load header extra file if request comes from micro site 
use blank header_extra template instead of if statement
 2015-09-04 11:24:06 +05:00
William Ono
4d1194800e Support LTI third-party-auth providers 
PR #8930
 2015-09-03 22:53:45 -07:00
Muhammad Shoaib
3bbd021a73 MAYN-122 
added the scrolling for the registration_code_generation modal dialog box.
 2015-09-03 18:12:51 +05:00
Andy Armstrong
4be74937df Add searching to the teams view 
TNL-1935
 2015-09-02 12:26:07 -04:00
Matt Drayer
49158fe0c9 Merge pull request #9535 from edx/ziafazal/MAYN-119 
MAYN-119: Hide shopping Cart menu
 2015-09-02 10:05:47 -04:00
Zia Fazal
4b4ca54674 Hide shopping Cart menu 
Shopping Cart menu should not be visible in case of while label site.

added tests
 2015-09-02 14:55:34 +05:00
Amir Qayyum Khan
e15732114d Fixed CCX display name issue in enrollment/unenrollment email templates for non EDX members 2015-09-01 13:22:50 +05:00
frances botsford
072a66e196 Merge pull request #9468 from edx/frances/teams-padding-responsive-followup 
updated responsive body class to .is-view-in-course
 2015-08-31 21:52:01 -04:00
Sarina Canelake
25169ccc4d Merge pull request #9147 from open-craft/OC-791-answer-export 
Move problem responses export from legacy instructor dash to new instructor dash
 2015-08-31 15:12:55 -04:00
Frances Botsford
44d3cb444f updated responsive body class to .is-view-in-course 2015-08-31 14:41:46 -04:00
clrux
5b545c2b0d Revert "Course navigation menu accessibility issue" 2015-08-28 13:28:08 -04:00
clrux
52a8bc50cb Merge pull request #9367 from edx/clrux/ac-76-course-nav 
Course navigation menu accessibility issue
 2015-08-28 13:27:44 -04:00
chrisndodge
69ddbc0dc4 Merge pull request #9370 from edx/cdodge/add-course-id-to-survey-answers 
add the ability to persist the course_key where the user answered the…
 2015-08-28 13:03:58 -04:00
Chris Rodriguez
c20075e8a6 Changing all #accordion for .accordion 2015-08-28 07:50:34 -04:00