Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,418 Commits 1 Branch 0 Tags
5f97cecefbeb7ed9583c6257a78bb2e08d7f7b4f
Commit Graph

47418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
5f97cecefb Remove course publish from CCX data migration. 
This removes the portion of the CCX course names data migration
that triggers course publishing. While course publishing is the
desired behavior, doing so within the migration makes it so that
this migration is not practical to run if you have hundreds or
thousands of CCX courses (we run out of memory).

By doing the data migration without the accompanying course
publishes, this means that CCX course names will still show up
incorrectly for courses until there is an edit or publish of
either that CCX course or the underlying course that the CCX
course extends. But we at least set up the data so that it's
gradually self-correcting over time, and do so with little coding
effort or operational risk/weirdness.

A more comprehensive fix for this would involve:

* Fixing the memory leak around CourseOverviews creation and/or;
* Moving CourseOverview generation to happen asynchronously and/or;
* Being more careful about transactionality in the data migration
  and running it repeatedly until it all passes.

Full details of our migration issues are at:

https://github.com/edx/edx-platform/pull/18808#issuecomment-422930820
 2018-09-28 18:54:14 -04:00
Michael Youngstrom
65ab430c04 Merge pull request #19011 from edx/youngstrom/paver_test_fixes 
Use Mock environment for paver quality tests
 2018-09-26 14:02:08 -04:00
Michael Youngstrom
0959d7d8c2 Use Mock environment for paver quality tests 2018-09-26 11:44:28 -04:00
Ahsan Ul Haq
0167ef431a Merge pull request #18926 from edx/ahsan/LEARNER-6336 
Reduce query to user table
 2018-09-26 17:59:25 +05:00
Ahsan Ulhaq
39f48a8c10 Reduce query to user table 
LEARNER-6336
 2018-09-26 17:16:42 +05:00
Ned Batchelder
14a8ea7be7 Merge pull request #18864 from open-craft/paulo/export-import-library 
[OC-3682] Implement management commands to export/import content libraries
 2018-09-26 05:17:02 -04:00
Michael Youngstrom
ba56e39e24 Merge pull request #19005 from edx/youngstrom/mongo-count-flaky 
Fix flaky mongo count test with xdist
 2018-09-25 16:27:14 -04:00
Michael Youngstrom
0ec4232cb5 Ensure we are starting at 0 when counting mongo queries 2018-09-25 14:43:50 -04:00
Qubad786
318937552a Update VAL version and thumbnails scrapper job in accordance with val api 2018-09-25 20:12:10 +05:00
Nimisha Asthagiri
0a88746aef Merge pull request #18980 from edx/arch/jwt-http-cookies 
Refactor Login Cookies
 2018-09-25 09:46:37 -04:00
Nimisha Asthagiri
b7deedfb36 Refactor Login Cookies 2018-09-25 09:12:08 -04:00
hamzamunir7300
636ce3b7d7 Merge pull request #18883 from edx/LEARNER-3832 
Account Page refreshes on autosave/combobox Language value change
 2018-09-25 18:04:54 +05:00
Matjaz Gregoric
754090279e Address review comments. 2018-09-25 10:52:40 +02:00
Paulo Viadanna
5d59e2df0b Content library export/import commands 2018-09-25 09:29:00 +02:00
Stu Young
a531953543 Merge pull request #18984 from edx/testeng/bokchoy_auto_cache_update_5f06ea40003105ed26d042509c33f30d67aa5e6e 
Bokchoy db cache update
 2018-09-24 15:16:08 -04:00
edx-pipeline-bot
007869836c Merge pull request #18995 from edx/private_to_public_7a92944 
Mergeback PR from private to public.
 2018-09-24 12:07:56 -04:00
edx-cache-uploader-bot
5ca3418d9f Updating migrations 2018-09-24 11:54:27 -04:00
Tasawer Nawaz
7a929442d4 Merge pull request #147 from edx/tasawer/learner-6216/fix-account-validation-on-account-page 
Fix for duplicate email validation on account settings page
 2018-09-24 14:54:06 +05:00
edX Transifex Bot
02418e1401 Update translations 2018-09-23 17:17:49 -04:00
Bill DeRusha
e878b9fb0e Merge pull request #18978 from edx/bderusha/unGDPRfix 
Set usable password when canceling user retirement
 2018-09-21 15:19:48 -04:00
Jeremy Bowman
ca51aa5351 Merge pull request #18874 from shadinaif/django-ipware-upgrade-INCR-7 
Upgrade the django-ipware Package to a version Supports Python 3
 2018-09-21 14:49:55 -04:00
Bill DeRusha
b43b174fdd Set usable password when canceling user retirement 2018-09-21 14:18:57 -04:00
Matthew Piatetsky
e1d2169f70 Merge pull request #18977 from edx/prevent_activation_time_error 
prevent activation time error
 2018-09-21 12:21:11 -04:00
Shadi Naif
b2c9240a8e Upgrade the django-ipware package from the old 1.1.0 version to the latest version that supports Python 3 
(version 2.1.0 as of this commit)

