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

51562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Awais Qureshi
2c8b17a153 Merge pull request #21741 from edx/awais786/BOM-594 
awais786/bom 594
 2019-09-24 14:24:25 +05:00
Zainab Amir
ad41b7b2c0 Use edx-ui-toolkit for KeyCodes (#21743) 
PROD-687
 2019-09-24 13:42:56 +05:00
Aarif
2f5998f085 Merge pull request #21626 from edx/BOM-457 
BOM-457
 2019-09-24 12:33:17 +05:00
aarif
07b5c954b0 python 3 fixes 
test fixes

python 3 fixes

minor fixes

python 3 fixes

quality fixes

quality fixes
 2019-09-24 12:01:02 +05:00
noraiz-anwar
a596579e62 patch jquery's extend 2019-09-24 10:53:10 +05:00
Andytr1
73a89a876e Merge pull request #21746 from edx/andytr1/remove-persistence-subsec-history-model 
EDUCATOR-4670 - pr 1 - remove usage of persistsubsectionoride history
 2019-09-23 16:00:09 -04:00
Emma Green
cf6f9ea06a Merge pull request #21739 from edx/emma-green/REV-970/enterprise-users-should-not-get-first-purchase-discount 
enterprise users should not get the first purchase discount
 2019-09-23 15:04:09 -04:00
Emma Green
4783aed927 Enterprise users should not get the first purchase discount. 2019-09-23 14:30:38 -04:00
Feanil Patel
9633e3cd1a Pull the recommender xblock from PyPI. 2019-09-23 11:52:26 -04:00
Alex Dusenbery
a379dddc1e Remove faker==2.0.1 constraint; upgrade edx-bulk-grades to 0.6.2 2019-09-23 11:38:19 -04:00
Ned Batchelder
e1a3d66143 Merge pull request #21220 from eduNEXT/coa/course-index-regex 
Making the regex that gets the index courses more secure
 2019-09-23 11:32:28 -04:00
atesker
47d32f0ef5 EDUCATOR-4670 - pr 1 - remove usage of persistsubsectionoride history 
remove unused param
 2019-09-23 11:04:30 -04:00
Nimisha Asthagiri
41c392493b Merge pull request #21587 from edx/arch/rename-fed-repos 
Rename cookie-policy-banner to frontend-component-cookie-policy-banner
 2019-09-23 10:25:01 -04:00
aarif
822af10479 python 3 fixes 
quality fixes
 2019-09-23 19:22:40 +05:00
Aarif
9fc5b70f1b Merge pull request #21702 from edx/BOM-736 
BOM-736
 2019-09-23 19:16:14 +05:00
Stu Young
e7e7873e96 fix variable in feature toggle script (#21737) 2019-09-23 09:41:18 -04:00
Kyle McCormick
775d2fd807 Revert "Create Python API for program_enrollments: Part IV" 
This reverts commit af4e7a348a.

After merging the above commit, I was seeing 'internal-error's
on Stage in responses to the Registrar API. I am temporarily
reverting it until I can figure out a fix.
 2019-09-23 09:39:01 -04:00
aarif
70f51de25b python 3 fixes 
quality fixes

python 3 fixes

quality fixes
 2019-09-23 17:21:37 +05:00
Nimisha Asthagiri
6bc34727e4 Update package.json via npm install 2019-09-23 07:32:47 -04:00
aarif
54cb483fc0 python 3 fixes 2019-09-23 15:30:18 +05:00
Aarif
e7a509faf0 Merge pull request #21704 from edx/BOM-724 
BOM-724
 2019-09-23 14:24:35 +05:00
Nimisha Asthagiri
2b8e6b0806 Rename cookie-policy-banner to frontend-component-cookie-policy-banner 2019-09-22 20:47:34 -04:00
edX Transifex Bot
a51c362561 fix(i18n): update translations 2019-09-22 17:22:49 -04:00
Awais Qureshi
8fcb74efa4 BOM-594 
Python3 fix.
 2019-09-22 04:25:31 +05:00
Awais Qureshi
0dcee53c1c BOM-594 
Python3 fix.
 2019-09-21 23:42:54 +05:00
Awais Qureshi
d8e49fadab Merge pull request #21727 from edx/awais786/BOM-637 
BOM-637
 2019-09-21 17:59:58 +05:00
Awais Qureshi
ec7f575474 Merge pull request #21678 from edx/awais786/BOM-482 
Awais786/bom 482
 2019-09-21 17:58:13 +05:00
Hassan
bada715554 Merge pull request #21716 from edx/hassan/courseoverview-history 
Management command to add history to course_overviews_courseoverview.
 2019-09-21 00:35:03 +05:00
Hassan Javeed
23cd4d9899 Management command to add history to course_overviews_courseoverview. 2019-09-20 23:50:01 +05:00
Awais Qureshi
a0e4e94e31 BOM-482 
Fixing python3
 2019-09-20 20:18:18 +05:00
Matthew Piatetsky
d6dbaabd33 Merge pull request #21720 from edx/emma-green/use-the-user-from-parameter-to-check-flag 
use the specified user from the parameter to determine if the flag is…
 2019-09-20 10:49:23 -04:00
Kyle McCormick
af4e7a348a Create Python API for program_enrollments: Part IV 
This commit completes the program_enrollments LMS app
Python API for the time being. It does the following:
* Add bulk-lookup of users by external key in api/reading.py
* Add bulk-writing of program enrollments in api/writing.py
* Move grade-reading to api/grades.py
* Refactor api/linking.py to use api/writing.py
* Refactor signals.py to use api/linking.py
* Update rest_api/v1/views.py to utilize all these changes
* Update linking management command and support tool to use API
* Remove outdated tests from test_models.py
* Misc. cleanup

EDUCATOR-4321
 2019-09-20 09:55:13 -04:00
Kyle McCormick
298c3498ae Add course_exists utility to CourseOverview class 2019-09-20 09:55:13 -04:00
Kyle McCormick
14d650a522 Style fix: de-dent docstring in linking.py 2019-09-20 09:55:13 -04:00
Ayub
1fda63900c Merge pull request #21666 from edx/BOM-314 
BOM-314
 2019-09-20 18:35:59 +05:00
Ayub
1ac77d8a85 Merge pull request #21691 from edx/BOM-376 
BOM-376
 2019-09-20 18:34:11 +05:00
Awais Qureshi
62595bba75 BOM-581 
Fixing python3
 2019-09-20 18:32:22 +05:00
edX cache uploader bot
79836c3840 Updating Bokchoy testing database cache (#21724) 2019-09-20 09:18:54 -04:00
Feanil Patel
c81cbe8327 Merge pull request #21729 from edx/jenkins/upgrade-python-requirements-a85b30a 
Python Requirements Update
 2019-09-20 09:08:50 -04:00
Feanil Patel
57af13ddc4 Merge pull request #21721 from edx/python3-swarm-2 
Python3 swarm 2
 2019-09-20 08:48:19 -04:00
Awais Qureshi
f10df9dd5e BOM-581 
Fixing python3
 2019-09-20 16:30:15 +05:00
Awais Qureshi
75b5fffb87 BOM-584 
Fixing python3
 2019-09-20 16:11:47 +05:00
Awais Qureshi
718fb0f5b8 BOM-585 
Fixing python3
 2019-09-20 16:03:28 +05:00
Ayub khan
6f1d379a0f BOM-376 
python3 compatibility fixes all tests
 2019-09-20 16:01:06 +05:00
Ayub khan
7d055023bb BOM-314 
python3 compatibility
 2019-09-20 15:50:48 +05:00
edX requirements bot
04aa8fb7fd Updating Python Requirements 2019-09-20 06:49:36 -04:00
Ayub
a85b30a8b4 Merge pull request #21703 from edx/BOM-273 
BOM-273
 2019-09-20 15:41:54 +05:00
Ayub
39fed7c8fa Merge pull request #21706 from edx/BOM-723 
BOM-723
 2019-09-20 15:39:43 +05:00
Ayub
014954cab1 Merge pull request #21709 from edx/BOM-629 
BOM-629
 2019-09-20 15:34:05 +05:00
Ayub
fe61a3cddc Merge pull request #21712 from edx/BOM-574 
BOM-574
 2019-09-20 15:32:36 +05:00