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

4809 Commits

Author SHA1 Message Date
Brandon Baker
7a3a228c69 Add program record section to program detail sidebar 
LEARNER-5923
 2018-07-26 12:51:08 -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
attiyaishaque
e0472a7a15 Fix screen reader issue on profile page. 2018-07-19 12:49:48 +05:00
ayub-khan
3e47ade19e Updated Translations 2018-07-18 14:38:00 +05:00
Kshitij Sobti
fcff921fdb Linting fixes to improve quality report 2018-07-18 00:37:31 +05:30
Kshitij Sobti
bf6af13ed1 Add UI to browse and browse course structure and select the course/chapter/section... to generate a report of 2018-07-18 00:37:29 +05:30
lduarte1991
a9b61c06d3 Remove the annotations feature introduced by Harvard. 
There are other annotations features still in the platform but this one
is the one that works with an annotations server that was specialized
and not generally used by most instances of the platform.

The initial PR to remove this was made by 'lduarte1991' and can be found
here: https://github.com/edx/edx-platform/pull/17299

The work done based on the squashed commits:
removed advanced modules config for annotations
remove module files and config for annotations
remove js and css files related to annotations, under ova folders
removed js and css annotator file configs for cms and lms
remove template html files for annotations
removed annotations options from static html book
Added back some files that were originally marked "for OVA" but others used as per acceptance tests
Added back css file configs incorrectly marked as ova
Remove annotation related advanced settings from test.
Correct hls require.js pathing.
 2018-07-16 16:55:08 -04:00
marcotuts
6b876a573a updated vertical alignment for learner profile menu 2018-07-10 12:11:35 -04:00
ayub-khan
bab3802137 updated-translations 2018-07-10 12:56:47 +05:00
Awais Jibran
0d5c660d8a Merge pull request #18520 from edx/aj/fix-display-inline-on-course-outline 
Display check-marks inline.
 2018-07-09 22:31:16 +05:00
marcotuts
d7ab8327cb updated header active tab border color 2018-07-06 10:51:57 -04:00
Awais Jibran
41aa1fd426 Display check-marks inline. 
EDUCATOR-3149
 2018-07-05 11:32:39 +05:00
marcotuts
07718b90ab updated subsection styling to show label on same line as icon, meant to complete EDUCATOR-2535 2018-07-04 13:42:44 -04:00
Robert Raposa
df94c82a04 Merge pull request #17332 from open-craft/john/improve-search-error-messages 
Improve search error messages
 2018-07-02 16:53:20 -04:00
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
Kshitij Sobti
8f364f8139 Add tests to correct location 2018-06-14 18:59:05 +05:30
Kshitij Sobti
d45636e2e1 Update tests 2018-06-14 18:59:05 +05:30
Kshitij Sobti
e2b7d289a8 Only pass error to showErrorMessage 2018-06-14 18:59:05 +05:30
John Hensley
b31b311294 Fix xsslint complaints 2018-06-14 18:59:05 +05:30
John Hensley
1bb7db9925 Improve search error messages 
When a more specific error message is available from the search backend,
show the user that instead of a blanket "There was an error, try
searching again."

In github.com/edx/edx-search, we're proposing removing quotes from the
list of reserved characters in Elastic search terms. This enables
searching for exact phrases, but also introduces the possibility of
malformed queries. In those cases, it would be nice to give the user a
hint that they need to change their query, instead of simply trying the
same one again.
 2018-06-14 18:59:05 +05:30
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