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

3949 Commits

Author SHA1 Message Date
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
Danial Malik
c962423bbc Replace track calls with eventtracking in task_track and server_track (#24282) 
* Replace track calls with eventtracking in task_track and server_track

* Making  events compatible with events emitted via track app

* Fixed broken tests and quality violation

* Removed useless changes in shim. using  in  to have  and  keys in event context

Co-authored-by: zia.fazal@arbisoft.com <zia.fazal@arbisoft.com>
 2020-06-26 13:49:16 -04:00
Calen Pennington
d933541dad Merge pull request #24302 from cpennington/prioritize-access-denied-messages 
Prioritize access denied messages
 2020-06-25 10:15:57 -04:00
julianajlk
6dd820b6e3 Add Spanish translation to Financial Assistance form without breaking zendesk (#24309) 
REV-1204 Add translation by marking string as translatable w/o translating at runtime
 2020-06-25 08:50:23 -04:00
Calen Pennington
31cace3e11 Prioritize access denials in the courseware from groups that have messages associated with them 2020-06-23 14:25:57 -04:00
Aarif
27480cdd2f Removed deprecated future imports 2020-06-23 18:51:43 +05:00
David Ormsbee
e69a5fce56 Merge pull request #24220 from open-craft/samuel/fix-youtube-metadata-api 
SE-2634 Fix crashes in yt_video_metadata
 2020-06-19 12:24:28 -04:00
Dillon Dumesnil
a1e0dcc495 Merge pull request #24241 from edx/ddumesnil/AA-194 
AA-194: Updating edx-when version
 2020-06-19 07:48:47 -07:00
Dillon Dumesnil
1f035ab420 AA-194: Updating edx-when version 
Updating edx-when version to pull in a change related to not
returning dates if the enrollment happened after course end
(if no enrollment end date is set)
 2020-06-19 07:28:12 -07:00
Leonardo Martinez
b4fee68283 Fix the DeprecationWarning for unescape (#23936) 
This PR solves the DeprecationWarning mentioned in:
https://build.testeng.edx.org/job/edx-platform-python-pipeline-master/warning_5freport_5fall_2ehtml/

HTMLParser was renamed in html.parser in Python3:
https://docs.python.org/2/library/htmlparser.html#module-HTMLParser

* html_parser.HTMLParser().unescape from six.moves has been deprecated

* instead use html.unescape from Python3

Documentation for unescape in Python3:
https://docs.python.org/3/library/html.html#html.unescape

- html_parser from six.moves has been deprecated

- instead use html.parser from Python3

- Order imports using isort

- Delete unused import crum
 2020-06-19 09:27:45 -04:00
stvn
2f7372202b Update masquerade API to show only active partitions 2020-06-18 14:54:50 -07:00
stvn
994b2b002f Add explicit masquerade support to courseware API 2020-06-18 14:54:49 -07:00
Samuel Walladge
4da0c64cc3 Fix crashes in yt_video_metadata 
- yt_video_metadata returned a generic non-json-api-friendly 500 error
  when called on a non-youtube video
- load_metadata_from_youtube was crashing when called from the xblock
  yt_video_metadata endpoint. It passes a webob request, which has a
  different api for retrieving the http referer.
 2020-06-15 17:29:57 +09:30
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
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
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
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
b37be506fe Use content_type_gating to determine whether a learner has access to content on the dates page 2020-06-03 15:08:49 -04:00
stvn
9dd97a5c64 Merge PR #24020 add/staff-toolbar-links 
* Commits:
  Remove 'View In Studio' link from vertical
  Add Studio and Insights buttons to Instructor Toolbar
 2020-06-03 09:38:32 -07: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
stvn
4490e4ca2b Remove 'View In Studio' link from vertical 
in favor of display in the Staff Instructor Toolbar.
 2020-06-02 16:00:33 -07:00
Calen Pennington
287cb14e37 Allow the chromeless view to render the reset banner when not in mobile 2020-06-02 14:31:42 -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
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
Dillon Dumesnil
39b6215921 Merge pull request #24119 from edx/ddumesnil/fix-date-ordering-AA-158 
AA-158: Fix date ordering for multiple events on the same date
 2020-06-02 06:21:42 -07:00
Dillon Dumesnil
03bc4bc1be AA-158: Fix date ordering for multiple events on the same date 
This change will prefer putting assignments before other course
events (such as end date or verification deadline date) in the
case where they share the same date.
 2020-06-02 06:51:25 -06:00
David Ormsbee
71a38cf449 Revert "AA-158: Fix date ordering for multiple events on the same date" 2020-06-01 19:45:47 -04:00
Dillon Dumesnil
109e608e9c Merge pull request #24112 from edx/ddumesnil/fix-date-ordering-AA-158 
AA-158: Fix date ordering for multiple events on the same date
 2020-06-01 12:12:06 -07:00
Dillon Dumesnil
dbcff660cc AA-158: Fix date ordering for multiple events on the same date 
This change will prefer putting assignments before other course
events (such as end date or verification deadline date) in the
case where they share the same date.
 2020-06-01 12:15:20 -06:00
Nick
d8ac4621fd Merge pull request #24090 from edx/ndalfonso/AA-117-mfe-dates-tab-waffle-flag 
AA-117 mfe date tab waffle flag
 2020-06-01 09:37:12 -04:00
Nicholas D'Alfonso
0709977785 AA-117 mfe date tab waffle flag 
- create master course home waffle flag
- create course waffle flag for accessing the mfe dates tab
 2020-05-29 12:34:43 -04:00
stvn
37d92fa540 Merge PR #24030 add/masquerade-get 
* Commits:
  Add HTTP GET endpoint for masquerade
 2020-05-28 19:02:25 -07: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
Calen Pennington
f3c1747051 Check for the mobile app specifically in the dates banner conditionals 2020-05-27 11:19:12 -04:00
Nick
d1ac7d4b16 Merge pull request #24015 from edx/ndalfonso/AA-151-dates-banner-on-course-outline-and-refactor 
AA-151 dates banner on course outline and refactor
 2020-05-21 13:57:25 -04:00
Nicholas D'Alfonso
b454f9be1d AA-151 dates banner on course outline and refactor 
- use new dates banner template on course outline page
- remove old banner from main.html
- let dates tab use new dates banner template
- remove dates banner completely from the courseware problem view
  on the web app
- use new banner on the courseware problem view on the mobile app
- update banner util to use get_course_blocks
 2020-05-21 13:23:05 -04:00
Carla Duarte
8b376e271c AA-152: Course Start Date for PLS 
Updated the displayed start date for a learner in a self paced course
that appears in the Learner Dashboard and the Dates tab.
Used the max of the course start date and the learner's enrollment date.
 2020-05-20 13:18:31 -04:00
Jeff LaJoie
efa7b3b816 AA-164: Performance fixes for course home 2020-05-20 10:09:41 -04:00
stvn
17d1391f8f Add HTTP GET endpoint for masquerade 
to inquire about active and available options.

This is to be used, at least initially, by the new Courseware
Experience, the Learning MFE.
 2020-05-19 14:59:07 -07:00
stvn
4125ae0e23 Merge PR #24012 add/masquerade 
* Commits:
  Add is_staff check to masquerade POST
  Convert masquerade view to class-based
 2020-05-19 14:44:15 -07:00
stvn
69417396aa Add is_staff check to masquerade POST 2020-05-19 13:55:37 -07:00
stvn
5bf38f5416 Convert masquerade view to class-based 2020-05-19 13:55:37 -07:00