Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,068 Commits 1 Branch 0 Tags
86bb0cfa2c8fd162e288dda0c2139ae5ae08d29b
Commit Graph

52068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Piatetsky
86bb0cfa2c add discount percentage configuration 2019-10-23 12:00:34 -04: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
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
irfanuddinahmad
72490fdf90 Merge pull request #22095 from edx/iahmad/ENT-2372-Version-upgrade-for-edx-enterprise 
ENT-2473: Upgraded edx-enterprise version
 2019-10-22 06:52:58 +05:00
Calen Pennington
b3421c8580 Merge pull request #22084 from cpennington/expose-access-denial-reasons 
Expose access denial reasons inside verticals to the front-end on the…
 2019-10-21 15:44:37 -04:00
adeelehsan
3b528f445c Merge pull request #21950 from edx/aehsan/prod-735/logged_improverd_cache_miss_hit 
Logged improved for cache
 2019-10-21 23:50:37 +05:00
Feanil Patel
aa25b4a365 Merge pull request #22097 from edx/feanil/fix_sandbox_issues 
Feanil/fix sandbox issues
 2019-10-21 14:08:29 -04:00
julianajlk
98f907f23c Revert "add first purchase discount to courseware (#22058)" 
This reverts commit 059b619794.
 2019-10-21 13:57:18 -04:00
julianajlk
059b619794 add first purchase discount to courseware (#22058) 
REV-980.
* moved get_first_purchase_offer_banner_fragment to Discounts utils.py
* added banner wrapper method
* updated banner with time limit
 2019-10-21 13:56:38 -04:00
Feanil Patel
871d62f246 Fix type mismatches in the grades migrations. 
Mixing byte and unicode strings causes migrations to fail.
 2019-10-21 13:32:46 -04:00
Diana Huang
f11380f3ac Merge pull request #21974 from edx/diana/bump-nodeenv-version 
Update nodeenv to the latest version.
 2019-10-21 13:23:15 -04:00
Calen Pennington
4e6e283495 Expose access denial reasons inside verticals to the front-end on the course outline 2019-10-21 12:41:36 -04:00
root
74ed203a75 Upgraded edx-enterprise version 2019-10-21 16:15:40 +00:00
Feanil Patel
13a73fd776 Fix type mismatches in the django_comment_common migrations. 
Mixing byte and unicode strings causes migrations to fail.
 2019-10-21 11:40:54 -04:00
Feanil Patel
215dc84469 Fix type mismatches in the courseware migrations. 
Mixing byte and unicode strings causes migrations to fail.
 2019-10-21 11:30:11 -04:00
Feanil Patel
798dde2156 Fix type mismatches in the course_modes migrations. 
Mixing byte and unicode strings causes migrations to fail.
 2019-10-21 10:56:50 -04:00
Feanil Patel
6584f81198 Fix type mismatches in the course_groups migration. 
Mixing byte and unicode strings causes migrations to fail.
 2019-10-21 10:54:31 -04:00
Feanil Patel
3d51bc7be3 Fix type mismatches in the bookmarks migration. 
Mixing byte and unicode strings causes migrations to fail.
 2019-10-21 10:53:59 -04:00
adeelehsan
c2600c44f2 Logged improved for cache 
prod-735
 2019-10-21 19:36:10 +05:00
Feanil Patel
ac76eda862 Open the image file as binary. 2019-10-21 10:31:50 -04:00
Feanil Patel
db06acb559 Merge pull request #22089 from edx/jenkins/upgrade-python-requirements-955bf05 
Python Requirements Update
 2019-10-21 10:13:23 -04:00
Diana Huang
a6bf511b43 Update nodeenv to the latest version. 
Also update node-sass to a compatible version.
Include a regenerated package-lock.
 2019-10-21 09:46:52 -04:00
Awais Qureshi
91e5ab93de Merge pull request #22073 from edx/awais786/accept_tests 
Fixing python3 ordering issue in acceptance tests.
 2019-10-21 17:15:53 +05:00
Aarif
75e2df1476 Merge pull request #22074 from edx/BOM-934 
Fix: Bokchoy "TypeError: write() argument must be str, not bytes"
 2019-10-21 17:00:48 +05:00
Aarif
eba7960e45 Merge pull request #22088 from edx/BOM-958 
Updated the social link creation to return social links sorted - BOM-958
 2019-10-21 16:40:51 +05:00