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

46372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Uman Shahzad
8b68afa03a Merge pull request #18284 from edx/uman/ent-0.68.8 
[ENT-863] Bump edx-enterprise to 0.68.8.
 2018-05-31 01:23:38 +05:00
Troy Sankey
172b1c8c09 Merge pull request #18268 from edx/pwnage101/edxnotes_retirement_endpoint 
Add API endpoint for retiring a user from EdxNotes (edx-notes-api)
 2018-05-30 14:17:09 -04:00
Stu Young
6f20eff83f Merge pull request #18287 from edx/testeng/bokchoy_auto_cache_update_51c0d1d754ff731cf41ff7190a64d244acc418c9 
Bokchoy db cache update
 2018-05-30 13:12:25 -04:00
Troy Sankey
b2f4762dc4 Add API endpoint for retiring a user from EdxNotes (edx-notes-api) 
This also creates an appropriate course-agnostic location for notes
APIs, under /api/edxnotes/v1/.
 2018-05-30 12:46:07 -04:00
edx-cache-uploader-bot
882564b215 Updating migrations 2018-05-30 12:14:53 -04:00
Matthew Piatetsky
e9a153c5e6 Merge pull request #18279 from edx/add_email_to_metadata 
add user email to metadata
 2018-05-30 11:50:15 -04:00
Feanil Patel
6ac803ed6e Merge pull request #18275 from edx/feanil/drop_moar_indices 
Feanil/drop moar indices
 2018-05-30 11:26:31 -04:00
Uman Shahzad
7d03b9cc73 Bump edx-enterprise to 0.68.8. 2018-05-30 19:35:32 +05:00
Matthew Piatetsky
8f5aeb5151 add email to metadata 2018-05-30 10:21:42 -04:00
Waheed Ahmed
18b01af08f Merge pull request #18283 from edx/waheed/LEARNER-5373-fix-credentials-cache-key 
Pass program UUID as resource_id to generate unique cache key.
 2018-05-30 17:56:42 +05:00
Waheed Ahmed
e7963a5b40 Pass program UUID as resource_id to generate unique cache key. 
Without program UUID cache key was same every time for single learner
on multiple programs and getting the same data from cache.

LEARNER-5373
 2018-05-30 16:20:45 +05:00
Rabia Iftikhar
f16d9a7033 Merge pull request #18267 from edx/ri/EDUCATOR-2927-changes-in-certificate-eligible-column 
EDUCATOR-2927 certificate eligible column will appear with value N for audit-passing learners in grade report
 2018-05-30 16:05:51 +05:00
rabiaiftikhar
2760eeba6e EDUCATOR-2927 certificate eligible column will appear with value N for audit-passing learners in grade report 2018-05-30 14:28:51 +05:00
Zia Fazal
90633c0956 Merge pull request #17974 from edx/ziafazal/WL-1239 
WL-1239: Ability to gate section based on completion percentage
 2018-05-30 12:52:43 +05:00
Zia Fazal
53cf5638b6 added radio input fields to pre-requisite selection 
Initial changes to gate section based on completion percentage

code refactoring and added evaluation of completion milestone

Fixed broken unit tests and added new tests

Fixed broken tests and quality violations

Fixed Pep8 violation

Fixed eslint quality violations

Test changes as suggested by reviewer

changes after feedbacy from reviewer

Update the docstring with suggested changes

excluding chapter from the blocks

Disallow empty values for min score and min completion

Changes afte feedback from UX/Accessibility

removed blank line
 2018-05-30 11:25:59 +05:00
Zia Fazal
3ed6427eaa Merge pull request #18272 from edx/ziafazal/WL-1575 
WL-1575: code refactor to avoid creation of duplicate oauth clients
 2018-05-30 11:16:02 +05:00
Zia Fazal
b74cbfb85a Merge pull request #18255 from edx/ziafazal/WL-1388 
WL-1388: Added a base MessageType for ace
 2018-05-30 11:14:04 +05:00
Calen Pennington
2eebcd1095 Merge pull request #18280 from edx/revert-17509-switch-container-factory-to-webpack 
Revert "Switch container factory to webpack"
 2018-05-29 16:03:21 -04:00
Calen Pennington
0f7e2373d0 Revert "Switch container factory to webpack" 2018-05-29 16:01:38 -04:00
Calen Pennington
6c8e0842cc Merge pull request #17509 from cpennington/switch-container-factory-to-webpack 
Switch container factory to webpack
 2018-05-29 14:27:38 -04:00
