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

46031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Youngstrom
4e1826a5dd Add Jenkinsfile for python pr tests 2018-05-04 15:19:42 -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
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
sandroroux
4772dcf631 Adds "retire_user" to CreditRequest. 2018-05-03 09:24:48 -04:00
Alessandro Roux
197f1fb17a Merge pull request #18012 from edx/roux/oauth2-retire 
EDUCATOR-2703: adds user retirement to OAuth2 tables
 2018-05-03 09:18:56 -04:00
Ari Rizzitano
2809649082 Merge pull request #18115 from edx/ari/cms-textbook-nav 
add base factory into textbooks factory
 2018-05-03 08:24:18 -04:00
Farhanah Sheets
121c47aa4c Bump studio-frontend to v1.9.4 and fix bokchoy 2018-05-02 21:54:15 -04:00
sanfordstudent
2a367b5075 Merge pull request #18111 from edx/sstudent/EDUCATOR-2689 
EDUCATOR-2689: retire ManualEnrollmentAudit
 2018-05-02 16:30:50 -04:00
Sanford Student
264cec0cea EDUCATOR-2689: retire ManualEnrollmentAudit 2018-05-02 15:56:00 -04:00
sandroroux
0094443b19 Creates oauth2_retirement_utils file, used it to retire oauth2 data. 2018-05-02 15:55:51 -04:00
Michael Terry
f8b009fecc Fix extracting i18n from jsx code 
React code (in jsx files) was not being extracted at all. Fixed this
by updating to edx-i18n-tools 0.4.5.

Also, template literals (feature of es2015) don't work well with
gettext at all. So convert those instances to HtmlUtils or
StringUtils interpolation calls.

FEDX-505
 2018-05-02 15:21:45 -04:00
Ari Rizzitano
7489753638 add base factory into textbooks factory 2018-05-02 15:15:16 -04:00
Eric Fischer
2556864bfb Merge pull request #18106 from edx/efischer/is_it_this_easy 
Silence deprecation warnings
 2018-05-02 14:17:05 -04:00
Alex Dusenbery
2b48649a9e EDUCATOR-2771 | Adds an LMS API endpoint to retire a user account. 2018-05-02 13:10:03 -04:00
J Eskew
0ffb021c65 Merge pull request #18107 from edx/jeskew/django_upgrade_1_11_13 
Upgrade Django to 1.11.13
 2018-05-02 12:03:32 -04:00
Eric Fischer
4147b72f18 fix is_authenticated mocks 2018-05-02 11:26:27 -04:00
sanfordstudent
a615f2e227 Merge pull request #18103 from edx/sstudent/EDUCATOR-2690 
EDUCATOR-2690 bugfix
 2018-05-02 11:14:01 -04:00
John Eskew
53502a6395 Upgrade Django to 1.11.13 2018-05-02 10:36:33 -04:00
Sanford Student
ea67a49041 EDUCATOR-2690 bugfix 2018-05-02 10:21:57 -04:00
Eric Fischer
e18448e27d Silence deprecation warnings 
https://docs.djangoproject.com/en/1.11/releases/1.10/#using-user-is-authenticated-and-user-is-anonymous-as-methods
 2018-05-02 10:03:50 -04:00
Jae Bradley
a1869d67f2 Merge pull request #18101 from edx/LEARNER-4717-hook-delete-button-to-logout-api 
LEARNER 4717: Call Retirement API from Delete Button
 2018-05-02 09:34:47 -04:00
jaebradley
22cd505d42 LEARNER-4717 Have delete account modal button make request to deactivation endpoint 2018-05-02 07:50:38 -04:00