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

18308 Commits

Author SHA1 Message Date
Usman Khalid
8b1aad080a Add complete on view support to render_xblock view. 2018-06-22 14:46:03 -04:00
Matthew Piatetsky
5b167e6b1f Merge pull request #18439 from edx/add_forum_roles_to_metadata 
add forum roles to metadata
 2018-06-22 13:17:30 -04:00
Matthew Piatetsky
95ccc30594 add forum roles to metadata 2018-06-22 12:49:10 -04:00
Albert (AJ) St. Aubin
85ab2e4036 Merge pull request #18443 from edx/LEARNER-5275 
Update the entitlement fulfilment logic to work with enrollment end
 2018-06-22 09:59:36 -04:00
Albert St. Aubin
06af818322 Update the entitlement fulfilment logic to work with enrollment end 
[LEARNER-5275]

Update the endtitlement fulfillment logic to work for users who have
enrolled, enrollment window has closed, but upgrade window is still
open. These users should be able to use that enrollment on their course
run that they are enrolled in.
 2018-06-22 07:48:35 -04:00
J Eskew
fe82954835 Merge pull request #18397 from edx/jeskew/perpare_hawthorn_retirement_states 
Use correct default user retirement states.
 2018-06-21 15:35:59 -04:00
J Eskew
df16836a8f Merge pull request #18427 from edx/jeskew/fix_some_deprecation_warnings 
Fix some deprecation warnings.
 2018-06-21 12:24:19 -04:00
John Eskew
b94ea6b4b1 Import XBlockMixin from the correct location. 2018-06-21 11:41:06 -04:00
Robert Raposa
be22529028 Merge pull request #18434 from edx/robrap/clean-up-imports 
Remove unused imports.
 2018-06-21 10:46:28 -04:00
Robert Raposa
59d0ada7aa Use EnsureJWTAuthSettingsMiddleware middleware. 2018-06-21 09:30:15 -04:00
Robert Raposa
92283a33b9 Remove unused imports. 2018-06-21 08:55:23 -04:00
ayub-khan
17e78d85c1 -updated-translations 2018-06-20 21:32:16 +05:00
christopher lee
939c7f4857 Set max page size for get courses 2018-06-19 15:39:50 -04:00
christopher lee
48b5485be1 Set max page size for get courses 
LEARNER-5566
 2018-06-19 13:07:04 -04:00
John Eskew
dd688d508a PLAT-2193: Use correct default user retirement states. 2018-06-18 17:17:33 -04:00
Braden MacDonald
b12346f390 Merge pull request #18170 from open-craft/eugeny/instructor_report_popup_backend 
Answers report: Return task ID and generated filename for frontend to consume
 2018-06-18 13:26:27 -07:00
Jeff LaJoie
b07374ed39 LEARNER-5050: Adds award course cert job to post to Credentials 2018-06-18 08:54:58 -04:00
Eugeny Kolpakov
d058aacca9 Return task ID and generated filename from backend 2018-06-17 17:22:12 +08:00
Eric Fischer
e72549cdbe Revert "Merge pull request #18340 from cpennington/fix-studio-xblock-rendering" 
This reverts commit 9a70ca78a5, reversing
changes made to efd5b9abbd.

Hopefully fixes EDUCATOR-3053
 2018-06-15 13:18:27 -04:00
uzairr
e77a19a4a3 Update UTM params of social sharing buttons 
To improve Customer experience small changes have done in the
Google Analytics so that incoming stats are organized efficiently.

LEARNER-5360
 2018-06-14 12:38:01 +00:00
Awais Jibran
d7e29c210e Merge pull request #18354 from edx/EDUCATOR-3004/add-10s-delay 
Add 10 seconds delay to avoid exception
 2018-06-14 12:55:55 +05:00
Nimisha Asthagiri
62266fd936 Merge pull request #18325 from edx/hack/course-validation-api 
Course Validation and Course Quality APIs
 2018-06-13 21:33:22 -04:00
Nimisha Asthagiri
8db2dd47dd Course Validation and Course Quality APIs 2018-06-13 20:33:45 -04:00
Calen Pennington
9a70ca78a5 Merge pull request #18340 from cpennington/fix-studio-xblock-rendering 
Fix studio xblock failing renders (due to asset hashing loop)
 2018-06-13 15:58:34 -04:00
David Ormsbee
386699f7aa Merge pull request #18350 from edx/ormsbee/discussion_map_storage_change 
Fix forums ID mapping
 2018-06-13 09:06:44 -04:00
Waheed Ahmed
b62cf12db2 Merge pull request #18362 from edx/waheed/LEARNER-5527-throttle-course-list-api 
Rate limit course list API.
 2018-06-13 17:55:49 +05:00
David Ormsbee
72ed987dff Enable model-caching of discussions ID mapping. 
Doing modulestore lookups is expensive, so commit 695b036 created a
course_publish listener that would materialize the discussion ID to
XBlock usage key mapping into the CourseDiscussionSettings model.

However, the signal wasn't hooked up to the Studio process, so that
async task was never called. When hooking it up, I also discovered that
bok choy tests related to partitioning were failing because of a race
condition where multiple processes are overwriting the discussion
settings. To make sure this wasn't an issue, I moved the mapping to
its own table.

