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

16583 Commits

Author SHA1 Message Date
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
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
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
Diana Huang
6572d99e76 Remove all references to datadog from our code. 2019-01-08 15:41:24 -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
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
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
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 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
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
edx-cache-uploader-bot
2167e82bf2 Updating migrations 2019-01-03 15:23: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
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
Abdul Mannan
ecfb18bf08 Add email in course enrollment event 2018-12-31 16:49:54 +05:00
Saleem Latif
eaf93d5978 Update sign in email address for continued access 2018-12-31 11:34:05 +05:00
asadiqbal
e21477c224 Verification by email of recovery address. 2018-12-27 18:51:55 +05:00
Agha Awais
1390aa6051 Merge pull request #19060 from edx/awais/lett_2_bc_instructor_data_download 
TE-2656: Bokchoy tests for Instructor dashboard data download tab
 2018-12-27 16:47:32 +05:00
Agha Awais
22992918d3 Merge pull request #19008 from edx/awais/lett_2_bc_registration 
TE-2654: Course registration bokchoy test
 2018-12-27 16:10:31 +05:00
Agha Awais
992083dd66 Merge pull request #19025 from edx/awais/lett_2_bc_courseware_word_cloud 
TE-2655: Courseware word cloud bokchoy tests
 2018-12-27 15:28:16 +05:00
Agha Awais
5a86f2b276 Bokchoy tests for Instructor dashboard data download tab 2018-12-26 22:10:38 +00:00
Agha Awais
b0d678d77c Courseware wordcloud tests 2018-12-26 21:26:26 +00:00
Agha Awais
371c1df4f3 Course registration bokchoy test 2018-12-26 20:51:15 +00:00
Nimisha Asthagiri
f840774169 Fix Studio SSO 
ARCH-329
 2018-12-22 22:48:46 -05:00
Jansen Kantor
49a88db7aa Merge pull request #19502 from edx/jkantor/roles-filter 
add an optional parameter roles query to filter by course
 2018-12-21 15:07:49 -05:00
jansenk
547bd7c97a add an optional parameter roles query to filter by course 
EDUCATOR-3796
 2018-12-21 13:32:24 -05:00
Bill Filler
04474d330f Merge pull request #19501 from edx/ziafazal/LEARNER-6874 
LEARNER-6874: Fixed bug which stopped new user link with All edX Users sailthru list
 2018-12-21 12:43:28 -05:00
Zia Fazal
ae34212528 Fixed bug which stopped new user link with All edX Users sailthru list 2018-12-21 12:11:20 -05:00
Stu Young
317b25f334 Merge pull request #19494 from edx/testeng/bokchoy_auto_cache_update_35c66b21cbd42f69d9b4bf3c655e967c4ec7aebe 
Bokchoy db cache update
 2018-12-21 11:52:19 -05:00
Michael Roytman
880a06b981 do not show Create Zendesk Tickets For Suspicious Proctored Exam Attempts Studio Advanced Setting field if user is not edX staff 2018-12-21 11:16:28 -05:00
Michael Roytman
23fcb7e7bb Removed course-run exam rule configuration 2018-12-21 11:14:58 -05:00
Jansen Kantor
62e2ba4503 Merge pull request #19488 from edx/jkantor/list-roles-staff 
add is_staff to roles api response
 2018-12-21 11:14:17 -05:00
edx-cache-uploader-bot
ae89d7dd41 Updating migrations 2018-12-21 11:07:39 -05:00
Matt Hughes
0a33fb6bb6 Fixed karma setup bug with new webpack config 2018-12-21 10:54:51 -05:00
Michael Roytman
ecabcf90dd Enable course run level overrides for proctoring configuration. 2018-12-21 10:54:51 -05:00
Calen Pennington
77922ae073 Merge pull request #19478 from edx/hide-empty-content-course-blocks 
REVE-181: Hide empty container blocks from the course blocks api when called by the mobile app
 2018-12-21 10:22:59 -05:00
jansenk
eff58b289a add is_staff to roles api response 
EDUCATOR-3796
 2018-12-21 10:22:29 -05:00
Agha Awais
a6dc71e9d1 Merge pull request #18850 from edx/awais/lett_2_bc_problem_editor_I 
TE-2627: Problem Editor bokchoy tests
 2018-12-21 15:40:58 +05:00
Agha Awais
7a6611c9c2 Problem Editor bokchoy tests 2018-12-21 09:17:24 +00:00
Dave St.Germain
28e6565368 Quick fix for cohort problem in enrollment API 2018-12-20 15:47:58 -05:00
Calen Pennington
325fbe4eb2 Hide empty container blocks from the course blocks api when called by the mobile app 
All code in this PR should be removed after REVE-52 is merged and mobile
traffic from older app versions falls to < 5% of the mobile traffic
to the course_blocks api
 2018-12-20 15:17:24 -05:00
edx-cache-uploader-bot
32c50b338c Updating migrations 2018-12-20 11:15:00 -05:00
George Babey
9d02b29cd7 Merge pull request #17955 from eduNEXT/ednx/Support-Underscore-Templates-Theme 
OSPR-2352 | Support for theming .underscore files
 2018-12-20 10:44:55 -05:00
Feanil Patel
e90ce3a419 Merge pull request #19484 from edx/release-mergeback-to-master 
Merge release back to master
 2018-12-20 09:51:45 -05:00
Jeremy Bowman
cc5b1ce978 Merge pull request #19483 from edx/jmbowman/misc_bokchoy_fixes 
Fixes for assorted flaky bok-choy tests
 2018-12-20 09:44:54 -05:00
Pooja Kulkarni
6f0e5d68d7 Make video contents visible to unenrolled users 
This is based on PR #19284 and is part of the
series of work related to the proposal #18134.

Adds VideoModule.public_view() to enable
unenrolled and anonymous users to view the video
contents of a public course.
When an unenrolled or anonymous user accesses the
video content of a public course, the
public_view() introduced in the previous PR is
used instead of student_view() method.
 2018-12-20 11:56:43 +05:30