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

48221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Michael Youngstrom
92fe1db89c Merge pull request #19533 from edx/youngstrom/fix-python-lettuce-pipe 
Allow merge builds for python/lettuce pipelines
 2019-01-03 15:42:45 -05:00
edx-cache-uploader-bot
2167e82bf2 Updating migrations 2019-01-03 15:23:38 -05:00
Michael Youngstrom
c2f57f975b Allow merge builds for lettuce and python 2019-01-03 15:08:39 -05:00
Ned Batchelder
38aea7f5eb Merge pull request #19532 from edx/nedbat/dont-inherit-from-tuple 
Use a regular class instead of a tuple
 2019-01-03 10:22:47 -05:00
Ned Batchelder
78ed56cf9a Use a regular class instead of a tuple 2019-01-02 18:23:25 -05:00
Muhammad Ammar
9110a81e93 Merge pull request #19499 from edx/ammar/ENT-1416-update-enterprise-version 
update enterprise version to 1.2.1
 2019-01-03 02:46:04 +05:00
Calen Pennington
c1e38a19cb Merge pull request #19529 from cpennington/use-upgrade-messaging 
REV-652 Use the full set of required variables iff FBE upgrade messaging is turned on
 2019-01-02 14:26:36 -05:00
Calen Pennington
61c705d10d Use the full set of required variables iff FBE upgrade messaging is turned on 2019-01-02 13:26:38 -05:00
Nimisha Asthagiri
92ae95a0b7 Merge pull request #19504 from edx/arch/fix-sso-redirect 
Fix Studio SSO with Third Pary Auth
 2019-01-02 12:14:33 -05:00
Dave St.Germain
a6ff120f8f Merge pull request #19366 from edx/dahlia/proctoring-master 
Upgrade edx-proctoring to version 1.5
 2019-01-02 11:37:55 -05:00
edX Transifex Bot
72d55b39fe Update translations 2019-01-02 11:01:46 -05:00
Matthew Piatetsky
4aa576d725 Merge pull request #19511 from edx/REVMI-72 
Ignore enrollment date for FBE when masquerading
 2019-01-02 09:53:13 -05:00
Rabia Iftikhar
61b1edc6c4 Merge pull request #19523 from edx/ri/EDUCATOR-3668-remove-temporary-logs 
EDUCATOR-3668 remove temporary logs
 2019-01-02 18:22:56 +05:00
rabiaiftikhar
aeca12ba7b EDUCATOR-3668 remove temporary logs 2019-01-02 17:26:14 +05:00
Asad Iqbal
987192332a Merge pull request #19475 from edx/asadiqbal08/ENT-1359 
asadiqbal08/ENT-1359 Verification by email of recovery address.
 2019-01-01 15:20:57 +05:00
DawoudSheraz
6c940ae6fa Merge pull request #19522 from edx/dsheraz/educator_3850 
Update django wiki version
 2019-01-01 14:31:35 +05:00
DawoudSheraz
439109345d Update django wiki version 2018-12-31 17:28:19 +05:00
Abdul Mannan
ecfb18bf08 Add email in course enrollment event 2018-12-31 16:49:54 +05:00
Rabia Iftikhar
6cf5b2f744 Merge pull request #19519 from edx/ri/EDUCATOR-3849-certificate-support-reflected-xss 
Clean XSS in Certificates Support URL
 2018-12-31 14:10:43 +05:00
AsadAzam
a340fc96d5 Merge pull request #19518 from edx/asad/lms-template-reflected-xss 
Clean XSS in lms template
 2018-12-31 13:07:39 +05:00