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

4789 Commits

Author SHA1 Message Date
ayub-khan
0ba3d602a1 -updated js translations 2018-07-02 11:33:58 +05: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
Alessandro Roux
32649f91d5 Merge pull request #18440 from edx/roux/multiple-toolbars 
EDUCATOR-3042: Fixes bug where inline discussion's comment editor has multiple toolbars.
 2018-06-25 09:49:30 -04:00
sandroroux
92bd1648ee Fixes EDUCATOR-3042. 2018-06-22 16:41:33 -04:00
Usman Khalid
8b1aad080a Add complete on view support to render_xblock view. 2018-06-22 14:46:03 -04:00
ayub-khan
17e78d85c1 -updated-translations 2018-06-20 21:32:16 +05: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
Calen Pennington
9a70ca78a5 Merge pull request #18340 from cpennington/fix-studio-xblock-rendering 
Fix studio xblock failing renders (due to asset hashing loop)
 2018-06-13 15:58:34 -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
sanfordstudent
3c0e2f36e7 Revert "OAuth2 API to call XBlock handlers" 2018-06-06 16:09:31 -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
Chandrakant Gopalan
a3df96bf1c OAuth2 API to call XBlock handlers 2018-06-05 15:12:31 -04:00
uzairr
b7c73d1a32 Extract course run with highest grades. 
if a learner has completed multiple course runs
of each course then they want to see course runs
with highest grades on associated programs.

LEARNER-4351
 2018-06-05 14:10:09 +05:00
Cole Rogers
623cb0d6ae Removed GDPR flag and its functionality 2018-06-04 10:25:37 -04:00
Zia Fazal
66c7159cf6 Merge pull request #17362 from caesar2164/allow-about-sidebar-content-from-instructor 
Add custom HTML to Course About page sidebar
 2018-06-04 09:41:52 +05:00
Marco Morales
3f70a07527 Merge pull request #18189 from caesar2164/center-password-reset-upstream 
Centers all login-register forms
 2018-06-01 16:28:48 -04:00
Giulio Gratta
56ac149962 Add custom HTML to Course About page sidebar 
This allows course staff to add arbitrary HTML to the sidebar on the About page.

A waffle switch has been added in the course_experience app to allow enabling and disabling of this feature.
 2018-06-01 14:26:05 -04:00
Diana Huang
65f0f6809d Add a configuration option for deleting student accounts. 2018-05-31 14:29:00 -04:00
Waheed Ahmed
e7963a5b40 Pass program UUID as resource_id to generate unique cache key. 
Without program UUID cache key was same every time for single learner
on multiple programs and getting the same data from cache.

LEARNER-5373
 2018-05-30 16:20:45 +05:00
Calen Pennington
0f7e2373d0 Revert "Switch container factory to webpack" 2018-05-29 16:01:38 -04:00
Calen Pennington
6c8e0842cc Merge pull request #17509 from cpennington/switch-container-factory-to-webpack 
Switch container factory to webpack
 2018-05-29 14:27:38 -04:00
AlasdairSwan
c703682ebb LEARNER-5427 Ensure StudentAccountDeletion.jsx checks socialAccountLinks object because reunning .reduce on it 2018-05-29 12:41:15 -04:00
Calen Pennington
d08e199f79 Load XBlocks with webpack rather than RequireJS 2018-05-29 12:19:05 -04:00
Diana Huang
3b40787628 Merge pull request #18221 from edx/diana/activation-message 
LEARNER-5283: Display error message if account is inactive.
 2018-05-18 14:59:22 -04:00
Jillian Vogel
35d75daf00 Quality fix 2018-05-18 10:44:46 +09:30
Jillian Vogel
306b49c36d Adds EMPTY_DASHBOARD_MESSAGE Site Configuration flag 
When set, displays the configured text/markup under "You are not enrolled in any courses yet."

Adjusts left/right padding on .empty-dashboard-message to keep our extra message from hitting the sides.

(cherry picked from commit e417c5f8c2)
 2018-05-18 09:33:09 +09:30
