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

46687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
ayub-khan
0ba3d602a1 -updated js translations 2018-07-02 11:33:58 +05:00
Stu Young
db20130e74 Merge pull request #18494 from edx/testeng/bokchoy_auto_cache_update_9ab88d82af61d5b09c4e3829b463c3ed30641df6 
Bokchoy db cache update
 2018-06-29 16:22:01 -04:00
edx-cache-uploader-bot
c8ad22f457 Updating migrations 2018-06-29 15:08:44 -04:00
edx-cache-uploader-bot
41d0e56a0e Updating migrations 2018-06-29 15:08:43 -04:00
edx-cache-uploader-bot
48889c13f8 Updating migrations 2018-06-29 15:08:42 -04:00
edx-cache-uploader-bot
6670883b4d Updating migrations 2018-06-29 15:08:41 -04:00
edx-cache-uploader-bot
81c995e5f0 Updating migrations 2018-06-29 15:08:40 -04:00
edx-cache-uploader-bot
2a2e8d1d89 Updating migrations 2018-06-29 15:08:39 -04:00
Jeremy Bowman
27920e6e96 Merge pull request #18493 from edx/jmbowman/TE-2629 
TE-2629 Use better field type for applicationaccess.application
 2018-06-29 15:03:06 -04:00
Jeremy Bowman
809f3d51e7 TE-2629 Use better field type for applicationaccess.application 2018-06-29 14:23:09 -04:00
Michael Youngstrom
e5780fe96b Merge pull request #18491 from edx/youngstrom/remove-npm-from-unit 
Remove NPM install for unittest runs
 2018-06-29 13:40:57 -04:00
Kevin Falcone
9aff2fdf9f Merge pull request #18476 from edx/jibsheet/make-DATA_DIR-configurable 
This resolves VPC-122 and OPS-56
 2018-06-29 12:59:57 -04:00
Michael Youngstrom
17238132b7 Remove NPM install for unittest runs 2018-06-29 12:47:55 -04:00
Zubair Afzal
d5df04fca4 Merge pull request #18470 from edx/zub/ENT-1052-discount-by-enterprise-catalog 
ENT-1052 discount by enterprise catalog
 2018-06-29 17:03:22 +05:00
zubair-arbi
bbdcf6de7a ENT-1052 discount by enterprise catalog 2018-06-29 16:04:06 +05:00
Nimisha Asthagiri
a95a2b91b7 Merge pull request #18458 from edx/arch/oauth-scopes-apis 
Enable Grades and Certificates APIs to enforce OAuth Scopes
 2018-06-28 20:27:28 -04:00
Nimisha Asthagiri
ce4cb53672 Update Permissions to use latest edx-drf-extensions and rest_condition 2018-06-28 18:37:53 -04:00
Nimisha Asthagiri
522349c502 Upgrade edx-drf-extensions and add rest_condition 2018-06-28 18:37:52 -04:00
Nimisha Asthagiri
b203e8a13b Enable OAuth Scopes for Grades API 2018-06-28 18:37:52 -04:00
Nimisha Asthagiri
3a45bab57c Enable OAuth Scopes for Certificates API 2018-06-28 18:37:52 -04:00
Douglas Hall
7083797c54 Merge pull request #18487 from edx/douglashall/override_default_jwt_issuer 
Override DEFAULT_JWT_ISSUER and RESTRICTED_APPLICATION_JWT_ISSUER settings.
 2018-06-28 17:14:13 -04:00
Douglas Hall
195676d539 Override DEFAULT_JWT_ISSUER and RESTRICTED_APPLICATION_JWT_ISSUER settings. 2018-06-28 17:10:18 -04:00
Calen Pennington
b85d6f031c Merge pull request #18417 from cpennington/cale/fix-ora-webpack 
Cale/fix ora webpack
 2018-06-28 12:47:53 -04:00
Douglas Hall
2a77710e10 Merge pull request #18429 from edx/douglashall/oauth_scopes_part2 
ARCH-116 OAuth2 Scopes Implementation
 2018-06-28 11:17:17 -04:00
Michael Roytman
41f6bbbb97 Merge pull request #18466 from edx/mroytman/EDUCATOR-3026-add-links-to-course-checklist 
pass relevant links to studio-frontend checklist
 2018-06-28 10:37:08 -04:00
Douglas Hall
db22939193 Add OAuth2 Scopes and Filters to JWTs. 2018-06-28 10:30:09 -04:00
sandroroux
033358bf8a Remove copied toolbar asset from edx.org theme. 2018-06-28 10:26:26 -04:00