Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,542 Commits 1 Branch 0 Tags
3e87cb7c7d4a569fe2ae587bc428733ee61cd708
Commit Graph

202 Commits

Author SHA1 Message Date
Calen Pennington
969728874b Merge pull request #19065 from cpennington/access-control-messaging 
Access control messaging
 2018-10-12 11:21:34 -04:00
Calen Pennington
ae41ac446e Allow AccessResponse messages to appear on the student dashboard 2018-10-11 09:54:12 -04:00
Matthew Piatetsky
30c14b36ba bundles on track selection 2018-09-27 14:45:32 -04:00
Bill Filler
df52ff0038 Merge pull request #18395 from edx/whitelabel/journal 
Add journals support in LMS
 2018-07-23 15:10:38 -04:00
Bill Filler
c746a4e630 Add Journals support 
Enable the journal app in LMS. Add support to display Journals on index
and courseware pages and dashboard.
 2018-07-23 13:11:26 -04:00
Alessandro Roux
dcf9bb4458 Merge pull request #18480 from edx/roux/remove-discussions-workaround 
Remove copied toolbar asset from edx.org theme.
 2018-07-02 10:17:39 -04:00
sandroroux
033358bf8a Remove copied toolbar asset from edx.org theme. 2018-06-28 10:26:26 -04:00
Calen Pennington
07a15c681f Reapply the XBlock RequireJS -> Webpack changes 
This reverts commit 105db2cf59, reversing
changes made to 447457594f.
 2018-06-27 22:27:07 -04:00
ayub-khan
17e78d85c1 -updated-translations 2018-06-20 21:32:16 +05:00
Calen Pennington
105db2cf59 Merge pull request #18385 from edx/release-mergeback-to-master 
Merge release back to master
 2018-06-15 16:30:26 -04:00
Eric Fischer
e72549cdbe Revert "Merge pull request #18340 from cpennington/fix-studio-xblock-rendering" 
This reverts commit 9a70ca78a5, reversing
changes made to efd5b9abbd.

Hopefully fixes EDUCATOR-3053
 2018-06-15 13:18:27 -04:00
sandroroux
dce57edafe Make a copy of the asset under the edx.org theme 2018-06-14 17:01:39 -04:00
Calen Pennington
be3c7e05c5 Reapply "Switch container factory to webpack" 
This reverts commit 18d93b00ba.
 2018-06-07 15:52:05 -04:00
Calen Pennington
18d93b00ba Revert "Switch container factory to webpack" 2018-06-07 13:46:47 -04:00
Calen Pennington
0abe75a7c6 Re-apply the changes to convert XBlocks to Webpack 
Reapplies edx/edx-platform#17509

This reverts commit 0f7e2373d0.
 2018-06-06 12:52:12 -04:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g 
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
 2018-06-05 13:59:09 -04:00
Calen Pennington
0f7e2373d0 Revert "Switch container factory to webpack" 2018-05-29 16:01:38 -04:00
Calen Pennington
ee6360543b Convert webpackified factories to es6 modules with global exports, and remove the invoke_page_factory pattern 2018-05-29 12:21:46 -04:00
Omar Al-Ithawi
73af914cfc Use edx-ace for password reset email 2018-05-21 09:49:14 -04:00
Gabe Mulley
5fa6c51368 Revert "Use edx-ace for the password reset email" 2018-05-10 13:06:52 -04:00
Omar Al-Ithawi
556c8b86d0 Use edx-ace for password reset email 2018-05-08 18:53:31 +03:00
afzaledx
cc6c95b388 OC-3995 
Moved the ID string used in the google-site-verification meta tag to settings so that it can be overridden from site_configuration.
 2018-05-03 20:34:39 +05:00
Michael LoTurco
62ae6d4555 retrap focus for seat unenroll survey a11y 
learner-4715
 2018-04-25 14:51:35 -04:00
Michael LoTurco
919264f56d Add entitlement unenrollment survey 
Updates behavior post unenrollment, also refactors accessible_modal
to enable the unenrollment survey to remain accessible after the
content in the modal changes (to the survey).

mloturco/learner-3524
 2018-04-19 10:19:11 -04:00
jaebradley
fab388ad6b add cookie policy banner with feature flag 2018-04-17 16:48:52 -04:00
Hamza Munir
90f674e358 Footer Chinese Language Dupluication Issue 
Removed the duplicate footer ICP LICENSE.

