Commit Graph

53160 Commits

Author SHA1 Message Date
Calen Pennington
d92dcb28bb Expose user course duration in the user metadata 2019-10-25 10:02:55 -04:00
edX requirements bot
551f33098a Updating Python Requirements (#22153) 2019-10-25 09:37:47 -04:00
uzairr
386e05d3b1 Add warning to the bottom of verification status card on dashboard.
Learners are not allowed to make an attempt of the procotored exam if
they verify their identity near to proctored exam date.To make them,
aware about their expiry date, modification are done to the status card
so that user experience will be improved.

PROD-769
2019-10-25 18:09:39 +05:00
adeelehsan
edd8887e47 Merge pull request #22152 from edx/aehsan/prod-734/added_logs_in_lang_pref_middleware
Logs added to investigate the middleware
2019-10-25 15:52:57 +05:00
adeelehsan
88e7589a19 Logs added to investigate the middleware 2019-10-25 15:27:26 +05:00
aarif
45338f4160 changes made to sanitize the urls for consistent comparison
changes made to finalize the url sanitization to make url comparison consistent

changes made to avoid running sanitize in python 2

changes made to substitute proper query param in url for comparison

changes made to split and compare the query parameter with expected url

updated the split logic to properly split/slice url parts for comparison

updated the dashboard template to remove encode and avoid bytes encoded embeded url

updated the dashboard template to enclose social media urls with unicode
2019-10-25 15:20:32 +05:00
Awais Qureshi
2cf8341189 Merge pull request #22138 from edx/awais786/BOM-968
BOM-968
2019-10-25 14:55:27 +05:00
Awais Qureshi
96400a9674 Merge pull request #22137 from edx/awais786/BOM-981-982
BOM-981
2019-10-25 14:52:52 +05:00
noraiz-anwar
4bcedb9eee make upgrade output 2019-10-25 12:00:23 +05:00
Ayub
8cc509e448 Merge pull request #22107 from edx/BOM-949
BOM-949
2019-10-25 11:01:51 +05:00
Ayub
6d471e24ac Merge pull request #22142 from edx/BOM-987-2
BOM-987
2019-10-25 11:00:53 +05:00
Ayub
279ecba2b7 Merge pull request #22144 from edx/BOM-964
BOM-964
2019-10-25 10:57:16 +05:00
Ayub
30c1443671 Merge pull request #22139 from edx/bump-edx-proctoring-version
BOM-989
2019-10-25 10:40:25 +05:00
Manjinder Singh
80c7f5af01 BOM-933: Fix type mismatches in various migrations 5 (#22147)
* fix type mismatch in third_party_auth migrations

* fix type mismatch in verify_student  migrations

* fix type mismatch in video_config  migrations

* fix type mismatch in verified_track_content  migrations

* fix type mismatch in commercemigrations

* fix type mismatch in xblock_config migrations

* fix type mismatch in course_creators migrations

* fix type mismatch in contentstore migrations
2019-10-24 16:08:04 -04:00
edX cache uploader bot
2ccbeda27d Updating Bokchoy testing database cache (#22148) 2019-10-24 15:05:24 -04:00
Jason Myatt
da90e2e851 Merge pull request #22131 from edx/jmyatt/enable_null_order_numbers_in_entitlements_admin
Allow empty order numbers in django admin for Entitlements
2019-10-24 14:21:15 -04:00
Feanil Patel
b5a765e676 Merge pull request #22135 from edx/feanil/fix_show_answer_render
Pass back the answer html as a string instead of bytes.
2019-10-24 13:59:53 -04:00
Manjinder Singh
7f3045cf75 BOM-933: Fix type mismatches in various migrations 4 (#22146)
* fix type mismatch in course_goals  migrations

* fix type mismatch in experiments  migrations

* fix type mismatch in xblock_django  migrations

* fix type mismatch in catalog  migrations

* fix type mismatch in static_replace  migrations

* fix type mismatch in bulk_email  migrations

* fix type mismatch in course_overviews migrations
2019-10-24 13:47:51 -04:00
Jeremy Bowman
05e9e56d56 Fix CSS selector under Python 3 BOM-991 (#22124) 2019-10-24 13:19:18 -04:00
Jason Myatt
c30865cce6 Allow empty order numbers in django admin for Entitlements 2019-10-24 12:52:41 -04:00
Manjinder Singh
a384e753fd BOM-933: Fix type mismatches in various migrations (#22112)
* Fix type mismatches in the course_modes migrations

* Fix type mismatches in the course_action_state migrations

* Fix type mismatches in the schedules migrations

* Fix type mismatches in grades migrations

* Fix type mismatches in video_pipeline

* Fix type mismatches in api_admin

* Fix mismatches in credential migrations
2019-10-24 11:42:39 -04:00
Feanil Patel
c009d4550a Pass back the answer html as a string instead of bytes.
We did this already for the 'get_html' function for a capa problem but
there wasn't a test to ensure this works correctly for the
get_question_answer function that powers the show answer button.

I ran into it while doing a quick smoke test on the python 3 sandbox.
2019-10-24 09:46:26 -04:00
Ayub khan
78c20156a1 BOM-964
shoppingcart: Explicitly Set fields to unicode to avoid migration
2019-10-24 18:04:16 +05:00
Awais Jibran
dc0a6488d5 Merge pull request #22108 from edx/aj/improve-logging
Improve logging against Problem grade report
2019-10-24 17:39:40 +05:00
Ayub khan
7428c23fb0 BOM-987
django_comment_common: Explicitly Set fields to unicode to avoid migration
2019-10-24 17:31:57 +05:00
Awais Jibran
ac9a7055b5 Improve logging against Probelm grade report 2019-10-24 16:40:41 +05:00
Awais Qureshi
6abaf893f1 BOM-968
Fixing migrations.
2019-10-24 15:21:13 +05:00
edx-transifex-bot
4515b1a2bf fix(i18n): update translations (#22126) 2019-10-24 15:01:21 +05:00
Awais Qureshi
82fb16b2f7 BOM-981,983,984
Fixing migrations.
2019-10-24 14:53:39 +05:00
Ayub khan
f29006b3b6 BOM-989
-bumped edx-proctoring version
2019-10-24 14:31:38 +05:00
Ayub
23ccda11ab Merge pull request #22103 from edx/BOM-947
BOM-947
2019-10-24 13:21:25 +05:00
Ayub
14cc694518 Merge pull request #22104 from edx/BOM-946
BOM-946
2019-10-24 13:19:18 +05:00
Ayub khan
897bd25b01 BOM-949
student: Explicitly Set fields to unicode to avoid migration
2019-10-24 13:16:57 +05:00
Ayub
7554eb1afd Merge pull request #22110 from edx/BOM-951
BOM-951
2019-10-24 12:54:34 +05:00
edX Transifex Bot
28a48fe6a6 geoip2: update maxmind geolite country database 2019-10-23 16:58:32 -04:00
adeelehsan
bf10345e3a Merge pull request #22127 from edx/aehsan/prod-734/added_logs
Added logs to investigate the issue
2019-10-24 00:42:36 +05:00
adeelehsan
16d637c63f Added logs to investigate the issue 2019-10-24 00:06:32 +05:00
Manjinder Singh
a40f1d9bd6 BOM-933: Fix type mismatches in various migrations 2 (#22115)
* Fix type mismatches in track migrations

* Fix type mismatches in oauth_dispatch

* Fix type mismatches in badges migrations

* fix type mismatch in contentserver migrations

* Fix type mismatches in mobile_api migrations

* fix type mismatch in crawlers migrations

* fix type mismatch in dark_lang migrations

* fix type mismatch in branding  migrations
2019-10-23 13:04:36 -04:00
Matthew Piatetsky
86bb0cfa2c add discount percentage configuration 2019-10-23 12:00:34 -04:00
Saad Waqar
7fca58f88b replaced brl.hash_value with brl in bulk_get_or_create because it calls bulk_create afterwards and bulk_create uses objects to create VisibleBlocks whereas brl.hash_value would return a string 2019-10-23 20:56:08 +05:00
julianajlk
6e0914ad5d add FPD banner to courseware (#22113)
REV-980
2019-10-23 09:33:11 -04:00
Feanil Patel
98f605e2d6 Merge pull request #22125 from edx/jenkins/upgrade-python-requirements-9f15754
Python Requirements Update
2019-10-23 08:14:00 -04:00
edX requirements bot
add519ceeb Updating Python Requirements 2019-10-23 06:48:58 -04:00
Ayub khan
d081b3a86d BOM-947
certificates: Explicitly Set fields to unicode to avoid migration
2019-10-23 15:15:47 +05:00
Ayub khan
584d00dba9 BOM-946
lms_xblock: Explicitly Set fields to unicode to avoid migration
2019-10-23 15:14:23 +05:00
Ayub khan
49032ba88e BOM-951
waffle_utils: Explicitly Set fields to unicode to avoid migration
2019-10-23 15:11:34 +05:00
Ned Batchelder
9f1575460f Merge pull request #22083 from edx/nedbat/sphinx-openapi
Use sphinxcontrib-openapi to do the heavy lifting of Open API rendering.
2019-10-23 05:43:59 -04:00
Aarif
9ac9a50650 Merge pull request #22094 from edx/BOM-960
Updated the assertion make comparison consistent - BOM-960
2019-10-23 14:12:32 +05:00
Zia Fazal
7a912f3d88 Merge pull request #22072 from edx/ziafazal/ENT-1890
Refactored enterprise unlink code to fix ENT-1890
2019-10-23 13:44:27 +05:00
aarif
d74324a2d8 updated the comparison operation to make comparison consistent (irrespective of the order of items)
changes made to allow non field dictionary comparisons as intended

changes made to fix failure on reading values for dictionaries

updated the comparison operation to make comparison consistent (irrespective of the order of items)

changes made to allow non field dictionary comparisons as intended

changes made to fix failure on reading values for dictionaries
2019-10-23 12:51:54 +05:00