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

48182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Youngstrom
c2f57f975b Allow merge builds for lettuce and python 2019-01-03 15:08:39 -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
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
Rabia Iftikhar
cd6d3caf2c Merge pull request #19517 from edx/aj/block-xblock-reflected-xss 
Clean Xblock handler
 2018-12-31 13:00:25 +05:00
Saleem Latif
c2a218f379 Merge pull request #19500 from edx/saleem-latif/ENT-1118 
ENT-1118: Update sign in email address for continued access
 2018-12-31 12:27:46 +05:00
rabiaiftikhar
e9b2b7f8a7 Clean XSS in Certificates Support URL 2018-12-31 12:16:34 +05:00
Saleem Latif
eaf93d5978 Update sign in email address for continued access 2018-12-31 11:34:05 +05:00
edX Transifex Bot
f44c68fb52 Update translations 2018-12-30 16:23:16 -05:00
Awais Jibran
e3529ad258 Clean Xblock handler 2018-12-29 09:21:28 +05:00
asadazam93
25cf39daa4 Clean XSS in lms template 2018-12-29 01:48:25 +05:00
Zachary Hancock
b7d53e26ef Merge pull request #19490 from edx/zhancock/monitor-bulk-update 
Add logging to gradebook bulk update
 2018-12-28 09:23:43 -05:00
Matthew Piatetsky
c515b3570e Merge pull request #19495 from edx/REVMI-50 
write tests for when verified mode expires
 2018-12-27 16:08:26 -05:00
Dave St.Germain
847b369e21 Merge pull request #19512 from edx/dcs/bump-proctoring-version 
Bump proctoring version
 2018-12-27 11:13:36 -05:00
Dave St.Germain
08fb080d06 Update edx-proctoring and pytest 2018-12-27 11:13:08 -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
Matthew Piatetsky
1396ca9173 Ignore enrollment date for FBE when masquerading 2018-12-26 20:29:44 -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
Dave St.Germain
caa515c929 Bump proctoring version 2018-12-26 13:31:08 -05:00
edX Transifex Bot
8593d4dc71 Update translations 2018-12-23 16:13:05 -05: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
Zach Hancock
a93fe4d833 add logging to gradebook bulk update 2018-12-21 14:48:09 -05:00
Dave St.Germain
3a012977fd Make upgrade after rebase 2018-12-21 14:31:03 -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
Matt Hughes
19265ad6e4 apply babel more liberally to webworker js 2018-12-21 11:16:28 -05:00
Dave St.Germain
ebd26f6a33 Reverted js upgrade 2018-12-21 11:16:28 -05:00
Dave St.Germain
28a8621726 Amend the test to include an exam review url 2018-12-21 11:16:27 -05:00
Dave St.Germain
e239dcce1d Removed stray eslint addition 2018-12-21 11:16:27 -05:00
Dave St.Germain
c71c12545a These settings now come from edx-proctoring 2018-12-21 11:16:27 -05:00
Dave St.Germain
e8178c9f76 Include a link to the proctoring review, if available 2018-12-21 11:16:27 -05:00