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

18130 Commits

Author SHA1 Message Date
Gabe Mulley
7a5cecf3e9 Merge pull request #16545 from appsembler/omar/fmo/multipart-email 
Use edx-ace for the password reset email
 2018-05-10 11:31:43 -04:00
Alex Dusenbery
08a961d60f EDUCATOR-2618 | Add more function_trace() to inline discussion view. 2018-05-10 10:14:38 -04:00
Albert St. Aubin
fade1fb3f1 Correction for incorrect conditional error logic and wrong channel 
[LEARNER-5123]
 2018-05-10 07:51:48 -04:00
Eric Fischer
f7a66eab78 Revert "Merge pull request #18150 from edx/efischer/last_one_i_swear" 
This reverts commit fcef6b3f47, reversing
changes made to 0b11634e4c.
 2018-05-09 11:53:56 -04:00
Albert (AJ) St. Aubin
bfdcc49401 Merge pull request #18159 from edx/aj/LEARNER-5123_2 
Correctly passing course key in the JSON object to async
 2018-05-09 10:28:35 -04:00
Albert St. Aubin
4e0b3d3b2e Correctly passing course key in the JSON object to async 
[LEARNER-5123]
 2018-05-09 09:57:27 -04:00
Diana Huang
d768c77c7a Merge pull request #18123 from edx/diana/button-bokchoy-tests 
Bok choy tests for the account deletion flow
 2018-05-09 09:46:31 -04:00
J Eskew
edbdae9fb8 Merge pull request #18124 from edx/jeskew/fix_some_django20_deprecation_warnings 
Fix more Django 2.0 deprecation warnings around URLconfs.
 2018-05-08 16:29:12 -04:00
Douglas Hall
c6ec5edbf7 Add API documentation with django-rest-swagger. 2018-05-08 14:38:33 -04:00
Eric Fischer
b1316290dc Merge pull request #17738 from caesar2164/encode-sysadmin-staffing-profile-name-upstream 
Encodes staff profile names as they can be unicode
 2018-05-08 13:59:34 -04:00
Omar Al-Ithawi
556c8b86d0 Use edx-ace for password reset email 2018-05-08 18:53:31 +03:00
Jeremy Bowman
f32b35427a Merge pull request #18153 from edx/jmbowman/TE-2545 
TE-2545 Restrict AutoAuth for load tests
 2018-05-08 10:10:47 -04:00
Albert St. Aubin
787653e793 Moving the update course and subsection grades to async task 
[LEARNER-5123]

The update course and subsection grades method was causing a DB lock
on other requsets.  This should be performed in the background and given
its own async task.
 2018-05-08 09:43:12 -04:00
John Eskew
e5ee0fc91f Remove more unneeded 'namespace=' params. 2018-05-07 18:25:36 -04:00
Diana Huang
a06072c8d9 Bok Choy tests for account deletion workflow. 2018-05-07 15:37:24 -04:00
Eric Fischer
9c63ff3d21 Don't barf during debug logging, that's silly 2018-05-07 15:25:25 -04:00
Jeremy Bowman
dd0180a33d TE-2545 Restrict AutoAuth for load tests 2018-05-07 15:00:48 -04:00
Eric Fischer
d39b8ccfa9 only check access of asked-for threads 2018-05-07 13:37:11 -04: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
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
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
Anthony Mangano
07609e7d75 Add password_policy checks to login views 
LEARNER-4869
 2018-05-04 11:55:57 -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
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
John Eskew
ffb1f9fe2a Fix more Django 2.0 deprecation warnings around URLconfs. 2018-05-03 13:50:08 -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
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
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
229e1c96d4 emit ga events for user entitlement session actions 2018-05-03 09:49:01 -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
Eric Fischer
4147b72f18 fix is_authenticated mocks 2018-05-02 11:26:27 -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
jaebradley
22cd505d42 LEARNER-4717 Have delete account modal button make request to deactivation endpoint 2018-05-02 07:50:38 -04:00
Eric Fischer
b7dda32a36 remove tests also 2018-05-01 13:44:55 -04:00
Eric Fischer
23c52d03d7 This isn't used when rendering inline 2018-05-01 12:38:11 -04:00
Brittney Exline
5b19309691 Merge pull request #18070 from edx/bexline/sso_id_verification2 
ENT-945 Using SSOVerifications in ID Verification flow
 2018-04-30 14:14:03 -06:00
rabiaiftikhar
c51d121faa EDUCATOR-2774 add new condition for cert eligible column in grade report 2018-04-30 23:43:31 +05:00
Simon Chen
4efd355ba7 Merge pull request #18091 from edx/schen/EDUCATOR-2698 
Implement retire users function in the SurveyAnswer model for GDPR
 2018-04-30 14:17:03 -04:00
Simon Chen
174c01759f Implement retire users function in the SurveyAnswer model for GDPR 2018-04-30 13:07:32 -04:00
Gregory Martin
75f94f9735 Merge pull request #18079 from edx/yro/EDUCATOR-2700-B 
Update models to 'Retire' not delete data
 2018-04-30 12:51:41 -04:00