Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,340 Commits 1 Branch 0 Tags
667df875bdb2bb66546b395d3aba2c9e3f40b0f7
Commit Graph

53340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Awais Qureshi
2ac5173eb4 Merge pull request #22106 from edx/awais786/vdo_handlers_py3 
Fixing bytes issue.
 2019-10-23 12:25:03 +05:00
Zia Fazal
7ccd2a6901 Refactored enterprise unlink code to fix ENT-1890 
Refactored enterprise unlink code to fix ENT-1890

Fixed quality violations and brokent test

Fixed pylint quality violations

Fixed failing unit test

Fixed broken test after rebasing with master
 2019-10-23 11:35:58 +05:00
Awais Qureshi
3959bdf1ea BOM-937 
Open a file in read binary mode to avoid bytes issues.
 2019-10-23 10:44:21 +05:00
Jeremy Bowman
d4b0968e3a Fix JSON parsing in edxnotes.helpers BOM-990 (#22122) 2019-10-22 17:57:01 -04:00
edX cache uploader bot
cf53a3f4bb Updating Bokchoy testing database cache (#22119) 2019-10-22 17:49:09 -04:00
Ned Batchelder
d71224e0a1 Use sphinxcontrib-openapi to do the heavy lifting of Open API rendering. 2019-10-22 17:45:28 -04:00
Hassan
29828d781c Merge pull request #21969 from edx/hassan/backfill-history 
Added management command to populate history from snapshot data.
 2019-10-23 02:13:10 +05:00
Robert Raposa
8c9d63ef6c Fix typo in comment (#22121) 2019-10-22 17:04:42 -04:00
Hassan Javeed
edb732d83a Added management command to populate history as of 06/29. 2019-10-23 01:43:13 +05:00
Feanil Patel
384c44402e Merge pull request #22114 from edx/feanil/fix_asset_issue 
Make settings regex non greedy.
 2019-10-22 16:39:15 -04:00
Chris Pappas
54b4d929f2 Bumping edx-enterprise via make upgrade (#22120) 2019-10-22 16:02:53 -04:00
David Ormsbee
5abc18cbe4 Merge pull request #21913 from open-craft/completion-learning-contexts 
Change completion API to work with any learning context
 2019-10-22 08:39:33 -10:00
Alex Wang
f2b705cc95 Data migration for CourseTeam (#22116) 
MST-17

* Data migration: Alter CharField to SlugField for 2 fields in CourseTeam model
 2019-10-22 14:30:18 -04:00
Feanil Patel
5bfdcad0f5 Make settings regex non greedy. 
I'm surprised this didn't cause an issue before but as far as I can
figure this should always be non-greedy.  I think it worked before
because the items we were looking for was previously the last item
in the list but that is no longer the case in python 3 because of
dictionary order changes.
 2019-10-22 14:19:42 -04:00
Braden MacDonald
5fc73468b3 Change completion API to work with any learning context 2019-10-22 14:04:31 -04:00
Kyle McCormick
7dbee1c3dd Ensure Python 3 compatibility of Teams djangoapp (#22096) 
* For all files, from __future__ import unicode_literals.
* Add @python_2_unicode_compatible to both models.
* Test six.string_type(obj) for both models.

Also, fix some new pylint warnings and improve model repr methods.

MST-24
 2019-10-22 13:42:27 -04:00
Diana Huang
606b91d66b Merge pull request #22117 from edx/diana/update-node-jenkins 
Update node version used for Jenkins.
 2019-10-22 13:09:15 -04:00
Diana Huang
c4a8dc9eb7 Update node version used for Jenkins. 2019-10-22 12:33:32 -04:00
Feanil Patel
9946fd3918 Merge pull request #22099 from edx/revert-22058-julianajlk/REV-980/first-purchase-discount-courseware 
Revert "add first purchase discount to courseware (#22058)"
 2019-10-22 09:39:08 -04:00
Manjinder Singh
936e1d48a3 BOM-928: Fixing test error due to dict ordering (#22055) 
* Fixing test error due to dict ordering

* Dict ordering fixes

* replacing dict with list to maintain consistency

* better html parsing
 2019-10-22 09:30:24 -04:00