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

46352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Calen Pennington
8a2201da93 Include the error message when an XBlock fails to load javascript 2018-05-29 12:19:05 -04:00
Calen Pennington
389f4fcec9 Switch container.js to bundle using webpack 2018-05-29 12:19:05 -04:00
Stu Young
f55b8abda4 Merge pull request #18270 from edx/testeng/bokchoy_auto_cache_update_4888805951b5c50932071001a2866cd01b700b6a 
Bokchoy db cache update
 2018-05-29 11:04:50 -04:00
edx-cache-uploader-bot
eff98b7707 Updating migrations 2018-05-29 10:23:28 -04:00
edX Transifex Bot
658abab674 Update translations 2018-05-27 17:18:53 -04:00
Feanil Patel
a0d19fd728 Merge pull request #18269 from edx/feanil/drop_unused_index 
Feanil/drop unused index
 2018-05-27 13:12:06 -04:00
Feanil Patel
25da206c38 Migration for index removal. 2018-05-27 16:28:51 +00:00
Feanil Patel
06a11c2ed7 Update model. 2018-05-27 12:12:10 -04:00
M. Rehan
29c7ca7513 Merge pull request #18240 from edx/mrehan/backward-transcript-export 
Backward compatible video transcripts export (<= open-release/ginkgo.master)
 2018-05-25 23:07:37 +05:00
Qubad786
3d01a5b24a bump VAL 2018-05-25 21:29:26 +05:00
Qubad786
f9476ab4ff Update old transcripts metadata present in video xml with the new transcripts for backward compatibility. 2018-05-25 21:29:26 +05:00
Eric Fischer
827ea3f089 Merge pull request #17776 from open-craft/kshitij/response_report_blocks 
Enhance learner response report feature
 2018-05-25 10:28:46 -04:00
Kshitij Sobti
73179edd18 Adapt tests to work with the presence of generate_report_data 
Add integrationish test
 2018-05-25 19:19:53 +05:30
Kshitij Sobti
011b295890 Handle NotImplementedError raised by generate_report_data 2018-05-25 18:44:59 +05:30
Kshitij Sobti
7e01a065b9 Use `generate_report_data` for getting report data if the block provides it 2018-05-25 18:44:59 +05:30
Kshitij Sobti
ccabab0771 Added chapter blocks to be excluded from report 2018-05-25 18:44:59 +05:30
Kshitij Sobti
1aa55c6cfa Documentation grammar and accuracy fixes 2018-05-25 18:44:59 +05:30