LEARNER-4766
 2018-03-27 19:19:37 +05:00
Hamza Munir
a69ecd83d5 Footer Design Implementation without using bootstrap WIP 
The New footer design implementation without using bootstrap. Using flexbox
creating new classes to assign different widths in different screen breakpoints.

LEARNER-2312
 2018-03-23 02:37:59 +05:00
sandroroux
22b7da39b6 Add resume buttons to the edx.org dashboard. 2018-03-05 15:14:50 -05:00
Michael Terry
c9318c3e51 Convert learner_dashboard to es2015 2018-03-02 08:57:34 -05:00
Matthew Piatetsky
70ec5e47c6 limit bundling code to users with less than 4 enrollments 2018-02-16 14:24:23 -05:00
Hamza Munir
a5e0989021 Footer Bootstrap new design fixes WIP 
Fixes for new design as per instruction in this ticket.

LEARNER-3131
 2018-02-16 13:12:11 +05:00
Matthew Piatetsky
826ef28b4d handle exceptions and create the necessary html in optimizely 2018-02-08 10:25:52 -05:00
jaebradley
47b36c6acd implement portfolio project test upsell modal 
update styles

html updates

add waffle flags

fix waffle flags
 2018-02-07 07:41:33 -05:00
Robert Raposa
d6c15ffdbf Add new waffle for modals. 2018-01-30 15:27:12 -05:00
Calen Pennington
b701ad77c8 Rename require_page to invoke_page_bundle 2018-01-30 10:32:31 -05:00
Calen Pennington
5772042199 Migrate login.js to webpack 2018-01-30 10:32:31 -05:00
Calen Pennington
69348d06d7 Merge pull request #17009 from cpennington/cms-login-factory-page 
Convert cms login.html to the require_page pattern in preparation for…
 2018-01-24 10:19:27 -05:00
Tasawer Nawaz
f16cfea801 update help link in header 
LEARNER-2437
 2018-01-24 11:53:06 +05:00
Calen Pennington
974f099835 Teach the xss_linter about the require_page tag 2018-01-23 15:58:12 -05:00
Matthew Piatetsky
ba9b15e10b Add modal to track selection and dashboard 
add waffle flag
 2018-01-18 13:52:26 -05:00
Calen Pennington
58bb7167c1 Convert cms login.html to the require_page pattern in preparation for webpack 2018-01-18 13:49:44 -05:00
Jeremy Bowman
4026c25f7a Merge pull request #17133 from edx/jmbowman/PLAT-1873_2 
PLAT-1873 to_deprecated_string() cleanup part 2
 2018-01-10 13:45:15 -05:00
Harry Rein
b404173046 Show more sessions coming soon on course dashboard. 
LEARNER-3808

Ensures that users can see their entitlement purchase whether there
are available sessions or not. Notifies them with a message stating that
more sessions are coming soon, as is currently implemented on the programs
dashboard.
 2018-01-09 13:04:36 -05:00
Jeremy Bowman
669aa13ad6 PLAT-1873 to_deprecated_string() cleanup part 2 2018-01-08 17:26:55 -05:00
McKenzie Welter
a4d23eaea9 include email settings in fulfilled entitlement action items 2017-12-20 08:57:27 -05:00
Anthony Mangano
c8d0d5eb33 Merge pull request #16938 from edx/LEARNER-3633-fix-entitlement-unenrollment-modal-a11y-issues 
LEARNER-3633 fix entitlement unenrollment modal a11y issues
 2017-12-19 09:49:12 -05:00
Anthony Mangano
fdadd4cdf4 Fix a11y issues with unenroll modal 2017-12-18 16:44:09 -05:00
Michael Terry
4fe60eb1e4 Show programs for expired entitlements 
The dashboard was not showing related programs for expired but
fulfilled entitlements.

LEARNER-3608
 2017-12-18 14:41:20 -05:00
Michael Terry
e705ff09a5 Merge pull request #16924 from edx/mikix/LEARNER-3588 
Show related programs on entitlements
 2017-12-18 09:05:14 -05:00
Anthony Mangano
a6cb0fef1c add dashboard entitlement actions 2017-12-15 13:37:06 -05:00