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

48263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stu Young
0a3b889365 Merge pull request #19574 from edx/testeng/bokchoy_auto_cache_update_65c853527c513863fc95edc70ccbf6ce07554a95 
Bokchoy db cache update
 2019-01-10 12:04:56 -05:00
edx-cache-uploader-bot
f2df0055e2 Updating migrations 2019-01-10 10:36:40 -05:00
Dave St.Germain
7c973450fb Merge pull request #19559 from edx/dcs/hide-dashboard 
Hide the exam review dashboard unless the proctoring backend supports the feature
 2019-01-10 10:33:16 -05:00
Dave St.Germain
aa7b71ac63 Clarify the assert method 2019-01-10 09:53:29 -05:00
noraiz-anwar
e66ec8bd17 fix typo in message 2019-01-10 17:05:36 +05:00
Asad Iqbal
03766127b0 Merge pull request #19573 from edx/asadiqbal08/ENT-1419 
asadiqbal08/ENT-1419 Show an alert for secondary email activation on dashboard.
 2019-01-10 17:02:11 +05:00
Zainab Amir
72c7a449aa change_SoftwareSecurePhotoVerification_model 
In order to add the functionality of sending email when verification expires we need to add fields that will help in accomplishing the task

The fields added are:

expiry_date : The date when the verification will expire. updated when the sspv verification is apporved
expiry_email_date : The date when email was sent. This will help filter learners so that we don't send email again and again but only after specified time
 2019-01-10 16:22:24 +05:00
asadiqbal
4823981599 ENT-1419 changes 2019-01-10 15:57:01 +05:00
Zainab Amir
b61df3af40 LEARNER-6944 Add new fields to SoftwareSecurePhotoVerification 2019-01-10 15:18:06 +05:00
DawoudSheraz
932d65d661 Merge pull request #19561 from edx/dsheraz/educator_3851 
fix inconsistent line breaks while creating course updates
 2019-01-10 12:32:53 +05:00
DawoudSheraz
9176e01db5 fix inconsistent line breaks while creating course updates 2019-01-10 10:18:32 +05:00
Dave St.Germain
6b69896816 Update proctortrack 2019-01-09 15:34:50 -05:00
Dave St.Germain
8b9028dbc6 Hide the exam review dashboard unless the proctoring backend supports the feature. 2019-01-09 14:02:15 -05:00
Christie Rice
941ea262b1 Merge pull request #19565 from edx/crice/REVEM-74 
REVEM-74 Add program info to user-metadata
 2019-01-09 13:15:08 -05:00
Christie Rice
8f8efc80dc REVEM-74 Add program info to user-metadata 2019-01-09 12:40:11 -05:00
Calen Pennington
6efe327311 Merge pull request #19489 from edx/tuchfarber/move_expiration_banner_REVMI_54 
Move banner REVMI-54
 2019-01-09 11:22:50 -05:00
Qubad786
94f6d4bdd9 bump val version 2019-01-09 20:58:38 +05:00
David Ormsbee
0ff988488f Merge pull request #18838 from open-craft/guruprasad/api-list-course-enrollments 
OC-5087 Create a staff-only API to list all course enrollments
 2019-01-09 10:52:36 -05:00
Zubair Afzal
0cce5cf871 Merge pull request #19564 from edx/zub/ENT-1392-enterprise-start-date-visibility 
ENT-1392 bump enterprise version to 1.2.2
 2019-01-09 20:42:29 +05:00
Matt Tuchfarber
ac29017d88 Move banner REVMI-54 
Moves banner into the content instead of at the top. Adds a course
expiration fragment to the course home page, the content, the progress
page, and the discussion page.
 2019-01-09 10:17:16 -05:00
Diana Huang
15759c2b2f Merge pull request #19420 from edx/diana/remove-datadog 
Remove all references to datadog from our code.
 2019-01-09 09:07:22 -05:00
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
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