This PR is intended to close INCR-7 issue ( see https://openedx.atlassian.net/browse/INCR-7 )
 2018-09-21 18:14:14 +03:00
Feanil Patel
57117901dd Merge pull request #18979 from edx/feanil/remove_old_cybersource_processor 
Remove the cybersource processor that was deprecated in 2014.
 2018-09-21 10:55:59 -04:00
George Babey
e7bf9ddd0a Update edx-enterprise to 0.73.5 
This PR updated edx-enterprise to 0.73.5 to pull in these changes and allow
filtering enterprises by slug
https://github.com/edx/edx-enterprise/pull/366
https://github.com/edx/edx-enterprise/pull/367
 2018-09-21 07:18:10 -04:00
Stu Young
208e855679 Merge pull request #18959 from edx/estute/load-npm-cache-on-jenkins-workers 
load cached npm cache on jenkins workers
 2018-09-20 14:48:27 -04:00
Feanil Patel
8bcdc65e4c Remove the cybersource processor that was deprecated in 2014. 2018-09-20 13:54:27 -04:00
Jeremy Bowman
f878d731e3 Merge pull request #18875 from shadinaif/edx-django-oauth2-provider-upgrade-INCR-8 
Upgrade the edx-django-oauth2-provider package to a version Supports Python 3
 2018-09-20 13:23:23 -04:00
Shadi Naif
09e36b9784 Upgrade the edx-django-oauth2-provider package to the latest version that supports Python3 
(version 1.3.4 as of this commit)

This commit is intended to close INCR-8 issue (see https://openedx.atlassian.net/browse/INCR-8 )
 2018-09-20 12:59:11 +03:00
Calen Pennington
44c6936ecb Merge pull request #18950 from cpennington/fix-educator-3262-v4 
Return an unresolved promise when loading javascript resource urls in…
 2018-09-19 19:14:15 -04:00
Matthew Piatetsky
f738e74e7e prevent activation time error 2018-09-19 17:06:15 -04:00
Calen Pennington
5b7e59e02b Return an unresolved promise when loading javascript resource urls in ConditionalModule 2018-09-19 15:00:51 -04:00
Cory Lee
3c129e9104 Revert "small change to test PR messaging on deployment" 
This reverts commit 7f11a8bfa1.
 2018-09-19 14:28:04 -04:00
Cliff Dyer
1a9ad318e4 Merge pull request #18966 from edx/cliff/completion-tests 
Fix query counts on completion tests.
 2018-09-19 12:27:27 -04:00
J. Cliff Dyer
1f45a7e934 Fix query counts on completion tests and update requirements. 
Update requirements
 2018-09-19 11:16:12 -04:00
Ned Batchelder
784594b41b Merge pull request #18961 from edx/nedbat/simplify-a-mixin 
No need to keep self.tracker here
 2018-09-18 18:32:30 -04:00
Michael Youngstrom
e20c6cf5d6 Merge pull request #18967 from edx/youngstrom/xdist-flaky-fixes 
Ignore errors in paver test cleanup
 2018-09-18 18:03:39 -04:00
Cali
920f3c7e99 Merge pull request #18972 from edx/cstenson/update_password_urls 
Override change password urls in django admin.
 2018-09-18 17:56:26 -04:00
Cali Stenson
46a4bdb115 Override change password urls in django admin. 
LEARNER-4928
 2018-09-18 17:11:49 -04:00
Michael Youngstrom
5d10dbad4a Handle issues with delete_quality_junit_xml 2018-09-18 16:26:27 -04:00
Stu Young
7701b28097 Merge pull request #18969 from edx/testeng/bokchoy_auto_cache_update_b480b115d499240404ff58542305060895d74c9a 
Bokchoy db cache update
 2018-09-18 14:54:43 -04:00
Diana Huang
f88415f89a Merge pull request #18970 from edx/diana/override-admin-templates 
Override admin templates to remove links that allow admin users to change passwords
 2018-09-18 14:53:22 -04:00
edx-cache-uploader-bot
07eadd46e1 Updating migrations 2018-09-18 13:46:15 -04:00
Diana Huang
0fb8f08d2e Override admin templates to remove links that allow admin users to change 
passwords.

LEARNER-4928
 2018-09-18 13:43:30 -04:00
Peter Pinch
204a08271c Merge pull request #18158 from mitodl/pdpinch/undefined-var-error 
More descriptive error messages for UndefinedVariable
 2018-09-18 13:23:47 -04:00
edx-pipeline-bot
89963efd3a Merge pull request #18968 from edx/release-mergeback-to-master 
Merge release back to master
 2018-09-18 12:56:07 -04:00
Ned Batchelder
0dcd1b3339 Merge pull request #18962 from edx/nedbat/remove-setup-args 
No need for superstitious kwargs
 2018-09-18 12:07:58 -04:00
Stuart Young
fd580eab97 load cached npm cache on jenkins workers 2018-09-18 11:56:41 -04:00
Michael Youngstrom
b1e31a7080 Merge pull request #18957 from edx/youngstrom/refactor-unittests 
Refactor PipelineRenderTest to avoid npm install
 2018-09-18 11:20:43 -04:00