Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,340 Commits 1 Branch 0 Tags
667df875bdb2bb66546b395d3aba2c9e3f40b0f7
Commit Graph

53340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Waheed Ahmed
941c67d495 Merge pull request #18876 from edx/waheed/LEARNER-6313-fix-expire-entitlement-on-switching-session 
Fix entitlement expiring on switching session.
 2018-09-04 18:01:54 +05:00
Waheed Ahmed
711343a7c7 Fix entitlement expiring on switching session. 
LEARNER-6313
 2018-09-04 11:38:58 +05:00
asadiqbal
0dbdac3262 Unlink learner from Enterprise Customer when learner unlinks from IDP 2018-09-04 11:07:53 +05:00
edx-pipeline-bot
889e54846d Merge pull request #18873 from edx/release-mergeback-to-master 
Merge release back to master
 2018-08-31 20:37:20 -04:00
David Ormsbee
86b762d093 Merge pull request #18872 from edx/ormsbee/aurora_discussions_fix 
Change access pattern for role/permissions retrieval to address Aurora query optimizer.
 2018-08-31 17:03:30 -04:00
David Ormsbee
ebbd262710 Modify forum roles query for Aurora performance. 
This is a fix for the performance issues in EDUCATOR-3374

AWS's Aurora backend for MySQL selects the wrong index on the
django_comment_client_role_users table, leading to performance issues.
This commit replaces that join with individual requests for permissions
for each role (of which there may be several for any given user).
It's dumber SQL, but Aurora will do the right thing.
 2018-08-31 16:34:53 -04:00
Brandon Baker
171e95f904 Reveal professional pathways in program sidebar. 
Professional pathways are referred to as industry pathways in the code
to help differentiate them from professional certificate programs.
 2018-08-31 12:57:50 -04:00
Jeremy Bowman
67f74a3784 Merge pull request #18869 from edx/aed/revert-bokchoy-tests 
Revert "studio grading bokchoy tests III"
 2018-08-31 11:43:11 -04:00
Alex Dusenbery
3afe741143 Revert "studio grading bokchoy tests III" 
This reverts commit 9b9f7c26cd.
 2018-08-31 10:28:06 -04:00
Agha Awais
ccccc1bf74 Merge pull request #18728 from edx/awais/lett_2_bc_grading_III 
studio grading bokchoy tests III
 2018-08-31 16:22:28 +05:00
Agha Awais
9b9f7c26cd studio grading bokchoy tests III 2018-08-31 10:36:51 +00:00
Kevin Falcone
b024159147 Merge pull request #18866 from edx/jibsheet/require-sqlparse-for-migrations 
Migrations are run on machines without development requirements
 2018-08-30 21:23:29 -04:00
Kevin Falcone
079c8801fb Migrations are run on machines without development requirements 
We added a migration to a ManyToMany key in both directions and that had
to be done with RunSQL which requires sqlparse
https://docs.djangoproject.com/en/1.11/ref/migration-operations/#runsql
 2018-08-30 20:42:58 -04:00
Kevin Falcone
a358b212bb Merge pull request #18859 from edx/aed/revert-first-try 
Revert "EDUCATOR-3374 | Hacky query to fix inline discussions performance."
 2018-08-30 17:24:12 -04:00
Kevin Falcone
1a99c56bb3 Merge pull request #18858 from edx/aed/comment-role-users-index 
Add a (user_id, role_id) index to dcc_role_users table.
 2018-08-30 17:24:00 -04:00
Alex Dusenbery
e707804670 Revert "EDUCATOR-3374 | Hacky query to fix inline discussions performance." 
This reverts commit 4a1caf6c03.
 2018-08-30 16:40:49 -04:00
Alex Dusenbery
d9f60cba7a Add a (user_id, role_id) index to dcc_role_users table. 2018-08-30 16:40:25 -04:00
Nimisha Asthagiri
ad5ed57160 Revert Quality fixes 2018-08-30 16:33:03 -04:00
Nimisha Asthagiri
4ca165f690 Revert "ARCH-223: Retire deprecated RequestCache." 2018-08-30 16:33:03 -04:00
Jolyon Bloomfield
9981b153b3 Remember to add changes before committing... 2018-08-30 16:22:50 -04:00
Jolyon Bloomfield
28e64d95cc Handle situation where attempts have been reset to 0 and problem is regraded; Update comments 2018-08-30 16:21:23 -04:00
Peter Pinch
3763d26651 clarify comments 2018-08-30 15:57:42 -04:00
Peter Pinch
bba13c9fbb bump edx-sga to 0.8.3 2018-08-30 14:28:56 -04:00
Nimisha Asthagiri
8459982512 Merge pull request #18847 from edx/robrap/ARCH-223-replace-request-cache 
ARCH-223: Retire deprecated RequestCache
 2018-08-30 12:59:49 -04:00
