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

49248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zubair-arbi
c97366bd7b ENT-1392 bump enterprise version to 1.2.2 2019-01-09 18:01:59 +05:00
Saleem Latif
5624948e5b Merge pull request #19551 from edx/saleem-latif/ENT-1437 
ENT-1437 : Make sure only active AccountRecovery records are used
 2019-01-09 17:14:06 +05:00
Saleem Latif
2c9021e480 Make sure only active AccountRecovery records are used 2019-01-09 16:33:12 +05:00
Agha Awais
b5e97aeb0c Merge pull request #18846 from edx/awais/lett_2_bc_html_editor_I 
TE-2625: HTML editor bokchoy tests I
 2019-01-09 15:49:22 +05:00
AsadAzam
3f75ca4c72 Merge pull request #19337 from edx/asad/educator-366-enable-quality-waffle 
Added enable quality waffle flag
 2019-01-09 11:43:58 +05:00
Julia Eskew
e3b14199f0 Merge pull request #19558 from edx/juliasq/return_proper_user_post_retirement 
Fix same username w/different case special-case.
 2019-01-08 16:13:31 -05:00
Diana Huang
6572d99e76 Remove all references to datadog from our code. 2019-01-08 15:41:24 -05:00
Julia Eskew
b350db7ede Read salt for retirement hashing from config. 2019-01-08 15:25:20 -05:00
Alex Dusenbery
577315f2a7 Refactor how grade override values are persisted. 2019-01-08 15:21:04 -05:00
Julia Eskew
39accc0ae9 Make hash generation method private. 2019-01-08 15:08:59 -05:00
Julia Eskew
ad2cdb8c90 Fix the special case of same username/diff case and add test. 2019-01-08 15:08:59 -05:00
Michael Youngstrom
f7d10b603a Merge pull request #19557 from edx/youngstrom/diff-quality-fix 
Always include origin for target_branch in diff quality
 2019-01-08 13:42:42 -05:00
Michael Youngstrom
3a221788ec include origin for target_branch in diff quality 2019-01-08 12:58:46 -05:00
Jeremy Bowman
f8dc051c44 Merge pull request #19546 from edx/jmbowman/TE-2731 
TE-2731 Upgrade to pytest-cov 2.6.0
 2019-01-08 12:28:30 -05:00
Michael Youngstrom
675b71b617 Merge pull request #19549 from edx/youngstrom/fix-testing-problems 
Fix python and quality target branches
 2019-01-08 11:53:34 -05:00
Jeremy Bowman
d0d6d57343 TE-2731 Upgrade to pytest-cov 2.6.1 2019-01-08 11:05:45 -05:00
Michael Youngstrom
592ab1eb86 Fix quality and python private jobs 2019-01-08 10:36:36 -05:00
Matthew Piatetsky
7e5ed2df4b Merge pull request #19534 from edx/REVMI-31 
clean up where access checks happen
 2019-01-08 10:27:20 -05:00
asadazam93
e451324ed3 Added enable quality waffle flag 2019-01-08 17:14:41 +05:00
Guruprasad Lakshmi Narayanan
df45fe8317 Create a staff-only API to list all course enrollments 
This data can be used by external frontends or other apps. The list
of course enrollments can optionally be filtered by course id or
usernames.
 2019-01-08 17:27:46 +05:30
Matthew Piatetsky
c9dc4d116f clean up where access checks happen 2019-01-07 17:02:33 -05:00
Gabe Mulley
a86d499592 Merge pull request #19470 from edx/bfiller/REVE-189 
Conditionalize track selection based on all FBE settings
 2019-01-07 15:42:28 -05:00
Matthew Piatetsky
debb502532 Merge pull request #19552 from edx/REVMI-74 
enable searching for course in FBE admin
 2019-01-07 15:17:47 -05:00
Christie Rice
dc4579f5dd Merge pull request #19536 from edx/crice/INCR-38 
INCR-31 INCR-38 Remove constraint on pysrt and run make upgrade
 2019-01-07 15:12:56 -05:00
Dave St.Germain
3d57f1d7d9 Merge pull request #19548 from edx/dcs/add-proctortrack 
Add proctortrack library
 2019-01-07 14:49:24 -05:00
