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

47261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
5af7fffced Remove unnecessary mocking of CourseKey.from_string in tests 2018-10-11 09:54:12 -04:00
Calen Pennington
13c0dd580f Make Student Dashboard course access error messages float to the right of the unenroll gear 2018-10-11 09:54:12 -04:00
Calen Pennington
ae41ac446e Allow AccessResponse messages to appear on the student dashboard 2018-10-11 09:54:12 -04:00
Calen Pennington
2ce5417e0c Allow UserPartitions to specify a text or html message when a user is denied access because of their partition membership 2018-10-11 09:54:12 -04:00
Calen Pennington
3a7cff01e8 Allow AccessResponse objects to carry an HTML fragment targetted at the user 2018-10-11 09:54:12 -04:00
Bill Filler
e14f70035e Merge pull request #18888 from edx/bfiller/journal-frontend-config 
Support for separate Journals frontend app
 2018-09-06 15:14:12 -04:00
Bill Filler
a8b1fee847 Add support for Journals frontend app 2018-09-06 14:20:45 -04:00
Michael Youngstrom
c8b4ca6bf4 Merge pull request #18848 from edx/youngstrom/clear-dark-lang-db 
Clear cache after tests that create DarkLangConfig objects
 2018-09-06 12:11:35 -04:00
Michael Youngstrom
bc1d883e1a Dont let DarkLangConfig cache interfere with other tests 2018-09-06 10:33:54 -04:00
Asad Iqbal
655d6abea8 Merge pull request #18745 from edx/asadiqbal08/ENT-769 
[ENT-769] - Unlink learner from Enterprise Customer
 2018-09-06 15:02:50 +05:00
Jeremy Bowman
62a08a0e27 Merge pull request #18860 from mitodl/pdpinch/bump-edx-sga 
bump edx-sga to 0.8.3
 2018-09-06 09:08:36 +00:00
Robert Raposa
7e2c08e6b4 Merge pull request #18890 from edx/robrap/remove-flaky-video-test 
EDUCATOR-3417: Remove flaky video test.
 2018-09-05 16:42:46 -04:00
Robert Raposa
6f835e408f Merge pull request #18891 from edx/robrap/remove-flaky-completion-test-2 
EDUCATOR-3418: Remove flaky completion test.
 2018-09-05 16:42:19 -04:00
Robert Raposa
366486fc6a Remove flaky completion test. 
* test_render_xblock_publish_completion_is_sent_on_view
 2018-09-05 14:40:51 -04:00
Robert Raposa
69204d5a61 Remove flaky video test. 
* test_video_language_menu_working
 2018-09-05 14:36:11 -04:00
Robert Raposa
5b49a8e926 Merge pull request #18887 from edx/robrap/remove-flaky-completion-test 
EDUCATOR-3409: Remove flaky completion test.
 2018-09-05 11:48:20 -04:00
Robert Raposa
d3d270f829 Remove flaky completion test. 
* test_courseware_publish_completion_is_sent_on_view
 2018-09-05 11:01:37 -04:00
Calen Pennington
139d40b76b Merge pull request #18854 from cpennington/cale/edu-3262-logging 
Log conditional xblock fragment resource loading
 2018-09-05 10:40:49 -04:00
edx-pipeline-bot
ba2f1ca272 Merge pull request #18881 from edx/private_to_public_06d4044 
Mergeback PR from private to public.
 2018-09-04 17:04:36 -04:00
Farhanah Sheets
06d4044696 Merge pull request #145 from edx/fsheets/EDUCATOR-3346 
Update recommender-xblock version number
 2018-09-04 16:15:35 -04:00
Diana Huang
755ebc8c7f Send program cert visible_date 
When sending a program cert to Credentials, also send along a
calculated visible_date along with it.

LEARNER-6262
 2018-09-04 16:05:24 -04:00
Rabia Iftikhar
05debb8d54 Merge pull request #18867 from edx/ri/EDUCATOR-3385-attribute-error 
EDUCATOR-3385 fix attribute error in discussion email notification
 2018-09-04 23:47:43 +05:00
rabiaiftikhar
f3cc1d83fc EDUCATOR-3385 fix attribute error in discussion response notification 2018-09-04 23:10:57 +05:00
Qubad786
7f91655878 Update VAL release tag 2018-09-04 19:07:03 +05:00
irfanuddinahmad
527edc5c45 Add video thumbnails management command to scrape youtube thumbnails and update them in edxval 2018-09-04 19:07:03 +05:00
Qubad786
89925a96dc use waffle_flags from video pipeline and fix tests 2018-09-04 19:07:03 +05:00
Qubad786
e24438602d Deprecate youtube for existing courses by not sending course_video_upload_token to VEDA. 2018-09-04 19:07:03 +05:00
muhammad-ammar
809175d4cf add support to enable/disable hls as primary playback 
EDUCATOR-2714
 2018-09-04 19:07:03 +05:00
Mushtaq Ali
7698a277cd Scrape video thumbnails from youtube util - EDUCATOR-3109 2018-09-04 19:07:03 +05:00
Brandon Baker
565670323d Merge pull request #18851 from edx/bbaker/reveal-industry-pathways 
Reveal industry pathways in program details sidebar
 2018-09-04 09:30:13 -04:00
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
Peter Pinch
bba13c9fbb bump edx-sga to 0.8.3 2018-08-30 14:28:56 -04:00