Commit Graph

54623 Commits

Author SHA1 Message Date
Albert (AJ) St. Aubin
e91c837173 Added Python API and renamed rest_api folder
[MICROBA-281]
2020-06-04 12:44:06 -04:00
Zainab Amir
cdc1c91980 Integrate Video Encode Manager (#24093)
* Add VEMPipelineIntegration config model
* Add course waffle flag to enable vem pipeline selectively

PROD-1636
2020-06-04 11:45:34 +05:00
stvn
1bd88d61cf Merge PR #24138 fix/staff-links
* Commits:
  Fix issue w/ staff toolbar's Insights link
2020-06-03 16:02:54 -07:00
stvn
83b2f6e535 Fix issue w/ staff toolbar's Insights link
since the configuration value does _not_ include the `/courses` bit in
either stage or prod.

Note: The value for prod contains a trailing slash, while stage does not
🤷

I tested locally that this should work with either config
(trailing slash or not).
2020-06-03 15:05:06 -07:00
edX Transifex Bot
bf925bc985 geoip2: update maxmind geolite country database 2020-06-03 17:10:10 -04:00
Calen Pennington
2fba82b9e1 Merge pull request #24086 from cpennington/use-content-type-gating-in-dates-page
Use content type gating in dates page
2020-06-03 15:34:09 -04: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
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
David Ormsbee
ee61c9dc75 Merge pull request #20225 from open-craft/giovanni/bb-1156-enable-changing-require-build-profile
BB-1156: Enable changing the build profile used by RequireJS
2020-06-03 12:58:19 -04:00
Jeff LaJoie
7a45030de5 Merge pull request #24129 from edx/jlajoie/enable-highlights-job
Enables weekly highlights job for relative dates
2020-06-03 12:42:03 -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
Awais Qureshi
6db35274e9 Merge pull request #24116 from eduNEXT/eric/update_sorl-thumbnail_dep
[BD-6] Update sorl-thumbnail dependency
2020-06-03 21:32:57 +05:00
Jeff LaJoie
5e6814c442 Enables weekly highlights job for relative dates 2020-06-03 12:07:56 -04:00
Ben Warzeski
7c9f901096 Update 'create team?' prompt check in topic teams to look in teamset (#24088)
* Update check for showing the 'create team?' prompt in topic teams to look in teamset

* fix tests and correct which collection we are checking

* eslint fixes

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
2020-06-03 11:37:43 -04:00
Calen Pennington
d528ef8e10 Merge pull request #24133 from cpennington/use-content-type-gating-in-dates-banner
Use content type gating in dates banner
2020-06-03 11:29:29 -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
Uzair Rasheed
5f47cb4bb7 Merge pull request #24107 from edx/restrict-api-to-staff-and-self-user
Restrict cert api to staff and self user
2020-06-03 19:13:47 +05: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
c3ec8b837a Merge pull request #24131 from edx/revert-24085-use-content-type-gating-in-dates-banner
Revert "Use content type gating in dates banner"
2020-06-03 09:55:28 -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
David Ormsbee
998d38b8b1 Merge pull request #23344 from edx/ormsbee/learning_seq_api
Learning Sequence / Course Outline API
2020-06-03 09:45:39 -04:00
uzairr
d0f7120198 Restrict cert api to staff and self user 2020-06-03 18:12:30 +05:00
Ahtisham Shahid
b69163fae7 Merge pull request #24079 from edx/ahtisham/PROD-1412-2
Added v2 for confirm email backward compatibility
2020-06-03 17:13:49 +05:00
AsadAzam
8e5d9b5e55 Merge pull request #23998 from edx/asad/prod-1336
fixed visibility state for self paced
2020-06-03 15:17:26 +05:00
asadazam93
86d7725f26 fixed visibility state for self paced 2020-06-03 14:06:54 +05:00
Eric Herrera
816f9e6e3a Move sorl-thumbnail dependencie from github.in to base.in since PyPi version is now compatible with DJango 2.2 and python 3.5. 2020-06-02 20:15:15 -05: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
stvn
43ac90e30d Add Studio and Insights buttons to Instructor Toolbar
in a feature backport from the new Courseware/Learning MFE.
2020-06-02 16:00:32 -07:00
Jansen Kantor
13956a0d93 bump ora version (#24125) 2020-06-02 18:56:56 -04:00
David Ormsbee
5d1b24988e Create learning_sequences app, Course Outline API.
Introduces the learning_sequences app, intended to provide metadata for
sequences and course outlines. The short term goal is to provide faster
source of this information for the new Courseware microfrontend
(frontend-app-learning). The medium term goal is to provide an in-proc
API that is useful to other parts of the platform that need fast access
to course outline information customized for a user. The long term
goals are outlined in the README.rst.

This first iteration of the API only lays out the basic structure for
how we'd arrange the pieces, with enough of an implementation to feel
"real" (simple schedules, staff_only content hiding). It's not ready to
be turned on, and is not currently plugged into the publish-flow. The
only way to get data into this new API is via the update_course_outline
management command. The REST endpoint is also currently limited to
global staff only, though it's possible to get the outline for a student
by using the ?username= query parameter.

TNL-7122
2020-06-02 15:31:21 -04:00
Nathan Sprenkle
e0ddb1e0e2 Team Assignments Dashboard (#24019)
* Add team assignments to frontend

* Limit team assignments to the given teamset

* Remove deprecated django render_to_response

* Move team assignments panel behind feature flag
2020-06-02 15:05:47 -04: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
6029d53a4f Don't upsell content to mobile app users in the dates_banner 2020-06-02 14:23:28 -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
atesker
de0e8524a2 EDUCATOR 5065 - updates
EDUCATOR 5065 - CR comments 3
2020-06-02 14:03:01 -04:00
Jason Myatt
7adb6dd9ac Merge pull request #24120 from edx/jmyatt/check-for-empty-due-date
Check for none on subsection due date
2020-06-02 13:28:24 -04:00
Jason Myatt
4d01a736d2 Check for none on subsection due date 2020-06-02 11:29:09 -04:00
Michael Terry
61b20d3f8e Merge pull request #24103 from edx/mikix/summary-dates-is-allowed
AA-76: Add is_allowed property to DatesSummary
2020-06-02 10:01:47 -04:00
Kyle McCormick
7e3470db42 Expose was_ever_proctored_exam dict entry on xblock_info (#24040)
In a follow-up PR, this entry will be used to validate
on the client-side that a block that *is* or *ever was*
a proctored/practice/onboarding exam cannot be configured
as a different proctored/practice/onboarding exam, as that
has led to problematic exam configuration states between
edX and proctoring providers.

MST-258
2020-06-02 09:44:12 -04:00
Carla Duarte
f574ed3713 Merge pull request #24071 from edx/ciduarte/AA-120
AA-120: Course Tools API
2020-06-02 09:28:34 -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
Emma Green
104c24bd39 Merge pull request #24104 from edx/emma-green/REV-1197/add-temporary-management-command-to-get-FBE-info
get-FBE-info-from-temp-management-command
2020-06-02 09:03:10 -04: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
Ahtisham Shahid
af033d25cc Added v2 for confrim email backward compatiblity
updated tests

fixed style issue

Fixed tests for v2 api
2020-06-02 13:01:58 +05:00
Emma Green
2076a8a9bb get-FBE-info-from-temp-management-command 2020-06-01 21:06:31 -04:00
David Ormsbee
25f22ddc56 Merge pull request #24117 from edx/revert-24112-ddumesnil/fix-date-ordering-AA-158
Revert "AA-158: Fix date ordering for multiple events on the same date"
2020-06-01 20:25:16 -04:00
Adam Stankiewicz
ecfda2c115 bump edx-enterprise (#24115) 2020-06-01 19:46:24 -04: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