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

921 Commits

Author SHA1 Message Date
Mike OConnell
2271f3112e Merge pull request #24347 from edx/moco/ENT-3049-2 
Check current enterprise for consent
 2020-06-29 14:14:19 -04:00
Mike O'Connell
d191b52ee9 Check current enterprise for consent 
When checking if consent is needed, ignore any enterprise
learner details that are not for the learner's currently
active enterprise.

ENT-3049
 2020-06-29 12:57:03 -04:00
Michael Terry
3030efec78 AA-177: Add masquerading for course home MFE 
- Looks at masquerading config for dates, outline, metadata, and
  celebration APIs in course_home_api / courseware_api.
- Consolidates and cleans up places we check whether masquerading
  gives us full access to a course.
 2020-06-29 12:37:47 -04:00
Aarif
9e34cb3df9 Removed deprecated future imports (#24295) 2020-06-28 23:40:03 +05:00
muhammad-ammar
4a3eb16296 override enrollment attributes for learners 
ENT-2998
 2020-06-24 21:37:24 +05:00
Nick
e8fc653c86 Merge pull request #24285 from edx/ndalfonso/AA-142-calendar-sync-ses 
AA-142 calendar sync ses
 2020-06-23 13:52:42 -04:00
Nicholas D'Alfonso
5b1d181491 AA-142 calendar sync ses 
- set up util function to use Amazon SES for sending calendar
  sync emails.
- remove old sailthru code which we originally implemented for
  this functionality
- include ADR on our decision to use SES instead of Sailthru.
 2020-06-23 12:14:03 -04:00
Aarif
27480cdd2f Removed deprecated future imports 2020-06-23 18:51:43 +05:00
Manjinder Singh
566765f919 Removing flaky test (#24262) 2020-06-19 12:13:52 -04:00
Adam Butterworth
c37f73c40e Merge pull request #24158 from eduNEXT/lmm/course_sock_standalone 
[BD-10] Remove unused course sock URL.
 2020-06-18 09:16:26 -04:00
Adam Butterworth
4ebe6a8458 Merge pull request #24111 from eduNEXT/ama/DEPR-79 
[BD-10] [DEPR-79] Remove pattern library of mobile/course-dates-fragment.html
 2020-06-18 09:15:43 -04:00
Adam Butterworth
98dd03a638 Merge pull request #24077 from eduNEXT/ama/DEPR-78/DEPR-82 
[BD-10] [DEPR-78][DEPR-82] Remove pattern library of latest-update-fragment.html and welcome-message-fragment.html
 2020-06-18 09:15:20 -04:00
Adam Butterworth
0768acbf40 Remove pattern library of course_experience/course-outline-fragment.html (#24044) 2020-06-18 09:14:38 -04:00
Ali Akbar
edd9b02d52 Merge pull request #180 from edx/sustaining-xsslint-security-fixes 
Sustaining xsslint security fixes
 2020-06-18 11:32:39 +05:00
morenol
41543edd93 Remove course_experience.use_bootstrap waffle flag (#24028) 
[BD-10] [DEPR-83]
 2020-06-17 13:26:51 -04:00
Nick
badf3281b3 Merge pull request #24122 from edx/ndalfonso/AA-133-mfe-dates-banner 
AA-133 mfe dates banner
 2020-06-15 15:08:02 -04:00
Nicholas D'Alfonso
9a83d0781b AA-133 mfe dates banner 
- add serializer mixin to expose date banner info
- add endpoint to reset deadlines for a sepcific course
 2020-06-15 14:22:23 -04:00
Calen Pennington
86e2677f26 Use a standard function to find out if a course has ended 2020-06-11 11:40:56 -04:00
Calen Pennington
1cf46e76d0 Don't compare None to a date when a course doesn't have an end date 2020-06-11 11:40:56 -04:00
Calen Pennington
333c9ccddf Simplify how the course-outline template context is constructed to bring it into parity with other template contexts 2020-06-11 11:40:56 -04:00
Calen Pennington
2b2a6cca23 Never show the dates banner on archived courses 2020-06-11 11:13:55 -04:00
Calen Pennington
c6695e0b6f Only actually reset user schedule if they have missed deadlines and not missed any gated content deadlines 2020-06-10 15:18:53 -04:00
Calen Pennington
15df17034a Only prompt the user to upgrade if they have missed the deadline of gated graded content 2020-06-10 15:18:53 -04:00
Daniel Francis
4dc3251af5 render_to_response deprecated in Django 3 (#24141) 
Fixing RemovedInDjango30Warnings

**Background:** The `django.shortcuts` method `render_to_response` became deprecated in [Django 1.3](https://docs.djangoproject.com/en/3.0/releases/1.3/), when  `render` was introduced.

Per the documentation:

> render() is the same as a call to render_to_response() with a context_instance argument that forces the use of a RequestContext.

Both return an `HttpResponse` object.

**Context:** We changed two statements: An import line and the call to the method, adding explicit parameter names to improve readability.

**Before:**
```
from django.shortcuts import get_object_or_404, render_to_response
...
return render_to_response("teams/teams.html", context)


```

**After**
```
from django.shortcuts import get_object_or_404, render
...
return render(
            request=request,
            template_name="teams/teams.html",
            context=context
        )

```
 2020-06-10 14:25:04 -04:00
Luis Moreno
070eb3807d Remove unused URL. 2020-06-10 13:59:21 -04:00
SaadYousaf
2339fa4f6d PROD-1570 2020-06-10 21:07:10 +05:00
Ali-D-Akbar
c9e24e9a1d PROD-1572 2020-06-10 15:05:28 +05:00
Ali-D-Akbar
c2832dfb61 PROD-1571 2020-06-10 15:04:45 +05:00
Carla Duarte
d9b0f7483c Merge pull request #24130 from edx/ciduarte/AA-173 
AA-173: Assignment Type on Dates Page
 2020-06-08 11:11:06 -04:00
Carla Duarte
01b693a5c3 AA-173: Assignment Type on Dates Page 
Appending the assignment type to each graded
assignment on the Dates Tab. Exposed the 'format'
field, which corresponds to the graded assignment type.
 2020-06-08 10:27:50 -04:00
Dillon Dumesnil
304b000b1b Merge pull request #24134 from edx/ddumesnil/dates-widget-enhancement-AA-103 
AA-103: Dates widget enhancements
 2020-06-08 06:21:44 -07:00
Aura Milena Alba
b7a838c34b Remove pattern library of course_experience/course-updates-fragment.html. (#24062) 2020-06-05 09:54:03 -04:00
Dillon Dumesnil
f32c51383b AA-103: Dates widget enhancements 
Reducing dates widget to one assignment. Adding link to dates
page in the dates widget
 2020-06-04 12:48:00 -06:00
Calen Pennington
75a39451b1 Only mark a section as containing gated content if the content is *only* available to full-access learners 2020-06-03 15:08:49 -04:00
Calen Pennington
d3b11ec25b Refactor dates_banner_should_display to only return a single value, and to have a clearer set of conditions 2020-06-03 10:14:11 -04:00
Calen Pennington
f9cfbd8593 Revert "Merge pull request #24131 from edx/revert-24085-use-content-type-gating-in-dates-banner" 
This reverts commit c3ec8b837a, reversing
changes made to 4252b14927.
 2020-06-03 09:57:22 -04:00
Calen Pennington
561cdab7dd Revert "Use content type gating in dates banner" 2020-06-03 09:52:24 -04:00
Calen Pennington
4252b14927 Merge pull request #24085 from cpennington/use-content-type-gating-in-dates-banner 
Use content type gating in dates banner
 2020-06-03 09:50:09 -04:00
Calen Pennington
7c4585ebfe Only prompt to upgrade in order to completed graded content (or shift dates) when content_type_gating is enabled 2020-06-02 14:23:28 -04:00
Jason Myatt
4d01a736d2 Check for none on subsection due date 2020-06-02 11:29:09 -04:00
Michael Terry
03860c7359 AA-76: Add is_allowed property to DatesSummary 
This takes over some of the logic in the is_enabled property which
previously checked two things: (1) is the date time-sensitive and
(2) is the date even applicable to this course.

Now, is_enabled is only responsible for time-sensitive checks and
the new is_allowed property checks applicability.

In this way, we can more cleanly separate whether a date block
should show up on the dates sidebar (is_enabled and is_allowed)
and the dates tab (is_allowed).
 2020-06-02 09:26:24 -04:00
Aura M. Alba
941a93f531 Remove pattern library of course_experience/course-outline-fragment.html 2020-06-01 18:45:45 -05:00
Calen Pennington
6f568d097c Set missed_deadlines in the course outlines template to simplify the logic in the dates_banner.html 2020-06-01 15:48:40 -04:00
Aura M. Alba
2a79db8dce Remove pattern library of mobile/course-dates-fragment.html 2020-06-01 12:02:42 -05:00
Aura M. Alba
0ad20bd5b9 Remove pattern library of course_experience/latest-update-fragment.html 2020-05-29 11:52:44 -05:00
Hasnain Naveed
1712ad7a11 Merge pull request #24033 from edx/hasnain-naveed/ENT-2818 
ENT-2818 | Added enterprise slug login's url on edx login page.
 2020-05-28 21:07:48 +05:00
Calen Pennington
0c7947c8a2 Pass whether content type gating is enabled for the current user into the dates_banner template 2020-05-28 11:34:05 -04:00
julianajlk
902f8646ea Update FPD holdback function call order (#24074) 
REV-1153
 2020-05-28 11:13:11 -04:00
hasnain.naveed
c51dc9db20 ENT-2818 | Added enterprise slug login's url on edx login page. 2020-05-28 19:58:46 +05:00
Calen Pennington
34c03bf14a Fix some accidental tuples in the variables passed to the dates_banner 2020-05-27 11:24:10 -04:00