Commit Graph

6333 Commits

Author SHA1 Message Date
Calen Pennington
b85d6f031c Merge pull request #18417 from cpennington/cale/fix-ora-webpack
Cale/fix ora webpack
2018-06-28 12:47:53 -04:00
Douglas Hall
2a77710e10 Merge pull request #18429 from edx/douglashall/oauth_scopes_part2
ARCH-116 OAuth2 Scopes Implementation
2018-06-28 11:17:17 -04:00
Douglas Hall
db22939193 Add OAuth2 Scopes and Filters to JWTs. 2018-06-28 10:30:09 -04:00
Ned Batchelder
8631b23a86 Merge pull request #18444 from edx/nedbat/restore-context-help
Use context help in the LMS for Open edX
2018-06-27 22:35:07 -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
Feanil Patel
4e76a5d025 Merge pull request #18462 from edx/feanil/remove_beacon
Get rid of all code related to the CDN Experiments.
2018-06-26 10:47:38 -04:00
Feanil Patel
cd47b28339 Get rid of all code related to the CDN Experiments.
These were very early experiments by the old performance team
on using CDNs for videos and logging performance data.  No one
is looking at this data and it's just extra cruft on every page.
2018-06-25 18:03:33 -04:00
Matt Tuchfarber
aab971ed7e Merge pull request #18419 from edx/tuchfarber/fix_program_course_order
Change program's course runs to be oldest with open enrollment
2018-06-25 15:37:04 -04:00
Usman Khalid
8b1aad080a Add complete on view support to render_xblock view. 2018-06-22 14:46:03 -04:00
Matthew Piatetsky
95ccc30594 add forum roles to metadata 2018-06-22 12:49:10 -04:00
Ned Batchelder
a570eb500b Use context help in the LMS for Open edX 2018-06-22 11:10:57 -04:00
Matt Tuchfarber
1eb4d21350 Change program's course runs to be oldest with open enrollment
Currently the program page shows the newest course run, but
in cases where there is a new run created prior to the old one closing,
we want to show the almost closing one instead.
2018-06-20 13:28:01 -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
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
b9a72a4dc9 Remove hard-coded codemirror script tags from LMS XBlock pages 2018-06-06 12:52:12 -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
Cole Rogers
623cb0d6ae Removed GDPR flag and its functionality 2018-06-04 10:25:37 -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
Matthew Piatetsky
8f5aeb5151 add email to metadata 2018-05-30 10:21:42 -04:00
Zia Fazal
90633c0956 Merge pull request #17974 from edx/ziafazal/WL-1239
WL-1239: Ability to gate section based on completion percentage
2018-05-30 12:52:43 +05:00
Zia Fazal
53cf5638b6 added radio input fields to pre-requisite selection
Initial changes to gate section based on completion percentage

code refactoring and added evaluation of completion milestone

Fixed broken unit tests and added new tests

Fixed broken tests and quality violations

Fixed Pep8 violation

Fixed eslint quality violations

Test changes as suggested by reviewer

changes after feedbacy from reviewer

Update the docstring with suggested changes

excluding chapter from the blocks

Disallow empty values for min score and min completion

Changes afte feedback from UX/Accessibility

removed blank line
2018-05-30 11:25:59 +05:00
Calen Pennington
0f7e2373d0 Revert "Switch container factory to webpack" 2018-05-29 16:01:38 -04:00
Calen Pennington
d4bb203308 Log javascript errors during bok_choy tests 2018-05-29 12:21:47 -04:00
Calen Pennington
d08e199f79 Load XBlocks with webpack rather than RequireJS 2018-05-29 12:19:05 -04:00
irfanuddinahmad
7812185d8a fixed typos 2018-05-22 15:23:39 +05:00
irfanuddinahmad
2cd1b9d792 Merge pull request #18234 from edx/iahmad/ENT-988-Update-API-Terms-of-Service
ENT-988 Update API Terms of Service
2018-05-22 14:08:46 +05:00
Gabe Mulley
959ddaa98d Merge pull request #18181 from edx/mulby/ace-password-reset
Use edx-ace for password reset emails
2018-05-21 11:42:56 -04:00
Omar Al-Ithawi
73af914cfc Use edx-ace for password reset email 2018-05-21 09:49:14 -04:00
Tasawer Nawaz
b21fec305a fix TypeError: cannot concatenate 'str' and 'NoneType' objects
LEARNER-5369
2018-05-21 17:35:54 +05:00
irfanuddinahmad
741f75d7fe updated TOS 2018-05-21 15:00:57 +05: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
37ed10103c Shows the account activation message in the main content area
if HIDE_DASHBOARD_COURSES_UNTIL_ACTIVATED is enabled.

(cherry picked from commit 761acdfc6d)
2018-05-18 09:33:16 +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
Jillian Vogel
d489ffe7ad Adds HIDE_DASHBOARD_COURSES_UNTIL_ACTIVATED
Site Configuration and feature flag

When set, it hides the Courses list on the Learner Dashboard page if the
learner has not yet activated their account.

(cherry picked from commit 22ee400b15)
2018-05-18 09:33:02 +09:30
Jillian Vogel
d585294f50 Shows the account activation message in the sidebar
and removes the DISPLAY_ACCOUNT_ACTIVATION_MESSAGE_ON_SIDEBAR flag, since this
feature is now always on.

Marks the top banner as deprecated.

(cherry picked from commit b44114d171)
2018-05-18 09:32:54 +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
Matt Tuchfarber
20fdcc8d77 Fix program marketing to use newest course run 2018-05-15 10:36:54 -04:00
Régis Behmo
52c15d4637 Fix disabled login/register buttons after failed attempt
In the login window, when the user enter a wrong email or password, the
"Log into my ... account" button used to remain disabled, which was very
confusing for users.

Steps to reproduce:
- Go to /login
- Type wrong email/password combination
- Press "Log into..." button

Similarly, users could not click the "register button after a failed
register attempt. For example, this occurred to users with an invalid
email address, such as "fooatgmaildotcom".
2018-05-14 08:55:56 -04: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
Matthew Piatetsky
b96037f35e Merge pull request #18178 from edx/mark_units_graded
mark units as graded if subsection is graded
2018-05-11 16:04:44 -04:00
Matthew Piatetsky
a394f23c12 mark units as graded if subsection is graded 2018-05-10 13:32:53 -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