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

48280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agha Awais
77bc40fe95 Merge pull request #19524 from edx/awais/lett_2_bc_problem_editor_II 
Problem Editor bokchoy tests II(remaining tests)
 2019-01-12 10:12:31 +05:00
David Ormsbee
74d53cf786 Merge pull request #19329 from open-craft/giovanni/bb-547-ospr 
BB-547 - Fix certificate api when retrieving certificates from deleted courses
 2019-01-11 11:22:45 -05:00
Agha Awais
03403e58c4 Problem Editor bokchoy tests II(remaining tests) 2019-01-11 14:23:55 +00:00
Giovanni Cimolin da Silva
8563cf437a Fix certificate api when retrieving certificates from deleted courses 
This commit fixes a problem with the Certificates API that make it fail when trying to retrieve user certificates from courses that don't exist anymore.
The problem lies in the Certificate API not checking if the courses being retrieved by some user actually exist, to fix this, this commit improves the fault tolerance of the Certificates API.

This issue was found when investigating why a user profile page (/u/username) was returning 404's.
Turns out that LearnerAchievementsFragmentView used the certificates api to retrieve certificate information, which did not check if the course exists before trying to pull information from it, resulting in a cascade of errors that lead to a 404 on the user's profile page.

Signed-off-by: Giovanni Cimolin da Silva <giovannicimolin@gmail.com>
 2019-01-11 11:40:00 -02:00
zrana
99667e75f9 Merge pull request #19585 from edx/zeeshan/remove_unwanted_lett_grading_tests 
Remove unwanted lettuce grading files
 2019-01-11 18:38:45 +05:00
zrana
5e56e9ad0a Remove unwanted lettuce grading files 2019-01-11 17:10:59 +05:00
Agha Awais
db2cab0e4c Merge pull request #18810 from edx/awais/lett_2_bc_pages 
TE-2626: Studio Pages bokchoy tests
 2019-01-11 15:24:45 +05:00
zrana
fc56a6d47c Merge pull request #19456 from edx/zeeshan/lett_2_bc_grading_IV 
Grading IV tests
 2019-01-11 14:48:02 +05:00
Agha Awais
779be24c56 Studio Pages bokchoy tests 2019-01-11 09:43:31 +00:00
edx-pipeline-bot
674677daf5 Merge pull request #19577 from edx/private_to_public_21245f3 
Mergeback PR from private to public.
 2019-01-10 15:02:38 -05:00
Ned Batchelder
3b591e4ada Merge pull request #19530 from edx/nedbat/translator-comments 
Add some clarifying translator comments.
 2019-01-10 14:46:15 -05:00
Julia Eskew
21245f3b29 Merge pull request #148 from edx/juliasq/fix_user_retirement_salt_for_hashing 
Use secure salt for retirement username/email hashing.
 2019-01-10 14:12:23 -05:00
Ned Batchelder
1d3f062d05 Add some clarifying translator comments. 2019-01-10 13:50:04 -05:00
Matthew Piatetsky
e1fd793e86 Merge pull request #19560 from edx/REVMI-2 
add informational banners when masquerading as user who would not have access due to start date
 2019-01-10 13:48:29 -05:00
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
Matthew Piatetsky
5bb56fe45f add informational banners when masquerading as user who would not have access due to start date 2019-01-10 11:06:30 -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
zrana
95560a0c94 Grading IV tests 2019-01-10 13:46:42 +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
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