Commit Graph

55526 Commits

Author SHA1 Message Date
Dave St.Germain
66e2c7a5ea Merge pull request #24811 from edx/dcs/upgrade
Upgraded LTI and ORA2 xblocks
2020-08-19 14:34:28 -04:00
Dave St.Germain
3ec8486dd3 Upgraded LTI and ORA2 xblocks 2020-08-19 13:48:27 -04:00
David Ormsbee
a0762c06ef Merge pull request #21413 from open-craft/kshtij/problem-response-multi-root-and-fitler
[BB-873] Support for filters, and multiple roots in problem response reports
2020-08-19 13:07:24 -04:00
Alexander J Sheehan
3ef3b8f0fc Merge pull request #24807 from edx/alex-sheehan-edx/bumping-entperise-version-3.6.3
bumping edx enterprise version to 3.6.3
2020-08-19 11:24:43 -04:00
Alexander Sheehan
f417128ded bumping edx enterprise version 2020-08-19 10:39:23 -04:00
Ali Akbar
e7c3237fd8 Merge pull request #24805 from edx/revert-24738-aakbar/PROD-924
Revert "allow cursor to be in the whole text area"
2020-08-19 18:57:00 +05:00
Kyle McCormick
885627e14f Extend expiration of DEPRECATE_OLD_COURSE_KEYS_IN_STUDIO toggle (#24804)
TNL-7423
2020-08-19 09:53:14 -04:00
Ali Akbar
38b1615484 Revert "allow cursor to be in the whole text area" 2020-08-19 18:14:45 +05:00
Ahtisham Shahid
6e507e1a49 Revert "Instructor Dashboard Redesign" (#24802)
* Revert "New vs Old Data-Download UI. (#24094)"

This reverts commit 52669c47f1.

* Fixed linter issues
2020-08-19 17:17:20 +05:00
Ali Akbar
2578877d58 Merge pull request #24738 from edx/aakbar/PROD-924
allow cursor to be in the whole text area
2020-08-19 16:23:43 +05:00
Ali-D-Akbar
c217d7c134 allow cursor to be in the whole text area 2020-08-19 15:37:15 +05:00
M. Zulqarnain
2c33fc249d Merge pull request #24799 from edx/jenkins/upgrade-python-requirements-6f06680
Python Requirements Update
2020-08-19 13:37:59 +05:00
edX requirements bot
e0097ae5c3 Updating Python Requirements 2020-08-19 00:52:18 -04:00
Kshitij Sobti
2eff127e8d Add support for generating problem response reports for multiple blocks, or filtered block types.
This change adds support for specifying multiple root blocks while generating
problem response reports. It also allows specifying a block type filter so that
only blocks of the filtered types will be included in the report.

Finally, this change also consistenly uses absolute path for the location in the
report instead of relative paths.
2020-08-18 22:28:05 +05:30
Dillon Dumesnil
6f06680c4f Merge pull request #24796 from edx/ddumesnil/showanswer-improvement
AA-307: Turn showanswer override back on
2020-08-18 09:00:57 -07:00
Dillon Dumesnil
82e7a9ce13 AA-307: Turn showanswer override back on
This doesn't handle the default case where the showanswer has never
been touched, in which case it will continue to return Finished,
but that also happens when it's turned off so this just helps out
for all of the other cases.
2020-08-18 07:53:18 -07:00
Nick
f82a98cdbe Merge pull request #24792 from edx/ndalfonso/AA-282-course-emails-date-sync
AA-282 course emails date sync
2020-08-18 09:31:44 -04:00
Saad Yousaf
ad396feafa Merge pull request #24793 from edx/saad/PROD-2052
[PROD-2052] - Fix issue with transcript dropdown.
2020-08-18 16:43:22 +05:00
M. Zulqarnain
7c8050bf15 Merge pull request #24795 from edx/jenkins/upgrade-python-requirements-f0ae71a
Python Requirements Update
2020-08-18 13:19:36 +05:00
Ahtisham Shahid
52669c47f1 New vs Old Data-Download UI. (#24094)
updated css

temp fixex

Updated js code for data download

updated js hooks for new UI

fixed ui and navigation

reset paver file

Removed unused changes

Initial tests added

Initial tests added

fixed style issues

Created new tests for data download

Fixed A11y and quality issues

Updated test file and removed new

fixed Accesibility issues

fixed code style in spec

removed old data download file

Moved problem grade report

Updated html to fix accessiblity issue

Fixed accessiblity issues

Created waffle flag for data download

added doc strign in doc

renamed waffles file

Break down Html and fixed tests

Removed extra js and updated comments

Removed extra js and updated comments

renamed var fixed styling

fixed js test fail

Fixed styling issues

updated description texts

Updated problem selector UI

Fixed Jest test for react component

removed depricated default param

added class instead of style

updated snapshot

Co-authored-by: Awais Jibran <awaisdar001@gmail.com>
2020-08-18 13:15:30 +05:00
edX requirements bot
22f81ce74e Updating Python Requirements 2020-08-18 01:33:42 -04:00
SaadYousaf
0bda30a393 fix issue with transcript dropdown. 2020-08-18 02:15:42 +05:00
Jansen Kantor
f0ae71ab76 add get_team_by_team_id to teams service (#24783) 2020-08-17 16:04:34 -04:00
Nicholas D'Alfonso
e9e85d05c1 AA-282 course emails date sync
- send course emails to users based on whichever date is later,
  sedule start date or course start date.  This addresses the
  scenario when a user enrolls in a self paced course before it
  has actually started.
2020-08-17 16:01:21 -04:00
Robert Raposa
8c127db978 Merge pull request #24344 from regisb/regisb/toggles-docs
[BD-21] Generate feature toggle documentation
2020-08-17 15:04:46 -04:00
Robert Raposa
49a1c74909 Merge pull request #24785 from edx/robrap/ARCHBOM-1420-fix-waffle-module
ARCHBOM-1420: fix waffle instance module name
2020-08-17 11:05:22 -04:00
Aarif
f5c4e2c2df Updating Python Requirements (#24787) 2020-08-17 15:41:16 +05:00
edX requirements bot
f102e737f6 Updating Python Requirements 2020-08-17 00:56:03 -04:00
Robert Raposa
a8c3413a32 fix waffle instance module name
Fixes the computation of the WaffleFlag and
WaffleSwitch instance module name. This in
turn fixes the code_owner as well.

ARCHBOM-1420
2020-08-15 15:49:11 -04:00
Robert Raposa
6d796937f4 Merge pull request #24784 from edx/robrap/ARCHBOM-1420-waffle-flag-instances
ARCHBOM-1420: add code_owner for flags and switches
2020-08-14 18:08:39 -04:00
Robert Raposa
60827a6f73 add code_owner for flags and switches
Enhances the toggle state endpoint with
code_owner, module, and class for WaffleFlag
and WaffleSwitch.

ARCHBOM-1420
2020-08-14 16:47:49 -04:00
daphneli-chen
9a8f1aa96e Merge pull request #24702 from edx/dlichen/AA-274
Dlichen/AA-274
2020-08-14 12:51:31 -07:00
Daphne Li-Chen
f557e395de AA-274: sending credit requirement information and added tests 2020-08-14 14:39:44 -04:00
Diana Huang
493c7d694c Merge pull request #24782 from edx/diana/add-settings-toggles
ARCHBOM-1409 - Add django settings toggles to toggles endpoint.
2020-08-14 14:12:55 -04:00
Robert Raposa
2c8105f7ae [BD-21] Generate feature toggle documentation
We introduce a new documentation target, where we use the featuretoggles
Sphinx extension from code-annotations to generate human-readable
documentation of feature toggles in edx-platform. The annotation report
is generated on-the-fly based on the standard feature toggle
configuration file in code-annotations.

In addition, we add new doc.in & doc.txt requirement files that will be
pip-installed by readthedocs to generate the documentation targets.
2020-08-14 19:41:26 +02:00
Diana Huang
6a84710cf7 Add django settings toggles to toggles endpoint. 2020-08-14 13:19:28 -04:00
Michael Terry
a0b08614ea Merge pull request #24781 from edx/mikix/only-1-is-complete
Only mark blocks 'complete' if their completion is 1.0
2020-08-14 12:24:27 -04:00
Michael Terry
6d0ecaab47 Only mark blocks 'complete' if their completion is 1.0
This is how the rest of our code seems to treat it, let's be
consistent.

This is an attempt to fix AA-292.
2020-08-14 11:39:18 -04:00
Robert Raposa
eeb1ad87b5 Merge pull request #24778 from edx/robrap/ARCHBOM-1429-add-course-overrides
ARCHBOM-1429/ARCHBOM-1366:  add course overrides and computed_status
2020-08-14 11:09:41 -04:00
Robert Raposa
20e5a3247b add course overrides and computed_status
Adds the following additions to the toggle state endpoint:

- course override data from CourseWaffleFlag.
- computed_status for waffle flags (accounting for
course overrides when applicable), and waffle switches.

Note: the waffle switch computed_status will make more
sense when we include WaffleSwitch instances that don't
have any data in the database.

ARCHBOM-1429
ARCHBOM-1366
2020-08-14 10:16:19 -04:00
Aarif
740d266996 Updating Python Requirements (#24780) 2020-08-14 13:00:53 +05:00
edX requirements bot
cbab8d5d26 Updating Python Requirements 2020-08-14 01:39:29 -04:00
stvn
70dbd1ab75 Merge PR #24772 add/kill-switch
* Commits:
  Implement kill-switch for the Learning MFE
2020-08-13 14:47:03 -07:00
alangsto
458b8b14ce added override settings for test (#24777) 2020-08-13 15:46:54 -04:00
Dillon Dumesnil
da9a248247 Merge pull request #24776 from edx/ddumesnil/turn-off-showanswer-override
Temporarily disable Show Answer Override for self-paced courses
2020-08-13 12:24:28 -07:00
David Joy
c6ae82db57 Implement kill-switch for the Learning MFE
by overriding can_load_courseware if the MFE is disabled for the user

If the user would be allowed to see the courseware MFE
(can_load_courseware), we check whether the MFE is disabled for them,
based on global settings, course settings (mongo courses), or their
particular bucketing in our ExperimentWaffleFlag.

If we determine they shouldn’t be allowed to see it, we return a new
CoursewareMicrofrontendDisabledAccessError access response, which the
MFE will use to know it should redirect to the old LMS experience.

Fixes: TNL-7362
Co-authored-by: stvn <stvn@mit.edu>
2020-08-13 12:05:49 -07:00
Dillon Dumesnil
c702d12957 Temporarily disable Show Answer Override for self-paced courses 2020-08-13 11:56:25 -07:00
David Ormsbee
5d33501c82 Merge pull request #19986 from open-craft/kshitij/report-status
Inline problem response report status
2020-08-13 12:51:55 -04:00
Robert Raposa
b481be873f Merge pull request #24774 from edx/robrap/ARCHBOM-1427-add-waffle-flag-state
ARCHBOM-1427: add waffle flags and switches to toggle state
2020-08-13 12:50:28 -04:00
Anirudh Naidu
e7099518d9 Merge pull request #24771 from edx/chavesj/ENT-2939
ENT-2939: remove ENTERPRISE_CUSTOMERS_EXCLUDED_FROM_CATALOG list and upgrade edx-enterprise
2020-08-13 12:04:58 -04:00