Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,985 Commits 1 Branch 0 Tags
77eb01ff42ca5d85b2eeb5f48e682c3caa058dfc
Commit Graph

51985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Wang
77eb01ff42 resolve pylint violations in lms/djangoapps/teams (#22063) 
MST-6
 2019-10-18 10:20:55 -04:00
Jeremy Bowman
df38babb7e Archive bok-choy JUnit XML files (#22071) 2019-10-18 10:18:42 -04:00
syedimranhassan
69d0726366 Merge pull request #22077 from edx/revert-22076-ihassan/OPS-3772_clean_up_rendering_code_new_vars 
Revert "Added new variables from configuration repo"
 2019-10-18 17:45:54 +05:00
syedimranhassan
99bda3cfd3 Revert "Added new variables from configuration repo" 2019-10-18 17:44:58 +05:00
syedimranhassan
07a2d5e6ca Merge pull request #22076 from edx/ihassan/OPS-3772_clean_up_rendering_code_new_vars 
Added new variables from configuration repo
 2019-10-18 16:23:25 +05:00
syedimranhassan
6ad9458ffb Added new variables from configuration repo 2019-10-18 15:55:28 +05:00
Ben Holt
523bb0ea5d Add stable_bucketer helper tool (#21783) 
Add stable_bucketer helper tool
 2019-10-17 21:47:26 -04:00
Manjinder Singh
e4b30e7bf3 BOM-931: explicitly setting strings to unicode (#22064) 
* explicitly setting strings to unicode
 2019-10-17 15:32:58 -04:00
Adam Blackwell
ab0ee301cc Merge pull request #22065 from edx/adzuci/ownership-theme-changes 
Minor changes to CODEOWNERS file.
 2019-10-17 14:27:13 -04:00
Emma Green
bb14195685 Merge pull request #22067 from edx/move-anon-user-check-earlier 
move the anonymous check earlier so that it cannot error out when it …
 2019-10-17 13:35:23 -04:00
Calen Pennington
2da9a00d58 Merge pull request #22066 from cpennington/select-related-course-overviews 
Pre-select the course overview during dashboard loading
 2019-10-17 13:31:20 -04:00
Ayub
d6c99de909 BOM-418 TypeError: unhashable type: SequenceDescriptorWithMixins (#22051) 
DescriptorWithMixins are dynamically created and do not have a hash
class method. Those classes had hash values in python2 but do not
have a default hash in python3. Thus those class objects can not be
used as dict keys. Used location of section/unit instead of real object
for cache dict. Location object is hashable.
 2019-10-17 13:23:31 -04:00
Calen Pennington
97cc816d0b Pre-select the course overview during dashboard loading 2019-10-17 13:02:02 -04:00
Emma Green
def6bced98 move the anonymous check earlier so that it cannot error out when it expects a non-anonymous user 2019-10-17 12:54:36 -04:00
Calen Pennington
229a2e3968 Merge pull request #22043 from cpennington/graded-markers-course-outline 
Add graded and scored markers to the course outline
 2019-10-17 12:47:32 -04:00
Adam Blackwell
7758df4e25 OWNERS file formatting changes. 2019-10-17 12:23:41 -04:00
Calen Pennington
7ceb0e30fa Mark course outline with graded and scored status in the DOM so that we can run optimizely code on them 2019-10-17 12:14:49 -04:00
Jeremy Bowman
e258fab1ea Fix YouTube stub under Python 3 BOM-930 (#22056) 2019-10-17 10:43:04 -04:00
Jeremy Bowman
b351e58c25 Fix bulk email i18n tests under Python 3 BOM-927 (#22052) 2019-10-17 10:40:47 -04:00
Feanil Patel
14f9b5dd35 Merge pull request #22060 from edx/jenkins/upgrade-python-requirements-65c7332 
Python Requirements Update
 2019-10-17 10:08:57 -04:00
Awais Qureshi
744e40f62a Merge pull request #22061 from edx/awais786/transcript_issues 
BOM-932
 2019-10-17 17:41:16 +05:00
Awais Qureshi
3d58a0ded8 BOM-932 
Fixing byte issues.
 2019-10-17 17:05:13 +05:00
edX requirements bot
9e414cceaa Updating Python Requirements 2019-10-17 06:48:39 -04:00
syedimranhassan
65c7332965 Merge pull request #21951 from edx/ihassan/OPS-3772_clean_up_rendering_code_cms 
Move cms defaults from configuration repo
 2019-10-17 13:06:14 +05:00
syedimranhassan
559e280bee Move cms defaults from configration repo 2019-10-17 12:28:35 +05:00
syedimranhassan
480d7875c7 Move cms defaults from configration repo 2019-10-17 12:26:50 +05:00
syedimranhassan
e861b88871 Merge pull request #21859 from edx/ihassan/OPS-3772_clean_up_rendering_code 
Move lms defaults from configration repo
 2019-10-17 12:25:35 +05:00
syedimranhassan
e0eede4002 Move lms defaults from configration repo 2019-10-17 11:54:46 +05:00
syedimranhassan
549079ba86 Move lms defaults from configration repo 2019-10-17 11:24:56 +05:00
syedimranhassan
a7fbea6fbb Move lms defaults from configration repo 2019-10-17 11:19:42 +05:00
edX Transifex Bot
e3479587d2 geoip2: update maxmind geolite country database 2019-10-16 17:03:32 -04:00
Aarif
47e1785a89 Merge pull request #21990 from edx/BOM-911 
Added the util to handle bytes input to json.loads function - BOM-911
 2019-10-17 01:24:36 +05:00
Jeremy Bowman
24bb73ed16 Add random2 to codejails (#22054) 2019-10-16 14:20:46 -04:00
Matthew Piatetsky
7436f9c186 Merge pull request #21915 from edx/REV-733 
[REV-733] check if discount expired
 2019-10-16 12:03:58 -04:00
Matthew Piatetsky
f6d0bf77df check if discount expired 2019-10-16 11:32:27 -04:00
julianajlk
4d3d6c0178 add dynamic_upgrade_deadline to user-metadata (#22046) 
REV-943

* added dynamic and course_upgrade_deadline to user-metadata
 2019-10-16 11:07:32 -04:00
Chris Pappas
0e1dba1b24 ENT-1289 | Running make upgrade to bump edx-enterprise (#22047) 2019-10-16 10:18:15 -04:00
edX cache uploader bot
c27643e5ce Updating Bokchoy testing database cache (#22049) 2019-10-16 10:15:41 -04:00
Feanil Patel
5da7a98d63 Merge pull request #22050 from edx/jenkins/upgrade-python-requirements-98b381d 
Python Requirements Update
 2019-10-16 08:51:15 -04:00
edX requirements bot
96112149ac Updating Python Requirements 2019-10-16 06:49:07 -04:00
Ayub
98b381d4ac Merge pull request #22048 from edx/bump-recommender-xblock-version 
-version bump recommender-xblock
 2019-10-16 15:24:23 +05:00
Ayub khan
f168aa16ae -version bump recommender-xblock 2019-10-16 14:36:13 +05:00
Awais Qureshi
f529e2e393 Merge pull request #22033 from edx/awais786/bom-415-ora2 
awais786/bom 415 ora2
 2019-10-16 14:15:58 +05:00
aarif
164141def9 replaced json.loads with a util to handle bytes 
changes made to fix jenkins/quality errors

changes made as suggested

added the docstring to fix quality issue

made a few changes to fix some tests

replaced json.loads with a util to handle bytes

changes made to fix jenkins/quality errors

changes made as suggested

added the docstring to fix quality issue

made a few changes to fix some tests

made changes as suggested

made changes as suggested

updated the requirements with make upgrade
 2019-10-16 12:14:01 +05:00
Awais Qureshi
6bf8cfc5bd BOM-415 
Bump the edx-ora2 version.
Run make upgrade.
 2019-10-16 11:56:46 +05:00
Aarif
6e7f2f61ef Merge pull request #21994 from edx/BOM-914 
Fixed all instances of "TypeError: a bytes-like object is required, not 'str" - BOM-914
 2019-10-16 01:44:31 +05:00
Ned Batchelder
69255bee73 Merge pull request #21816 from regisb/regisb/simplify-swagger-auto-schema 
Regisb/simplify swagger auto schema
 2019-10-15 14:35:46 -04:00
edX cache uploader bot
f37de7464c Updating Bokchoy testing database cache (#22044) 2019-10-15 14:29:16 -04:00
Matt Hughes
b14ce70053 Add program enrollment status option: ended 
We'd like to add this status to help distinguish between learners
who've graduated from the program and learners who warranted some sort
of removal from the program.

JIRA:EDUCATOR-4702
 2019-10-15 12:47:20 -04:00
Feanil Patel
9de36477ea Merge pull request #22040 from edx/jenkins/upgrade-python-requirements-149f47f 
Python Requirements Update
 2019-10-15 10:13:44 -04:00