Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,075 Commits 1 Branch 0 Tags
2daaea9744de792a18d7b3f3c6afaf9aed670fc2
Commit Graph

46075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saleem Latif
2daaea9744 Merge pull request #18141 from edx/saleem-latif/ENT-965 
ENT-965: Upgraded edx-enterprise version from 0.67.7 to 0.67.8
 2018-05-08 11:01:51 +05:00
Eric Fischer
fcef6b3f47 Merge pull request #18150 from edx/efischer/last_one_i_swear 
only check access of asked-for threads
 2018-05-07 16:13:06 -04:00
Eric Fischer
9c63ff3d21 Don't barf during debug logging, that's silly 2018-05-07 15:25:25 -04:00
Eric Fischer
d39b8ccfa9 only check access of asked-for threads 2018-05-07 13:37:11 -04:00
Alex Dusenbery
0b11634e4c Run make upgrade to get latest version of xblock-lti-consumer (and others). 2018-05-07 13:35:30 -04:00
Brian Mesick
424d5044e8 Merge pull request #18146 from edx/bmedx/fix_populate_retirement_states 
Fix issues with retirement state population and update view
 2018-05-07 12:40:39 -04:00
bmedx
f09edea13b Fix issues with retirement state population and update view 
- Fix RetirementState cascade deleting UserRetirementStatus
- Change AccountRetirementStatusView's PATCH to accept application/json
- Remove ill-considered retirementstate_pre_delete_callback
- Fix up tests
 2018-05-07 11:22:11 -04:00
Michael Youngstrom
3533c0f5c5 Merge pull request #18038 from edx/youngstrom/python-pipeline-job 
Create Pipeline python job
 2018-05-07 10:26:00 -04:00
Mushtaq Ali
70dc0eed1c Merge pull request #18118 from edx/mushtaq/rerun-exclude-video-uploads-token 
Exclude video upload token
 2018-05-07 15:55:09 +05:00
Mushtaq Ali
dd8a9b018e Exclude video upload token - EDUCATOR-2532 2018-05-07 15:53:12 +05:00
Uzair Rasheed
0fc942bad3 Merge pull request #18058 from edx/LEARNER-617/verification-status-via-sailthru 
Send verification status email through sailthru
 2018-05-07 15:24:07 +05:00
Saleem Latif
e356418b45 Upgraded edx-enterprise version from 0.67.7 to 0.67.8 2018-05-07 14:43:06 +05:00
Mushtaq Ali
f4b1da1f42 Merge pull request #17718 from edx/transcripts-phase-2 
Transcripts phase 2
 2018-05-07 12:42:50 +05:00
uzairr
dfb295fe38 Send verification status email through sailthru 
Support needs to inform a learner different states of its
id-verification.In order to achieve it email will be sent
to learner about its verification state using sailthru.

LEARNER-617
 2018-05-07 12:30:47 +05:00
Eric Fischer
335696a188 Merge pull request #18137 from edx/efischer/nvm 
Revert #18125
 2018-05-04 17:50:38 -04:00
Alex Dusenbery
9456bcdcce EDUCATOR-2516 | Bump xblock-lti-consumer to 1.1.8 2018-05-04 16:43:17 -04:00
Michael Youngstrom
4e1826a5dd Add Jenkinsfile for python pr tests 2018-05-04 15:19:42 -04:00
Eric Fischer
8172b49552 Revert "Merge pull request #18125 from edx/efischer/the_code_also_gazes_into_you" 
This reverts commit 86282eb850, reversing
changes made to be097fed99.
 2018-05-04 14:45:06 -04:00
Bill DeRusha
cc2d04a42c Merge pull request #18000 from edx/password-rollout 
Infrastructure for password policy compliance rollout
 2018-05-04 12:59:05 -04:00
Anthony Mangano
07609e7d75 Add password_policy checks to login views 
LEARNER-4869
 2018-05-04 11:55:57 -04:00
Mushtaq Ali
5bd1a29e40 Merge pull request #18135 from edx/mushtaq/val_version_bump 
VAL version bump
 2018-05-04 18:19:01 +05:00
Mushtaq Ali
923897d015 VAL version bump 2018-05-04 15:52:53 +05:00
Attiya Ishaque
0237d58350 Merge pull request #18133 from edx/ai/EDUCATOR-2726_usage_key_none 
Fix that when usage key none is not raise error.
 2018-05-04 15:47:20 +05:00
attiyaishaque
0c4511b57d Fix that when usage key none is not raise error. 2018-05-04 12:29:25 +05:00
Farhanah Sheets
f506e347ca Merge pull request #18131 from edx/fsheets/test-doc-vnc 
Fix heading structure
 2018-05-03 20:52:27 -04:00
