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

46510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
105db2cf59 Merge pull request #18385 from edx/release-mergeback-to-master 
Merge release back to master
 2018-06-15 16:30:26 -04:00
Tyler Hallada
447457594f Merge pull request #18378 from edx/thallada/upgrade-SFE 
Upgrade SFE to 1.10.8
 2018-06-15 14:47:52 -04:00
Alessandro Roux
9718a38ad4 Merge pull request #18380 from edx/roux/discussions-png-hack 
Make a copy of the asset under the edx.org theme
 2018-06-15 14:47:23 -04: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
sandroroux
dce57edafe Make a copy of the asset under the edx.org theme 2018-06-14 17:01:39 -04:00
Stu Young
44945dc03c Merge pull request #18377 from edx/estute/TE-2544 
consume env var to select tox env
 2018-06-14 15:40:22 -04:00
Stuart Young
f7df8ff46e consume env var to select tox env 2018-06-14 14:32:36 -04:00
Tyler Hallada
bafce09502 Upgrade SFE to 1.10.8 
Includes upgrade to Paragon and aria-live fixes.
 2018-06-14 11:44:55 -04:00
Uzair Rasheed
58b9cb4938 Merge pull request #18376 from edx/LEARNER-5360/utm-update-for-social-sharing 
Update UTM params of social sharing buttons
 2018-06-14 18:24:27 +05: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
Feanil Patel
c96bc8330c Merge pull request #18363 from edx/feanil/update_social_auth 
Actually update social auth packages.
 2018-06-13 22:25:03 -04: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
Jeremy Bowman
69092ac18b Fix unit tests with latest social-auth-* packages 2018-06-13 17:24:33 -04:00
Feanil Patel
9e3ab9909f Actually update social auth packages. 2018-06-13 17:24:33 -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
Sylvia Pearce
efd5b9abbd Merge pull request #18371 from edx/sylvia/DOC-3826 
Update export page to have same text as import page
 2018-06-13 14:35:08 -04:00
Stu Young
eb35a4105d Merge pull request #18369 from edx/testeng/bokchoy_auto_cache_update_75b254a0cbb6983193faa7a040934a2d45edbb78 
Bokchoy db cache update
 2018-06-13 12:12:15 -04:00
Sylvia Pearce
02b29d4bde Update export page to have same text as import page 2018-06-13 12:04:22 -04:00
Calen Pennington
1491491d21 Don't treat self-closing tags as context starters 2018-06-13 10:00:13 -04:00
Calen Pennington
b735a127b9 Fix assorted linting errors 2018-06-13 10:00:13 -04:00
Calen Pennington
afc6899c30 Limit the length of browser log file names 2018-06-13 10:00:11 -04:00
Calen Pennington
5a5b73dcfa Load xblock resources into studio *before* the corresponding xblock html 2018-06-13 10:00:11 -04:00
edx-cache-uploader-bot
237d3114e9 Updating migrations 2018-06-13 09:30:52 -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
Zia Fazal
74c96374e0 Merge pull request #18368 from edx/ziafazal/WL-1616 
WL-1616: Use custom theming.get_current_site method instead of Site.objects.get_current
 2018-06-13 17:41:43 +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
Christopher Lee
edb7dd6f60 Merge pull request #18360 from edx/clee/LEARNER-5166-clean-waffle 
Finalize rate limit for enrollment API
 2018-06-12 18:11:59 -04:00
Christopher Lee
f6e0c70f41 Finalize rate limit for enrollment API 
LEARNER-5166
 2018-06-12 15:44:33 -04:00
Feanil Patel
285ae08d42 Merge pull request #18318 from edx/tasawer/learner-4819/update_facebook_integration 
Update Facebook integration
 2018-06-12 13:07:39 -04:00
Feanil Patel
d9c0d1cb7f Don't upgrade py2neo to 4.0.0 
It seems to have broken tests.
 2018-06-12 12:28:55 -04:00
Albert (AJ) St. Aubin
f09e79b7fa Merge pull request #18359 from edx/revert-18355-waheed/LEARNER-5527-throttle-course-list-api 
Revert "Rate limit course list API."
 2018-06-12 12:09:49 -04:00
Albert (AJ) St. Aubin
e3c84bc8de Revert "Rate limit course list API." 2018-06-12 12:06:51 -04:00
Feanil Patel
7290cad5b7 Run make upgrade after unpinning the social auth packages. 2018-06-12 11:27:44 -04:00
Tasawer Nawaz
79e429d5cd Update facebook integration 
LEARNER-4819
 2018-06-12 11:19:39 -04:00
Brian Mesick
e9df135251 Merge pull request #18332 from edx/bmedx/remove_model_options_monkey_patch 
Remove now-unused django_db_models_options.py
 2018-06-12 09:43:35 -04:00
Waheed Ahmed
95fe092e6b Merge pull request #18355 from edx/waheed/LEARNER-5527-throttle-course-list-api 
Rate limit course list API.
 2018-06-12 16:59:27 +05:00
edX Transifex Bot
61b777f6f6 Update translations 2018-06-12 06:57:22 -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
bmedx
50c46fd9d9 Remove now-unused django_db_models_options.py 
Code that actually used it was removed in this commit:
26b4e30833 (diff-8d36006736e42cad141490ae17f58a89)
 2018-06-11 13:43:09 -04: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
edX Transifex Bot
6e59025501 Update translations 2018-06-10 17:13:53 -04:00
Robert Raposa
50f36603f5 Merge pull request #18346 from edx/clee/trottle3 
Change waffle flag for enrollment throttle to switch
 2018-06-08 17:11:33 -04: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