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

46734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ayub-khan
49a73b7f0e Merge pull request #18546 from edx/fix-i18n-issues 
fix-i18n-issues
 2018-07-10 11:40:39 +05:00
ayub-khan
168ba70d96 fix-i18n-issues 2018-07-10 11:00:12 +05:00
Ayub-khan
1555d4cb8c Merge pull request #18535 from edx/update-django-wiki-version 
Updated django-wiki version
 2018-07-10 10:04:15 +05:00
Braden MacDonald
f1d026b172 Merge pull request #18512: Include original state in learner response report 2018-07-09 16:14:24 -07:00
Kshitij Sobti
4d48a59f3f Make stylelint fixes to get over quality threshold 2018-07-10 02:21:02 +05:30
Jeremy Bowman
fabbdabc5a Merge pull request #18529 from edx/jmbowman/TE-2632 
TE-2632 Fix site fixture domains for devstack bok-choy tests
 2018-07-09 16:48:50 -04:00
Michael Terry
86e79c59ed Paginate notify_credentials queries 
Avoid blowing up on the giant queries that notify_credentials does by
paginating the queries before we resolve them.
 2018-07-09 16:06:52 -04:00
Kshitij Sobti
c7f980c9de Add correct answer to response 2018-07-09 23:57:14 +05:30
Kshitij Sobti
491532c2db Update report generation code to include old state for backwards compatibility 
Include report data generated by blocks as columns instead of a json dict
 2018-07-09 23:56:51 +05:30
Awais Jibran
0d5c660d8a Merge pull request #18520 from edx/aj/fix-display-inline-on-course-outline 
Display check-marks inline.
 2018-07-09 22:31:16 +05:00
ayub-khan
bfff2da76f -Updated django-wiki to v0.0.19 2018-07-09 19:23:57 +05:00
Brittney Exline
e983722d49 Merge pull request #18531 from edx/bexline/enterprise_version_bump 
ENT-1074 Upgrade edx-enterprise version to 0.70.5
 2018-07-06 13:48:58 -06:00
Nimisha Asthagiri
8ac2dea0c2 Merge pull request #18501 from edx/arch/remove-course-structures-part3 
Remove course_structures app (part 3)
 2018-07-06 15:14:07 -04:00
Brittney Exline
b851335573 ENT-1074 Upgrade edx-enterprise version to 0.70.5 2018-07-06 13:14:19 -04:00
Jeremy Bowman
93ed653b7b TE-2632 Fix site fixture domains for devstack bok-choy tests 2018-07-06 13:02:57 -04:00
Jeremy Bowman
d2f442e19b Merge pull request #18523 from edx/jmbowman/TE-2631 
TE-2631 Fix notes bok-choy tests in devstack
 2018-07-06 12:50:13 -04:00
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
73e8828f65 course_structures: Remove app completely 2018-07-05 13:08:31 -04:00
Jeremy Bowman
c962e7914c TE-2631 Fix notes bok-choy tests in devstack 2018-07-05 11:55:24 -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
Awais Jibran
243bfb09fd Revert: Display check-marks inline. 
EDUCATOR-3149 (41aa1fd)
 2018-07-05 11:36:55 +05:00
Awais Jibran
41aa1fd426 Display check-marks inline. 
EDUCATOR-3149
 2018-07-05 11:32:39 +05: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