Awais Jibran
663dc1af8f Merge pull request #17573 from mitodl/fix_special_character_in_suername_instructor_apis 
Allow `@` in username in Staff Debug interface
 2018-05-29 23:24:00 +05:00
AlasdairSwan
ee74f03ea2 Merge pull request #18274 from edx/alasdair/LEARNER-5427-White-Label-account-deletion-bug 
LEARNER-5427 Ensure StudentAccountDeletion.jsx checks socialAccountLi…
 2018-05-29 13:35:55 -04:00
AlasdairSwan
c703682ebb LEARNER-5427 Ensure StudentAccountDeletion.jsx checks socialAccountLinks object because reunning .reduce on it 2018-05-29 12:41:15 -04:00
Calen Pennington
5b8b23ff0c Consolidate location of word_cloud assets 2018-05-29 12:39:28 -04:00
Calen Pennington
86658597fc Don't check for exceptions after assertRaises unless the exception was actually raised 2018-05-29 12:39:28 -04:00
Calen Pennington
741f65b502 Install jasmine-jquery from github to fix a bug in the toContain expectation 2018-05-29 12:39:28 -04:00
Calen Pennington
b03f1422a0 Move word_cloud webpack build back into standard XModule configuration 2018-05-29 12:39:28 -04:00
Calen Pennington
ab5e221070 Put Require.js in debug mode in LMS acceptance tests 2018-05-29 12:39:28 -04:00
Calen Pennington
56759b196f Upgrade django-webpack-loader (and other recent minor updates) 2018-05-29 12:39:28 -04:00
Calen Pennington
a16b8cc4b5 Clean up pylint failures 2018-05-29 12:28:19 -04:00
Calen Pennington
3315a503b3 Ignore specific non-member pylint errors 2018-05-29 12:28:19 -04:00
Calen Pennington
070dab2b81 Convert WordCloudMain to an es6 class 2018-05-29 12:28:19 -04:00
Calen Pennington
8a3ad0ee4d Pull AjaxPrefix into any webpack page that uses it 2018-05-29 12:28:19 -04:00
Calen Pennington
667dbf1687 Clean up eslint failures 2018-05-29 12:28:19 -04:00
Calen Pennington
61855b2b30 Extract a new webpack-based suite of cms javascript tests 2018-05-29 12:28:19 -04:00
Calen Pennington
28166f037c Delete flakey lettuce tests< 2018-05-29 12:21:47 -04:00
Calen Pennington
2895362718 Retry opening advanced settings if it fails the first time 2018-05-29 12:21:47 -04:00
Calen Pennington
3c85de030d Wait for js to finish loading before trying to click on advanced settings 2018-05-29 12:21:47 -04:00
Calen Pennington
04a5d3c7c6 Wait for specific javascript variables rather than requirejs loading on the unit page 2018-05-29 12:21:47 -04:00
Calen Pennington
5474ec0a8f Wait for the sock to be ready as a proxy for the Studio header being ready 2018-05-29 12:21:47 -04:00
Calen Pennington
2d7fdbcd97 Explicitly wait for the video editor to have opened when editing 2018-05-29 12:21:47 -04:00
Calen Pennington
d4bb203308 Log javascript errors during bok_choy tests 2018-05-29 12:21:47 -04:00
Calen Pennington
79cd02b001 Convert edit_tabs factory to webpack 2018-05-29 12:21:46 -04:00
Calen Pennington
ee6360543b Convert webpackified factories to es6 modules with global exports, and remove the invoke_page_factory pattern 2018-05-29 12:21:46 -04:00
Calen Pennington
12a082cf83 Convert xblock_validation.js to webpack 2018-05-29 12:19:05 -04:00
Calen Pennington
f557bad5a3 Wait for MathJax for tests, rather than MathJax.isReady 2018-05-29 12:19:05 -04:00
Calen Pennington
f166ee2592 Convert the Studio Library view to webpack 2018-05-29 12:19:05 -04:00
Calen Pennington
d08e199f79 Load XBlocks with webpack rather than RequireJS 2018-05-29 12:19:05 -04:00
Calen Pennington
94557900f8 Remove use of 'with' keyword from schematic.js 2018-05-29 12:19:05 -04:00
Calen Pennington
f7da1ba621 Use conditional blocks for webpack specific code edits 2018-05-29 12:19:05 -04:00