Christie Rice
59ed45c91a Pin pillow to 5.3.0 2019-01-07 14:38:43 -05:00
Christie Rice
ba652117ab INCR-31 INCR-38 Remove constraint on pysrt and run make upgrade 2019-01-07 14:38:43 -05:00
Calen Pennington
dc8aa9dae4 Merge pull request #19547 from cpennington/add-test-for-fbe-banner 
Add a test of the FBE Upgrade banner
 2019-01-07 14:26:20 -05:00
Dave St.Germain
fcf7c1b4e3 Update edx-proctoring version 2019-01-07 14:10:03 -05:00
Matthew Piatetsky
eec02b94c7 enable searching for course in FBE admin 2019-01-07 13:59:20 -05:00
Cali
a2452de4a9 Merge pull request #19471 from edx/cstenson/upgrade_link_refactor 
Refactor verified_upgrade_link_is_valid to directly call Ecom service
 2019-01-07 13:55:40 -05:00
Calen Pennington
8b014e1fef Add a test of the FBE Upgrade banner 
REV-656
 2019-01-07 13:11:35 -05:00
Bill Filler
c253374372 Conditionalize track selection based on settings of course duration and content gating 2019-01-07 09:47:37 -05:00
Brian Mesick
b35cf731a1 Merge pull request #19367 from open-craft/giovanni/bb-674-django-configuration-preferences 
BB-674 - Change Django's configuration precedence in manage.py
 2019-01-07 09:25:12 -05:00
Dave St.Germain
287692f515 Add proctortrack library 2019-01-04 16:19:01 -05:00
Brian Beggs
1fa2570aab Merge pull request #19459 from edx/amannan/DE-1171 
Add revenue field to completed order event
 2019-01-04 16:08:30 -05:00
Abdul Mannan
ac81c5ea68 Add revenue field to completed order event 2019-01-04 15:19:58 -05:00
Brian Beggs
bd76eee0bf Merge pull request #19474 from edx/amannan/DE-1172 
Add email in course enrollment event
 2019-01-04 15:14:36 -05:00
Cali Stenson
7cbe1312a9 Refactor verified_upgrade_link_is_valid to directly call Ecommerce service. 
Additionally update code documentation to clarify expected behavior around
dynamic pacing deadlines.

REVO-69
 2019-01-04 15:07:39 -05:00
Julia Eskew
219fb0021d Merge pull request #19542 from edx/juliasq/bump_django_version_1_11_18 
Bump Django version to 1.11.18
 2019-01-04 14:51:03 -05:00
Julia Eskew
7948e2a1c9 Bump Django version to 1.11.18 2019-01-04 13:46:37 -05:00
Jeremy Bowman
1f39777876 Merge pull request #19396 from regisb/regisb/faster-npm 
Faster "npm install" without progress bar
 2019-01-04 13:45:44 -05:00
noraiz-anwar
3b7918b07a Add basic pagination in video upload page 2019-01-04 23:06:57 +05:00
Matthew Piatetsky
5350064731 Merge pull request #19540 from edx/rev-655/upgrade-deadline-bug 
REV-655: Fix upgrade deadline bug
 2019-01-04 12:05:47 -05:00
Michael Youngstrom
c983ee312b Merge pull request #19544 from edx/youngstrom/fix-jenkinsfiles 
Fix context name for bokchoy/quality master pipelines
 2019-01-04 11:53:31 -05:00
Michael Youngstrom
817ee46ec2 Fix context name 2019-01-04 11:41:20 -05:00
Gabe Mulley
be3dd7e491 REV-655: Fix upgrade deadline bug 2019-01-04 10:57:45 -05:00
Michael Youngstrom
5479dbf533 Merge pull request #19541 from edx/youngstrom/update-package-lock 
Update version of edx-proctoring-proctortrack
 2019-01-04 10:56:15 -05:00
Michael Youngstrom
26bd94d1ed Update version of edx-proctoring-proctortrack in package-lock.json 2019-01-04 10:17:58 -05:00
Michael Youngstrom
5724e2d003 Merge pull request #19528 from edx/testeng/bokchoy_auto_cache_update_c5723d94dfc978ce45a036693d6264f52b4e71be 
Bokchoy db cache update
 2019-01-03 16:08:31 -05:00