This is part of ARCH-111, and the overall Course Structures API
deprecation.
 2018-06-13 08:21:08 -04:00
Waheed Ahmed
780c1d982d Rate limit course list API. 
This endpoint is likely being inefficient with how it's querying various parts
of the code and can take courseware down, it needs to be rate limited until
optimized.

LEARNER-5527
 2018-06-13 16:59:32 +05:00
Zia Fazal
70b35d834f Use custom get_current_site method 2018-06-13 15:17:51 +05:00
Awais Jibran
e274308396 Update the initial try delay to reduce the occurance of this DatabaseNotReadyError due to replica lag. 
EDUCATOR-3004
 2018-06-13 11:09:16 +05:00
Albert (AJ) St. Aubin
e3c84bc8de Revert "Rate limit course list API." 2018-06-12 12:06:51 -04:00
Waheed Ahmed
803a6c742c Rate limit course list API. 
This endpoint is likely being inefficient with how it's querying various parts of the code
and can take courseware down, it needs to be rate limited until optimized.

LEARNER-5527
 2018-06-12 14:58:12 +05:00
Troy Sankey
6600e8b7e6 Merge pull request #18348 from edx/pwnage101/edxnotes-retirement-correct-url-and-user 
[edxnotes] use the correct url and update the API params
 2018-06-11 12:49:33 -04:00
Uzair Rasheed
a2d16de840 Merge pull request #18307 from edx/LEARNER-4351/extract-course-run-with-highest-grade 
Extract course run with highest grades.
 2018-06-11 12:49:58 +05:00
Troy Sankey
3172000aba [edxnotes] use the correct url and update the API params 
This is really two separate things:

1. Fix the notes retirement endpoint to generate the correct notes API
url "/api/v1/annotations/" rather than the nonexistent "/api/v1/".

2. Update the API params to use "user" rather than "user_id".  This
depends on another PR in edx/edx-notes-api to make the corresponding
change on the API side.  This is required because "user" is the
hard-coded key that the permissions class uses to check the JWT token
user.
 2018-06-08 15:36:47 -04:00
Adeel Khan
7768dd1de3 Ratelimiting registration form validation end point. 
This patch would ratelimit registration form validation
endpoint for anonymous user based on his/her ip.

LEARNER-3810
 2018-06-08 14:45:15 +05:00
Calen Pennington
be3c7e05c5 Reapply "Switch container factory to webpack" 
This reverts commit 18d93b00ba.
 2018-06-07 15:52:05 -04:00
Calen Pennington
18d93b00ba Revert "Switch container factory to webpack" 2018-06-07 13:46:47 -04:00
Ahsan Ul Haq
c02283b472 Merge pull request #18281 from edx/ahsan/LEARNER-5326-csrf-exempt-on-donations 
Exempt csrf on donate
 2018-06-07 15:02:09 +05:00
sanfordstudent
3c0e2f36e7 Revert "OAuth2 API to call XBlock handlers" 2018-06-06 16:09:31 -04:00
Calen Pennington
f7038db3a3 Merge pull request #18290 from cpennington/switch-container-factory-to-webpack 
Switch container factory to webpack
 2018-06-06 14:42:57 -04:00
Brian Mesick
3eb5e432e5 Merge pull request #18322 from edx/bmedx/remove_sessionauthenticationmiddleware 
Remove SessionAuthenticationMiddleware from INSTALLED_APPS
 2018-06-06 14:09:20 -04:00
Calen Pennington
b9a72a4dc9 Remove hard-coded codemirror script tags from LMS XBlock pages 2018-06-06 12:52:12 -04:00
Calen Pennington
0abe75a7c6 Re-apply the changes to convert XBlocks to Webpack 
Reapplies edx/edx-platform#17509

This reverts commit 0f7e2373d0.
 2018-06-06 12:52:12 -04:00
Brian Mesick
832f6a7157 Merge pull request #18320 from edx/bmedx/remove_111_test_marks 
Remove unused pytest markers for Django 1.11 upgrade
 2018-06-06 11:15:26 -04:00
Michael Youngstrom
f4dc2ca000 Merge pull request #18314 from edx/youngstrom/remove_django_18_shim 
Remove temp django upgrade logic
 2018-06-06 11:09:17 -04:00
bmedx
2ca632aec9 Remove SessionAuthenticationMiddleware from INSTALLED_APPS 
It is always on now, and this is just a deprecated stub which will be
removed in Django 2.0.
 2018-06-06 10:47:57 -04:00
Tyler Hallada
1f42d1b384 Merge pull request #18316 from edx/thallada/PLAT-1524-on-delete 
PLAT-1524: Add on_delete kwarg to ForeignKey & OneToOneFields
 2018-06-06 10:38:15 -04:00
Michael Youngstrom
26b4e30833 Remove django 1.8 shim 2018-06-06 10:34:56 -04:00
bmedx
c125ff6a57 Remove unused pytest markers for Django 1.11 upgrade 2018-06-06 09:58:38 -04:00