Guruprasad Lakshmi Narayanan
a21d9bf381 Convert DATA_DIR to a Path object when fetching from ENV_TOKENS 
This fixes the exceptions raised by code that expects it to be a Path
object. For instance, the LMS sysadmin dashboard courses page expects
DATA_DIR to be a Path object and throws a 500 Internal Server error if
it isn't.
 2018-08-30 22:00:42 +05:30
Robert Raposa
3df339a56a Retire deprecated RequestCache. 
ARCH-223
 2018-08-30 08:55:19 -04:00
Alex Dusenbery
4a1caf6c03 EDUCATOR-3374 | Hacky query to fix inline discussions performance. 2018-08-29 20:17:54 -04:00
Calen Pennington
8878edea26 Log conditional xblock fragment resource loading 2018-08-29 13:46:17 -04:00
Rabia Iftikhar
39a4a396a8 Merge pull request #18834 from edx/ri/EDUCATOR-3030-donot-submit-completion-grader-response 
EDUCATOR-3030 don't submit completion for grader's response while updating problem score.
 2018-08-29 22:32:04 +05:00
Jeremy Bowman
15bd17ba13 Merge pull request #18800 from edx/jmbowman/TE-2646 
TE-2646 Use headless Chrome for a11y tests
 2018-08-29 09:59:18 -04:00
rabiaiftikhar
72cba77bbb EDUCATOR-3030 donot submit completion for grader's response while updating problem score. 2018-08-29 16:04:28 +05:00
Jeremy Bowman
f2626c0d70 TE-2646 Use headless Chrome for a11y tests 2018-08-28 17:26:26 -04:00
Bill DeRusha
fe5279ed5c Merge pull request #18836 from edx/bderusha/backpopulate-logging 
Add logging to signal and flag to mgmt cmd for credential grades
 2018-08-28 10:19:12 -04:00
Bill DeRusha
cce8a53ba9 Add logging to signal and flag to mgmt cmd for credential grades 2018-08-28 09:19:19 -04:00
Squirrel18
23db2e4ffb Changes style selectors. 2018-08-27 17:36:33 -05:00
Diego Millan
33081e67cc adding unsupported browser alert 2018-08-27 16:09:28 -05:00
Waheed Ahmed
33130622f0 Merge pull request #18841 from edx/waheed/LEARNER-6247-fix-refund-entitlement-on-audit-unenroll 
Fix refund entitlement on audit course un-enroll.
 2018-08-27 22:08:21 +05:00
Peter Pinch
ddd8d41906 expose attempts to python custom grader 2018-08-27 11:49:55 -04:00
Waheed Ahmed
e3dbfe9c0f Fix refund entitlement on audit course un-enroll. 
LEARNER-6247
 2018-08-27 17:47:59 +05:00
bryankle
2892ce6eff Merge pull request #18826 from edx/bryankle/incr-5 
INCR-5 Removed pynliner version constraint and upgraded
 2018-08-24 18:25:05 -04:00
Michael Youngstrom
bf6b63b4f7 Merge pull request #18835 from edx/youngstrom/readd-test_login_failure 
Re add test_login_failure
 2018-08-24 15:45:28 -04:00
Michael Youngstrom
324ddfbeda Re add test_login_failure 2018-08-24 15:18:13 -04:00
Michael Youngstrom
b614c19e16 Merge pull request #18833 from edx/youngstrom/bok-choy-flaky 
Remove flaky bok-choy tests
 2018-08-24 15:06:26 -04:00
Bryan Le
9897f766ed pyliner upgrade excluding package-lock.json 2018-08-24 14:38:37 -04:00
Michael Youngstrom
e79ffb3b39 Merge pull request #18831 from edx/youngstrom/celery-enrollment-task-tests 
Switch where we create the mock in test_tasks
 2018-08-24 14:37:50 -04:00
Michael Youngstrom
29c312854d Remove test acceptance.tests.lms.test_lms.LoginFromCombinedPageTest.test_login_failure 2018-08-24 14:34:08 -04:00
Michael Youngstrom
b343b2dcb2 Remove acceptance.tests.lms.test_account_settings.AccountSettingsPageTest.test_preferred_language_field 2018-08-24 14:32:27 -04:00
Brittney Exline
7c19efbbbb Merge pull request #18832 from edx/bexline/enterprise_version_bump 
ENT-1177 Upgrade edx-enterprise to 0.73.0
 2018-08-24 11:46:03 -06:00
Brittney Exline
2b002caaf9 ENT-1177 Upgrade edx-enterprise to 0.73.0 2018-08-24 13:08:34 -04:00
Michael Youngstrom
eadf3650a7 Switch where we create the mock 2018-08-24 12:53:54 -04:00