Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,900 Commits 1 Branch 0 Tags
aebdf77f8e5a86187e27115ca4c2711928c752ad
Commit Graph

50900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill DeRusha
aebdf77f8e Revert "PROD-145: Added validation to discussion topic input in studio, testing 2" 2019-08-20 20:31:15 -04:00
Matt Hughes
0ad8753cd6 Add waffle for hiding bulk management in masters courses 2019-08-20 16:32:13 -04:00
Chris Pappas
c3da1374bf Running make upgrade to bump edx-enterprise (#21390) 2019-08-20 16:02:19 -04:00
Andytr1
a911813153 Merge pull request #21387 from edx/andytr1/update_bulk_grades 
updated bulk grades version
 2019-08-20 14:31:37 -04:00
atesker
ff5f49b89f updated bulk grades version 2019-08-20 13:56:00 -04:00
Diana Huang
4a1949661d Merge pull request #21380 from edx/diana/microsite-removal 
Remove the microsites djangoapp.
 2019-08-20 13:52:31 -04:00
Christie Rice
abe12c89b8 ENT-1321 Upgrade requirements (#21386) 2019-08-20 12:49:45 -04:00
Diana Huang
c94ffcdc72 Remove the microsites djangoapp. 2019-08-20 12:31:51 -04:00
Awais Qureshi
3f3caba0da Merge pull request #21360 from edx/awais786/BOM-88 
BOM-88
 2019-08-20 20:51:32 +05:00
edX cache uploader bot
be000cb8cd Updating Bokchoy testing database cache (#21379) 2019-08-20 11:29:33 -04:00
Feanil Patel
6e6c489f1f Merge pull request #21372 from edx/feanil/fix_cmp_issues 
Fix a few issues we run into when running tests in python 3.
 2019-08-20 11:28:23 -04:00
Feanil Patel
74904339dd Go from a courselocator to a unicode string. 
We don't need the ignore since courselocators sholud be
managing unicode already.
 2019-08-20 10:59:42 -04:00
arbisoft
44c798feb2 Fixing encode/decode issues for python3. 2019-08-20 14:10:37 +05:00
Chris Pappas
b22f08a414 Removing edx-enterprise from constraints and running make upgrade to bump version to 1.9.1 (#21377) 2019-08-19 17:32:46 -04:00
Feanil Patel
5ea74e0282 Ensure that the course_id is unicode. 2019-08-19 15:28:37 -04:00
Matt Hughes
b897f58ae6 bug fix blocking gradebook 
JIRA:PROD-553
 2019-08-19 15:10:57 -04:00
Jeremy Bowman
97c0684755 Cleaner fix for byte conversion in from_xml 2019-08-19 14:26:08 -04:00
Diana Huang
eaec9febb4 Merge pull request #21355 from edx/diana/microsite-deletion-migrations 
Deletion migration for microsites tables.
 2019-08-19 13:34:44 -04:00
Stu Young
b3556ba2ee use archived venv on jenkins (#21378) 2019-08-19 12:55:58 -04:00
Feanil Patel
68933ec089 Fix quality issues. 2019-08-19 11:51:30 -04:00
Feanil Patel
7c8d9dd422 Downgrade edxval because 1.1.26 was never released to PyPI. 2019-08-19 11:28:41 -04:00
Feanil Patel
085b6b9468 Fix runtime error where dict is modified during iteration. 2019-08-19 11:16:29 -04:00
Feanil Patel
7a3230a260 Fix another discussions test. 2019-08-19 11:16:26 -04:00
Dave St.Germain
bc2e87db5c Update edx-val 2019-08-19 11:15:10 -04:00
Nimisha Asthagiri
38333624ac Fixes for test_retire_order.py 2019-08-19 11:06:00 -04:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375) 
Convert response bytes to str before JSON parsing.
 2019-08-19 11:01:55 -04:00
Feanil Patel
1367b0cf3d Move the unicode_compatible decorator to the class. 2019-08-19 11:00:25 -04:00
Feanil Patel
65eebe63e7 Hash byte strings. 2019-08-19 11:00:22 -04:00
Dave St.Germain
3275388276 Merge branch 'feanil/fix_cmp_issues' of github.com:edx/edx-platform into feanil/fix_cmp_issues 2019-08-19 10:54:46 -04:00
Dave St.Germain
0267b5c85f Fix issue of out of order calls 2019-08-19 10:54:39 -04:00
Nimisha Asthagiri
b7019bddff CourseInfoTestCase fixes for "a bytes-like object is required, not 'str'" 2019-08-19 10:54:12 -04:00
Feanil Patel
1bfa575ada Update discussion api tests. 
json doesn't do any magic with byte strings in python 3.  In python 2 it
used to convert str objects to unicode automatically.
 2019-08-19 10:48:30 -04:00
Ayub
4ba1792034 Merge pull request #21361 from edx/BOM-87 
BOM-87
 2019-08-19 19:43:57 +05:00
Nimisha Asthagiri
b80fd1f843 Fix for 'UUID' object has no attribute 'get_hex' in openedx/core/lib/xblock_utils/__init__.py 2019-08-19 10:36:43 -04:00
Dave St.Germain
063c6fa1e5 Reload has moved in python3 2019-08-19 10:35:08 -04:00
Nimisha Asthagiri
05e1ec5bc0 Fix "TypeError: cannot use a string pattern on a bytes-like object" in cookies.py 2019-08-19 10:29:08 -04:00
Dave St.Germain
5febcce20c Fix python3 compatibility in SafeCookieData and elsewhere 2019-08-19 10:24:15 -04:00
Feanil Patel
269a57445d Fix a few issues we run into when running the discussion tests. 2019-08-19 10:14:29 -04:00
Ayub khan
ea0c6922fe BOM-87 
Fixed the test for py3.
 2019-08-19 18:52:19 +05:00
Feanil Patel
4c07dddc01 Merge pull request #21364 from edx/feanil/more_safe_session_fixes 
More python 3 fixes in the safe_sessions middleware.
 2019-08-19 09:41:09 -04:00
edx-pipeline-bot
b7392d809f Merge pull request #21368 from edx/private_to_public_53f6d7f 
Mergeback PR from private to public.
 2019-08-19 15:24:43 +05:00
adeelehsan
1eda18a317 Merge pull request #21367 from edx/private_to_public_76a13fa 
Mergeback PR from private to public.
 2019-08-19 15:06:30 +05:00
AsadAzam
53f6d7fe15 Merge pull request #157 from edx/asad/prod-471 
social link validation
 2019-08-19 14:57:21 +05:00
Waheed Ahmed
912dfe4a63 Merge pull request #21366 from edx/waheed/remove-newrelic-constraint 
Newrelic released a patch, removing constraint.
 2019-08-19 14:49:50 +05:00
adeelehsan
76a13fae73 Merge pull request #156 from edx/aehsan/prod-349/remove_google_api_key_from_github 
Removed google api key from github
 2019-08-19 14:32:26 +05:00
Waheed Ahmed
8dc9ccd2ec Newrelic released a patch, removing constraint. 
PROD-533
 2019-08-19 14:20:03 +05:00
Feanil Patel
c2d76a6072 More python 3 fixes in the safe_sessions middleware. 2019-08-17 23:03:41 -04:00
Zainab Amir
db67a212e8 Remove create_user management command (#21322) 
Our internal docs suggest using manage_user instead of create_user. We
are no longer using it and it can be removed

LEARNER-3934
 2019-08-17 13:50:58 +05:00
Matt Hughes
ecd4a95507 Allow interventions CSV download via gradebook to be filtered 
JIRA:EDUCATOR-4537
 2019-08-16 17:05:06 -04:00
Diana Huang
3455ff7393 Deletion migration for microsites tables. 2019-08-16 16:30:01 -04:00