Commit Graph

60355 Commits

Author SHA1 Message Date
Nimisha Asthagiri
f7be885719 Registration API: Remove success field
LEARNER-7476
2019-11-12 11:34:57 -05:00
irfanuddinahmad
0385d42d26 Merge pull request #22213 from edx/iahmad/ENT-2339-Updated-login-flow-for-customers-with-multiple-enterprises
ENT-2339 Updated login flow for multiple enterprise
2019-11-12 20:30:38 +05:00
Feanil Patel
48b90aab87 Make a change to cause tests to run.
Use this change to be able to see how master is doing w.r.t the python 3
upgrade.
2019-11-12 09:59:47 -05:00
Feanil Patel
b405c20139 Merge pull request #22256 from edx/feanil/fix_py3_quality
Fix pep 8 violations.
2019-11-12 09:59:18 -05:00
irfanuddinahmad
8b5e8968ed updated the login flow for multiple enterprise 2019-11-12 19:47:02 +05:00
edX requirements bot
8d77623d23 Updating Python Requirements (#22303) 2019-11-12 09:19:17 -05:00
Zia Fazal
75031d765d Merge pull request #22297 from edx/ziafazal/ENT-1849
ENT-1849: Added caller info to the exception message
2019-11-12 15:38:59 +05:00
Saad Yousaf
0425502244 Merge pull request #22195 from edx/saad/PROD-652
Studio export/import can introduce extra spaces into text formatted as code
2019-11-12 15:34:30 +05:00
DawoudSheraz
e306bc74c0 avoid pretty printing of pre tags in course import 2019-11-12 13:57:25 +05:00
Awais Qureshi
605d4a35df Merge pull request #22294 from edx/awais786/gunicorn-fix
BOM-1027
2019-11-12 12:02:52 +05:00
Awais Qureshi
f8b1ff538e BOM-1027
guincorn just released its version on 9th-nov-2019 (20.0.0)
and it requires Python 3.x >= 3.4.
so adding constraint < 20.0.0

execute make upgrade
2019-11-12 11:09:25 +05:00
Zia Fazal
5b6e0514de Added caller in to the exception message
Added caller in to the exception message to debug ENT-1849
Replaced `get_enterprise_learner_data` method call with `enterprise_customer_for_request` to get enterprise customer data from cache or session instead of hitting API.
2019-11-11 19:44:24 +05:00
Zainab Amir
b845fae0bc Remove logs (#22293)
Revert logs added to investigate audit cert cutoff date

PROD-978
2019-11-11 15:03:02 +05:00
Syed Muhammad Dawoud Sheraz Ali
89cd932108 Merge pull request #22276 from edx/dsheraz/PROD-976
remove small job queue condition for bulk email task
2019-11-11 12:25:04 +05:00
DawoudSheraz
50fe851614 remove small job queue condition for bulk email task 2019-11-11 11:46:16 +05:00
edX Transifex Bot
9a45a411d2 fix(i18n): update translations 2019-11-10 16:23:41 -05:00
Awais Qureshi
c89a9ad91a Merge pull request #22282 from edx/awais786/upgrade
BOM-1012
2019-11-09 23:36:47 +05:00
David Ormsbee
6ba9cd2140 Merge pull request #22035 from open-craft/blockstore-assets
APIs for XBlock static asset files in Blockstore
2019-11-08 15:28:59 -05:00
Waheed Ahmed
0a0934c9a6 Merge pull request #22277 from edx/waheed/PROD-580-remove-archived-course-button-from-entitlement
Remove View Archived Course button from unfulfilled entitlements.
2019-11-09 00:51:41 +05:00
Ned Batchelder
99117838dd Merge pull request #22262 from Abstract-Tech/open-release/ironwood.master
Fix invocation of (edx.)HtmlUtils.ensureHtml
2019-11-08 13:56:27 -05:00
Adam Stankiewicz
c7ddfb6d67 Merge pull request #22287 from edx/astankiewicz/upgrade-edx-enterprise
upgrade edx-enterprise to 2.0.16
2019-11-08 13:25:28 -05:00
Adam Stankiewicz
5fc48cb1fb upgrade edx-enterprise to 2.0.16 2019-11-08 12:33:29 -05:00
Dave St.Germain
0e4c04ed2e Merge pull request #21961 from edx/dcs/jumpnav
Improve navigation on Studio unit page
2019-11-08 10:32:43 -05:00
Kyle McCormick
5a3dde1b91 Add admin pages for teams models (#22284) 2019-11-08 10:10:24 -05:00
Hasnain Naveed
3acf63af36 Merge pull request #22279 from edx/hasnain-naveed/ENT-2437-new
ENT-2437 | get_enterprise_customer_for_learner method replaced with e…
2019-11-08 19:21:31 +05:00
Jeremy Bowman
e0a22db806 Fix Python 3 bug in LTI stub server BOM-1006 (#22260) 2019-11-08 08:42:56 -05:00
Awais Qureshi
a0dc47eb3e BOM-1012
Bump the version.
2019-11-08 17:02:59 +05:00
Waheed Ahmed
146c19405a Remove View Archived Course button from unfulfilled entitlements.
Remove View Archived Course button from unfulfilled entitlements
if there is no session availabe to join.

PROD-580
2019-11-08 16:36:10 +05:00
hasnain-naveed
057f443a26 ENT-2437 | get_enterprise_customer_for_learner method replaced with enterprise_customer_for_request. 2019-11-08 15:47:52 +05:00
Alex Dusenbery
923452514b Revert "Upgrade ORA2 to 2.4.0"
This reverts commit 31a3a6cb5c.
2019-11-07 19:21:10 -05:00
Stu Young
e229279f3c fix invalid choices in toggle annotations (#22266) 2019-11-07 15:22:46 -05:00
Stu Young
9ec9d45bc4 remove backfill history management command (#22267) 2019-11-07 15:03:31 -05:00
Alex Dusenbery
31a3a6cb5c Upgrade ORA2 to 2.4.0 2019-11-07 14:39:22 -05:00
Matthew Piatetsky
8e54125e96 Merge pull request #22223 from edx/REV-693-step3
[REV-693] Delete old holdback code
2019-11-07 14:12:05 -05:00
Zainab Amir
62de1f20d1 Add logs to verify audit cert cutoff date (#22265)
Users were awareded audit certificate recently. Adding logs to verify
that cutoff date for awarding certificate is correct

PROD-978
2019-11-07 22:19:21 +05:00
Feanil Patel
ff60c71fe6 Merge pull request #22268 from edx/feanil/fix_flaky_video_test
The type of the attrib object wasn't actually a dict.
2019-11-07 11:34:29 -05:00
Dave St.Germain
60f7c40be0 Merge pull request #22232 from edx/dcs/outline-edit
Add in-context display name editor for units on the course outline.
2019-11-07 11:11:59 -05:00
Feanil Patel
1a3f21080e The type of the attrib object wasn't actually a dict.
It was an internal class that we can't easily compare to. So I'm opting
to just make the xml output be more consistent and ordered.  I was
hoping to avoid this since the order shouldn't matter but the juggling
we have to do to validate the unorderd data is more complication than
it's worth.
2019-11-07 10:33:36 -05:00
Matthew Piatetsky
bd76a71019 delete old holdback code 2019-11-07 09:51:39 -05:00
Dave St.Germain
3e73ba3879 TNL-6929:
Improves navigation within Studio for Learning Sequences, speeding up authors who want to see how a learner progresses through content without needing to jump over to the LMS.

This adds a dropdown section navigator to the breadcrumbs on the unit page and copies the sequence navigator from LMS to the studio unit page.
2019-11-07 09:13:00 -05:00
Feanil Patel
2204e92f8e Up the pylint limit because we get a bunch of deprecated-metod warnings in python 3.
We should fix them eventually but don't want them to block going
to python 3.
2019-11-07 09:09:08 -05:00
adeelehsan
08877db858 Merge pull request #22243 from edx/aehsan/prod-612/allow_certificate_regenration_for_exisiting
Allow certification regenration for existing honor certificates
2019-11-07 16:41:28 +05:00
adeelehsan
1adc01b45c Allow certification regenration for existing honor certificates
staff should be able to regenerate certificates for the students
who have already earned the certificate using honor mode

Prod-612
2019-11-07 14:08:20 +05:00
edx-transifex-bot
9543f4c16f geoip2: update maxmind geolite country database (#22259) 2019-11-07 10:59:13 +05:00
Kyle McCormick
4f3262a40b Remove most references to old teams config scheme (#22238)
This is a follow up from MST-16, which was commited
in 3858036a4e.

Changes:
* Enrich course teams_configuration from a plain Dict
  to a custom XBlock field that uses the new TeamsConfig
  wrapper class.
* Remove teams_conf property from course, as the previous
  change made it redundant.
* Update teams_enabled implementation.
* Remove teams_max_size field from course, which is
  no longer semantically correct, as max team size
  is now defined on a teamset level.
* Remove teams_topics in order to discourage use of raw
  teams config dict.
* Add convenience properties teamsets and teamsets_by_id
  to course.
* Allow periods and spaces in teamset IDs to avoid breaking
  existing course teams.

Some parts of the code still use the old raw config data
(identifiable by searching "cleaned_data_old_format"),
which we expect to be slowly factored away as we build
new teams features. MST-40 has been created to remove any
remaining references if necessary.

MST-18

* fix: bokchoy test

* fix: remove pdb break
2019-11-06 20:43:32 -05:00
Silvio Tomatis
12cf50b0a9 Fix invocation of (edx.)HtmlUtils.ensureHtml
Without this the following JS error occurs:

    Uncaught ReferenceError: HtmlUtils is not defined
        at toggleSubmitButton (login:658)
2019-11-07 00:29:12 +01:00
Feanil Patel
733f6f8f24 Make the count a number because comparing NoneTypes and numbers isn't a thing in python 3. 2019-11-06 15:58:03 -05:00
Feanil Patel
e863c50054 Fix pep 8 violations. 2019-11-06 13:39:07 -05:00
Feanil Patel
d6099e08fd Merge pull request #22254 from edx/feanil/fix_flaky_video_xml_bug
Parse transcripts json to compare logically.
2019-11-06 13:36:38 -05:00
Braden MacDonald
7dafda6168 Support for storing an XBlock's static asset files in Blockstore
This PR introduces some backend python + REST APIs for storing static
asset files along with an XBlock in a content library. It also updates
the new runtime to be able to load such static asset files.

Example use cases:
* Store an image file with an HTML block and then use the image inline
  in the HTML block.
* Store a PDF file with an HTML block and provide a link in the HTML for
  the learner to download the PDF.
* Store .srt files or even video .mp4 files that belong to a video
  XBlock.

Within the bundle, these static asset files are stored in a "static/"
subfolder of the folder that contains the OLX file. Extending an
existing LMS/Studio convention, a static asset file such as "image.png"
is referenced within the OLX as "/static/image.png" and the URL will be
rewritten by the runtime.
2019-11-06 10:19:42 -08:00