Douglas Hall
554f609ddf Merge pull request #18128 from edx/douglashall/update_course_discussion_settings 
Store Discussions ID Map on CourseDiscussionSettings model when course publish signal is fired.
 2018-05-03 18:09:56 -04:00
Douglas Hall
695b036282 Store Discussions ID Map on CourseDiscussionSettings model when course publish signal is fired. 2018-05-03 17:23:30 -04:00
Eric Fischer
86282eb850 Merge pull request #18125 from edx/efischer/the_code_also_gazes_into_you 
Optimize _has_group_access for bulk checks
 2018-05-03 17:18:45 -04:00
Farhanah Sheets
04b737b843 Fix heading structure 2018-05-03 17:04:21 -04:00
Eric Fischer
c78bf811fd Prefetch user group data for bulk access checks 2018-05-03 16:38:52 -04:00
McKenzie Welter
be097fed99 Merge pull request #18127 from edx/McKenzieW/learner-3830 
swap page names for entitlement session analytics
 2018-05-03 15:39:43 -04:00
Nimisha Asthagiri
eb3e8d9585 Merge pull request #17602 from Microsoft/edx_master 
Bulk Grades API (v1 grades api w/courses endpoint)
 2018-05-03 15:36:27 -04:00
Eric Fischer
2a008fac05 Merge pull request #18121 from edx/efischer/one_more_time 
Cache results of thread authorship check
 2018-05-03 14:59:09 -04:00
J Eskew
225dc1021c Merge pull request #18104 from edx/jeskew/PLAT_2093_remove_activation_keys 
Remove activation keys upon logout of retired user.
 2018-05-03 14:41:55 -04:00
Michael Roytman
085817f487 Merge pull request #18085 from edx/mroytman/pass-course-details-to-image-modal 
pass courseDetails to editImageModal
 2018-05-03 14:15:59 -04:00
McKenzie Welter
5c4c86afce swap page names for entitlement session analytics 2018-05-03 13:43:52 -04:00
Ned Batchelder
7a71186131 Merge pull request #17810 from open-craft/afzaledx/move_site_verification_id_to_settings 
Moved the ID used in the google-site-verification meta tag to settings
 2018-05-03 13:25:05 -04:00
Kabir Khan
c0f353467e V1 Grades API with added support for bulk read of all user grades in a course. 
URL patterns changed to follow edx API conventions
 2018-05-03 10:23:33 -07:00
Eric Fischer
efd9fc04ce cache results of thread authorship check 2018-05-03 13:16:24 -04:00
Farhanah Sheets
b425826de6 Merge pull request #18122 from edx/fsheets/test-doc-vnc 
Add VNC info to platform testing docs
 2018-05-03 13:06:44 -04:00
Alessandro Roux
26ab595983 Merge pull request #18114 from edx/roux/creditrequest_model_retirement 
EDUCATOR-2658: Adds retire_user to CreditRequest.
 2018-05-03 12:13:27 -04:00
Stu Young
7b76ab8a4d Merge pull request #18023 from edx/estute/TE-2427-reshard-lms4 
Reshard python unittests
 2018-05-03 11:53:32 -04:00
John Eskew
b74d720442 Remove activation keys upon logout of retired user. 2018-05-03 11:41:20 -04:00
Alex Dusenbery
95d5b13714 EDUCATOR-2753 | Add calls to retire secondary user data to the /accounts/retire endpoint. 2018-05-03 11:35:50 -04:00
afzaledx
cc6c95b388 OC-3995 
Moved the ID string used in the google-site-verification meta tag to settings so that it can be overridden from site_configuration.
 2018-05-03 20:34:39 +05:00
Stuart Young
1fd2167144 rebalance python unittests onto new shards 2018-05-03 11:16:05 -04:00
McKenzie Welter
137b9da22b Merge pull request #18120 from edx/McKenzieW/learner-3830 
emit ga events for user entitlement session actions
 2018-05-03 10:28:38 -04:00
Farhanah Sheets
43fe98eda8 Add VNC info to testing docs 2018-05-03 10:27:21 -04:00
Farhanah Sheets
d19ba1b22a Merge pull request #18102 from edx/fsheets/sfe-bump 
Bump studio-frontend to v1.9.4 and fix bokchoy
 2018-05-03 10:12:40 -04:00
McKenzie Welter
229e1c96d4 emit ga events for user entitlement session actions 2018-05-03 09:49:01 -04:00