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
AlasdairSwan
7bca66c23e Merge pull request #12408 from edx/alasdair/ECOM-4215-program-details-page-setup 
ECOM-4215 adding setup for new program details page
 2016-05-12 18:25:13 -04:00
AlasdairSwan
bc5daffc96 ECOM-4215 adding setup for new program details page 2016-05-12 16:39:23 -04:00
Robert Raposa
2089728703 Safe template marathon work 2016-05-12 14:23:35 -04:00
Bill DeRusha
25a7d60aed Merge pull request #12448 from edx/bderusha/st-wiki-2 
Safe Templatize: wiki templates
 2016-05-12 14:19:02 -04:00
Bill DeRusha
98254e5cec Safe templatize: choose.html 2016-05-12 11:29:20 -04:00
Bill DeRusha
970fd6db1d Safe Templatize: wiki templates 2016-05-12 11:27:16 -04:00
Matt Drayer
a9b7e4c63d mattdrayer/course-mode-bulk-sku: Add new CourseMode field 
* mattdrayer: Add bulk checkout link to course views
* asadiqbal08: MAYN-225 replace the "Verify Now" button by the "Go to Dashboard" button in case of themed sites.
* mattdrayer: Add bulk_sku check in courseware.views
 2016-05-11 10:57:24 -04:00
Robert Raposa
80c3f84262 Fix safe template issues for 0 violations for some rules 2016-05-10 15:35:57 -04:00
cahrens
a49cdc7a1a These old discussion templates are not referenced in the codebase. 2016-05-10 10:46:59 -04:00
tasawernawaz
6404150365 Merge pull request #12403 from edx/tasawer/story/ecom-3729-update-verification-status-area 
Update student verification area
 2016-05-10 18:00:50 +05:00
Tasawer
03e241ecc4 Update student verification area 
ECOM-3729
 2016-05-10 09:11:51 +00:00
attiyaishaque
dbad1881d2 Screenreader added to the button "Upgrade to Verified" and "View Xseries Details" in LMS Dashboard. 2016-05-10 12:42:12 +05:00
AlasdairSwan
2fe52df720 UPdated a11y approach for program card progress bars 2016-05-09 13:52:55 -04:00
Chris Rodriguez
96ca09f45c Membership page label additions and fixes 2016-05-09 12:32:46 -04:00
Chris Rodriguez
cb19cdd256 AC-405 calculator image to icon 2016-05-06 12:48:44 -04:00
Kevin Falcone
61ef49b94c Merge pull request #11922 from edx/jibsheet/html-escape-activation 
Enable safe by default in the activation flow
 2016-05-05 20:52:58 -04:00
Kevin Falcone
15e8829308 Enable safe by default in the activation flow 
The largest changes here were around HTML escaping in the translations.
 2016-05-05 16:39:17 -04:00
sanfordstudent
db52e0334f Merge pull request #12333 from edx/sstudent/MA-2252 
Sstudent/ma 2252
 2016-05-05 12:52:09 -04:00
Sanford Student
d4146e7a1d accordion emits event 2016-05-05 11:48:09 -04:00
Peter Fogg
4a417f2832 Merge pull request #12372 from edx/feature/catalog-admin 
Merge catalog admin into master.
 2016-05-05 10:29:13 -04:00
Clinton Blackburn
868d962002 Merge branch 'release' into release-2016-05-03-conflict 2016-05-04 20:01:29 -04:00
AlasdairSwan
816882a130 Merge pull request #12358 from edx/alasdair/ECOM-4338-program-progress-a11y-update 
Alasdair/ecom 4338 program progress a11y update
 2016-05-04 19:41:49 -04:00
AlasdairSwan
f5d2499420 UPdated a11y approach for program card progress bars 2016-05-04 15:39:05 -04:00
Ned Batchelder
16fbad3f56 Add a circle-R to the initial welcome message 2016-05-04 15:13:18 -04:00
Peter Fogg
bcde8e5588 Flesh out UI now that the backend is there. 2016-05-04 11:50:14 -04:00
Chris Rodriguez
cf0b80984b Moving main element up higher to not conflict with chart 2016-05-03 21:35:27 -04:00
Chris Rodriguez
3b81e73e2e Removing nav_skip block from template 2016-05-03 11:18:41 -04:00
AlasdairSwan
2c8f3c8046 Styled footer on pattern library pages 2016-05-03 10:32:35 -04:00
Christina Roberts
f0f0645007 Merge pull request #12278 from edx/christina/cohort-messages 
Add messaging when verified track content MVP is enabled.
 2016-05-03 10:14:15 -04:00
cahrens
0f8b24523c Remove second page tag. 2016-05-02 16:56:52 -04:00
cahrens
9b28afb7bd Add messaging when verified track content MVP is enabled. 
TNL-4393
 2016-05-02 14:25:25 -04:00
AlasdairSwan
e894797ee9 ECOM-3968 updated program card link alt text 2016-05-02 13:09:31 -04:00
muzaffaryousaf
872d225921 Replace backbone-min to actual file. 2016-05-02 13:09:27 -04:00
AlasdairSwan
70fec21347 Adding program progress bar to program cards 2016-05-02 13:09:26 -04:00
muzaffaryousaf
95952d9b21 Upgrade backbone via npm. 
TNL-4335
 2016-05-02 13:09:25 -04:00
Renzo Lucioni
a74885331b Measuring program progress 
Introduces a utility class for gauging a user's progress towards program completion. Progress data is passed to the ProgramListFactory. ECOM-3200.
 2016-05-02 13:09:24 -04:00
Chris Rodriguez
39e60a7b1a AC-400 removing tabindex from bookmark 2016-05-02 13:09:23 -04:00
Brian Jacobel
63b5fb845d Update escaping and safe-templating usage 2016-05-02 13:09:22 -04:00
Brian Jacobel
d6cee8c65f This is what this string used to look like, to gettext 2016-05-02 13:09:22 -04:00
Brian Jacobel
44bd6bab04 Fix line wrapping here 2016-05-02 13:09:21 -04:00
Brian Jacobel
ced6fb5b52 Move manual refunds page to Mako 2016-05-02 13:09:21 -04:00
Brian Jacobel
4a9960e4b0 OAuth grant screen converted to mako (3/4) 2016-05-02 13:09:21 -04:00
Brian Jacobel
8f71ed12b1 Migrate password_reset_confirm.html to Mako (2/4) 2016-05-02 13:09:21 -04:00
Brian Jacobel
400f8beb1d Convert password_reset_confirm.html to Mako 2016-05-02 13:09:21 -04:00
Brian Jacobel
5ec2957167 Remove an old i18n JS include from the wiki that did nothing 2016-05-02 13:09:20 -04:00
Brian Jacobel
5ef63e0f1e The only JS the pages using this template need is base_application 2016-05-02 13:09:20 -04:00
Brian Jacobel
0f88fd2018 Fix a usage of a Mako thing that doesn't work here 2016-05-02 13:09:20 -04:00
Brian Jacobel
51de302ca5 Fix gettext errors by including /js/i18n/LANGUAGE_CODE/djangojs.js in Django template 2016-05-02 13:09:20 -04:00
Andy Armstrong
28b0305f8b Fixes 2016-05-02 13:09:20 -04:00
AlasdairSwan
3cbb2d1a08 FEDX-118 Adding header to test page 2016-05-02 13:09:19 -04:00