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

46714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Uman Shahzad
3789cfffc6 Merge pull request #17900 from open-craft/kshitij/swift_export_issue 
Fix course export issues
 2018-07-06 21:45:54 +05:00
Marco Morales
76bc7a1807 Merge pull request #18528 from edx/marco/platform-header/active-tab-styling-fix 
updated header active tab border color
 2018-07-06 12:13:18 -04:00
marcotuts
d7ab8327cb updated header active tab border color 2018-07-06 10:51:57 -04:00
Michael Roytman
6db4d88549 Merge pull request #18524 from edx/mroytman/bump-studio-frontend-1.12.0 
bump studio-frontend package to 1.12.0
 2018-07-06 09:26:25 -04:00
Robert Raposa
8124df3b0c Merge pull request #18518 from open-craft/kshitij/bump-version-of-edx-search 
Bump version of edx-search
 2018-07-06 09:13:21 -04:00
Michael Roytman
c64d836962 bump studio-frontend package to 1.12.0 2018-07-06 08:32:41 -04:00
Ayub-khan
4b12453325 Merge pull request #18517 from edx/update-i18n-tools-version 
updated edx-ora and i18n-tools version
 2018-07-06 14:59:57 +05:00
Kshitij Sobti
842612b8ea Only use export_output_handler if artifact storage is explicitly FileSystemStorage 
Use StreamingHttpResponse to support larger file downloads
 2018-07-06 13:08:12 +05:30
ayub-khan
258ac1d29b updated edx-ora and i18n-tools version 2018-07-06 10:58:59 +05:00
Michael Terry
f98415377d Avoid flattening a queryset 
notify_credentials was flattening a queryset when it shouldn't have,
which was exploding a large query all into memory. Hopefully this will
help with that.
 2018-07-05 16:36:42 -04:00
Kevin Falcone
5c41fc69e9 Merge pull request #18513 from edx/jibsheet/bump-django-oauth2-provider 
Get a management command bugfix in from oauth2-provider 1.3.3
 2018-07-05 14:47:51 -04:00
Nimisha Asthagiri
a1c9b75a6c Merge pull request #18500 from edx/arch/remove-course-structures-table 
Remove course_structures app (part 2)
 2018-07-05 11:36:30 -04:00
Jeremy Bowman
127b1049ff Merge pull request #18511 from edx/jmbowman/TE-2630 
TE-2630 Fix discussions bok-choy tests in devstack
 2018-07-05 11:06:38 -04:00
Marco Morales
8216fccb63 Merge pull request #18519 from edx/marco/course-outline/style-fix 
Styling fix for Course Outline subsection label
 2018-07-05 10:40:24 -04:00
marcotuts
07718b90ab updated subsection styling to show label on same line as icon, meant to complete EDUCATOR-2535 2018-07-04 13:42:44 -04:00
irfanuddinahmad
9b92b21bb6 Merge pull request #18516 from edx/iahmad/ENT-1022-Change-effective-date-on-API-TOS 
ENT-1022 updated effective date in API TOS
 2018-07-04 18:13:58 +05:00
Kshitij Sobti
d316a4c6b6 Bump version of edx-search 2018-07-04 18:28:19 +05:30
irfanuddinahmad
65ce6f0d4b updated effective date 2018-07-04 15:15:18 +05:00
Kevin Falcone
6c181bde71 Get a management command bugfix in from oauth2-provider 1.3.3 2018-07-03 16:31:19 -04:00
Jeremy Bowman
b74131a726 TE-2630 Fix discussions bok-choy tests in devstack 2018-07-03 14:33:54 -04:00
Robert Raposa
1a69d05f67 Merge pull request #18509 from edx/arch/delete-flaky-bokchoy-studio-library 
Remove flaky test: LibraryHelpTest.test_library_content_nav_help
 2018-07-03 11:42:04 -04:00
Jeremy Bowman
99f5d9c4cf Merge pull request #18507 from edx/jmbowman/TE-2583 
TE-2583 Avoid redundant bok-choy DB setup steps
 2018-07-03 11:36:41 -04:00
Jeremy Bowman
addbf0f0e6 Merge pull request #18503 from edx/jmbowman/TE-2586 
TE-2586 Add missing time zone data to bok-choy fixtures
 2018-07-03 11:35:44 -04:00
Nimisha Asthagiri
40c51e3d65 Remove flaky test: LibraryHelpTest.test_library_content_nav_help 
EDUCATOR-3146
 2018-07-03 10:33:50 -04:00
Feanil Patel
aa3b6643b7 Merge pull request #18505 from edx/feanil/remove_flaky_content_library_test 
Remove flaky content library test.
 2018-07-03 10:01:54 -04:00