Michael Youngstrom
e8f6d20119 Revert "Learner Dashboard improvements to assist with the Account Activation process" 2018-05-17 14:55:35 -04:00
Albert (AJ) St. Aubin
1bb20d2922 Merge pull request #15464 from open-craft/jill/empty-dashboard-message 
Learner Dashboard improvements to assist with the Account Activation process
 2018-05-17 12:45:02 -04:00
Diana Huang
44dc169eca Display error message if account is inactive. 2018-05-17 11:47:37 -04:00
Diana Huang
e8604ac3bd Merge pull request #18202 from edx/diana/deletion-oauth 
LEARNER-5039: Add a warning message when there are social auth links connected.
 2018-05-16 12:06:27 -04:00
Diana Huang
b2c9b50de1 Add a warning message when there are social auth links connected. 2018-05-16 10:59:33 -04:00
jaebradley
4045eee57d Remove cookies when retiring user 2018-05-16 10:20:32 -04:00
AlasdairSwan
5f821ef6d7 LEARNER-5273 Update how the mobile menu interacts with the cookie policy banner 2018-05-15 11:11:44 -04:00
Giulio Gratta
b1eda59c4f Centers all login-register forms 
this is especially necessary for password-reset forms
 2018-05-11 14:58:29 -07:00
Michael Terry
6833823ccc Update student records buttons 
Updates the look and feel of the two (experimental and disabled by
default) links to student records.

Also converts the 'student_records' waffle switch to a waffle flag
named 'credentials.student_records.

LEARNER-5246
 2018-05-11 16:38:16 -04:00
jaebradley
eba6b8cff0 fix ie11 account deletion 2018-05-11 12:32:22 -04:00
McKenzie Welter
5c4c86afce swap page names for entitlement session analytics 2018-05-03 13:43:52 -04:00
McKenzie Welter
229e1c96d4 emit ga events for user entitlement session actions 2018-05-03 09:49:01 -04:00
jaebradley
22cd505d42 LEARNER-4717 Have delete account modal button make request to deactivation endpoint 2018-05-02 07:50:38 -04:00
Michael Terry
502287b07e Add some links to student records 
Add some waffle-guarded connection points to the Credentials service
to start filling out the user flow for Student Records.

Specifically, add a button to the Program Progress Details page if
a certificate exists, and add a link in the Learner Profile page.

Both only appear if the 'student_records' waffle switch is active.

LEARNER-4701
 2018-04-27 09:52:01 -04:00
Michael LoTurco
62ae6d4555 retrap focus for seat unenroll survey a11y 
learner-4715
 2018-04-25 14:51:35 -04:00
AlasdairSwan
bfda33da5d LEARNER-4880 added confirmation modal for account deletion 2018-04-24 15:22:00 -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
Attiya Ishaque
44ccd84c7a Merge pull request #17975 from edx/ai/EDUCATOR-2719-button-styling 
Fix styling of button on certificate & membership page.
 2018-04-18 17:32:59 +05:00
jaebradley
fab388ad6b add cookie policy banner with feature flag 2018-04-17 16:48:52 -04:00
attiyaishaque
9dc01647e8 Fix styling of button on certificate & membership page. 2018-04-17 12:21:09 +05:00
Simon Chen
c02c1d5177 Merge pull request #17902 from edx/rm-new-course-outline-waffle 
EDUCATOR 2283 - Removes the new course outline waffle flag.
 2018-04-14 15:07:00 -04:00
Michael Terry
a34c8c8233 Drop remaining coffee use 
This basically commits the transpiled CoffeeScript JS (with minor
cleanup) and removes coffee build support.

A tiny amount of support for xblocks exists, because external users
may have xblocks with coffee. But no coffee in our tree anyway.
 2018-04-13 14:10:40 -04:00
Michael Terry
2abbd1eb83 Move all our coffee files 
This moves the original files into their JS locations so that when
the next commit modifies them, we dont lose history.
 2018-04-13 14:10:40 -04:00