Zubair Afzal
831e7621e1 Merge pull request #18508 from edx/zub/ENT-1052-rename-enterprise-customer-catalog-uuid-queryparam 
ENT-1052 Rename enterprise customer catalog uuid in queryparam to catalog
 2018-07-03 18:02:50 +05:00
Nimisha Asthagiri
a0a3732aca course_structures: Migration to delete CourseStructure model 2018-07-03 09:00:33 -04:00
Nimisha Asthagiri
c1bb585aea Merge pull request #18499 from edx/arch/remove-course-structures-usage 
Remove course_structures app (part 1)
 2018-07-03 08:58:32 -04:00
zubair-arbi
66937b2cdf ENT-1052 Rename enterprise customer catalog uuid in queryparam to catalog 2018-07-03 17:09:56 +05:00
Nimisha Asthagiri
77bf86fb73 Fix unclearly related test failure 2018-07-03 07:37:57 -04:00
Tasawer Nawaz
6a4924f9d4 Merge pull request #18478 from edx/tasawer/LEARNER-4744/inactive-enrollments-in-support-tool 
inactive enrollments in support tool
 2018-07-03 15:55:34 +05:00
Feanil Patel
3ab9dc1aab Merge pull request #18506 from edx/feanil/pin_pylint-plugin-utils 
Pin pylint-plugin-utils until we move to python 3.
 2018-07-03 06:55:09 -04:00
Jeremy Bowman
fb3f786c66 TE-2583 Avoid redundant bok-choy DB setup steps 2018-07-02 18:13:50 -04:00
Robert Raposa
df94c82a04 Merge pull request #17332 from open-craft/john/improve-search-error-messages 
Improve search error messages
 2018-07-02 16:53:20 -04:00
Feanil Patel
48774a7383 Pin pylint-plugin-utils until we move to python 3. 
the plugin has abandonned support for python 2 so functionality is not
guaranteed in future upgrades.
 2018-07-02 16:35:10 -04:00
Feanil Patel
6878a3c295 Merge pull request #18504 from edx/feanil/remove_flaky_video_tests 
Remove flaky video test.
 2018-07-02 16:32:49 -04:00
Feanil Patel
43527542aa Merge pull request #18502 from edx/feanil/upgrade_django 
Upgrade to the latest Django 1.11 + `make upgrade`
 2018-07-02 15:57:13 -04:00
Feanil Patel
1caeb3283e Remove flaky video test. 
This test failed on commit 7083797c54 even though
that change has nothing to do with the video tests.
 2018-07-02 15:02:45 -04:00
Feanil Patel
99dcf32eee Remove flaky content library test. 
This test failed on commit 7083797c54 even though
that change has nothing to do with the content library.
 2018-07-02 15:02:14 -04:00
Jeremy Bowman
451514e930 TE-2586 Add missing time zone data to bok-choy fixtures 2018-07-02 13:55:54 -04:00
Feanil Patel
1d8319c779 Upgrade to the latest Django 1.11 + make upgrade 
Django 1.11 Changelog - https://docs.djangoproject.com/en/2.0/releases/1.11.14/
 2018-07-02 13:55:19 -04:00
Nimisha Asthagiri
afdecc77fd course_structures: remove app code, except migrations and models 2018-07-02 12:40:25 -04:00
Nimisha Asthagiri
4a9063d83b course_structures: remove usages 2018-07-02 12:36:34 -04:00
Nimisha Asthagiri
066b24a6a3 CourseStructure: remove from Discussions 2018-07-02 12:32:21 -04:00
Agha Awais
beca586b7a Merge pull request #18345 from edx/awais/lett_2_bc_advanced_settings 
bokchoy conversion of advanced settings - Part1
 2018-07-02 20:20:57 +05:00
Alessandro Roux
dcf9bb4458 Merge pull request #18480 from edx/roux/remove-discussions-workaround 
Remove copied toolbar asset from edx.org theme.
 2018-07-02 10:17:39 -04:00
Tasawer Nawaz
8868f07394 inactive enrollments in support tool 
LEARNER-4744
 2018-07-02 19:02:43 +05:00
aghaawais01
f4e4f7c96f bokchoy conversion of advanced settings 2018-07-02 13:56:01 +00:00
Awais Jibran
4b81ab6312 Merge pull request #18367 from edx/aj/EDUCATOR-3035/screenreader-issue 
Screen reader issue with structure of LMS course outline
 2018-07-02 15:33:54 +05:00
Ayub-khan
7b0888ceb3 Merge pull request #18496 from edx/update-translations-2-july 
Update translations 2 july
 2018-07-02 12:10:46 +05:00