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

16079 Commits

Author SHA1 Message Date
Calen Pennington
85a375a38f Add webpack assets directly to xmodule fragments, rather than injecting them in fragment contents 2018-06-06 12:52:12 -04:00
Calen Pennington
0abe75a7c6 Re-apply the changes to convert XBlocks to Webpack 
Reapplies edx/edx-platform#17509

This reverts commit 0f7e2373d0.
 2018-06-06 12:52:12 -04:00
Michael Youngstrom
f4dc2ca000 Merge pull request #18314 from edx/youngstrom/remove_django_18_shim 
Remove temp django upgrade logic
 2018-06-06 11:09:17 -04:00
Tyler Hallada
1f42d1b384 Merge pull request #18316 from edx/thallada/PLAT-1524-on-delete 
PLAT-1524: Add on_delete kwarg to ForeignKey & OneToOneFields
 2018-06-06 10:38:15 -04:00
Michael Youngstrom
26b4e30833 Remove django 1.8 shim 2018-06-06 10:34:56 -04:00
Tyler Hallada
1540f9ec72 Add on_delete kwarg to ForeignKey & OneToOneFields 
Django 2.0 will make this field required for `ForeignKey` and `OneToOneFields`.
In previous versions the option defaulted to `models.CASCADE` when not
specified. This change should make the deprecation warnings in the current
Django version go away.

The migrations where also modified, but the changes should not cause a change in
the database schema since `models.CASCADE` was already the old default.
 2018-06-05 17:05:12 -04:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g 
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
 2018-06-05 13:59:09 -04:00
Tyler Hallada
6e7f478402 Allow scrolling after insert/edit image in Studio 
The scroll lock class `modal-open` is removed from the body when the
EditImageModal is closed using the "Close" or "X" button, but not when the
"Insert Image" button is clicked. The submit button handler now calls the
`closeImageModal` handler too so that the `modal-open` class is removed after
inserting or editing an image.
 2018-06-04 12:31:04 -04:00
Cole Rogers
2ac2c045e3 Merge pull request #18296 from edx/colelrogers/remove-GDPR-flag 
Removed GDPR flags and usages WIP
 2018-06-04 11:56:13 -04:00
Cole Rogers
41bb144854 Removed student entrance test 2018-06-04 10:29:01 -04:00
Cole Rogers
623cb0d6ae Removed GDPR flag and its functionality 2018-06-04 10:25:37 -04:00
Asad Iqbal
1a4ef62f15 Merge pull request #18256 from edx/asadiqbal08/ENT-692 
[ENT-692] Change the log level from Warning to Info
 2018-06-04 11:00:52 +05:00
edx-cache-uploader-bot
8cdcc18456 Updating migrations 2018-06-01 14:34:46 -04:00
Diana Huang
65f0f6809d Add a configuration option for deleting student accounts. 2018-05-31 14:29:00 -04:00
asadiqbal
30db538e3a Change the log level to info 2018-05-31 19:43:11 +05:00
edx-cache-uploader-bot
dddb4a9548 Updating migrations 2018-05-31 09:58:57 -04:00
Ahsan Ul Haq
783aca5559 Merge pull request #17042 from raccoongang/dgamanenko/fix_username_missing_field 
Fix "admin/auth/user/add "username" missing field.
 2018-05-31 14:22:36 +05:00
edx-cache-uploader-bot
882564b215 Updating migrations 2018-05-30 12:14:53 -04: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
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
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
Calen Pennington
5b8b23ff0c Consolidate location of word_cloud assets 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
a16b8cc4b5 Clean up pylint failures 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
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
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
f557bad5a3 Wait for MathJax for tests, rather than MathJax.isReady 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
389f4fcec9 Switch container.js to bundle using webpack 2018-05-29 12:19:05 -04:00
edx-cache-uploader-bot
eff98b7707 Updating migrations 2018-05-29 10:23:28 -04: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
Amir Qayyum Khan
2f7643f7d8 more reforting 2018-05-25 15:50:05 +05:00
Amir Qayyum Khan
594a7c4ac6 throwing exception when user has conflict with username or email 2018-05-25 15:50:05 +05:00
Amir Qayyum Khan
92e224f002 Fixed code to include special characters in username 2018-05-25 15:50:05 +05:00
Zia Fazal
f2ea2ca360 Added a base MessageType for ace 
added unit tests

updated edx-ace version

fixed quality violations

Fixed quality violations

Changed ACEMessageType to BaseMessageType
 2018-05-25 10:52:33 +05:00
Daniel Clemente Laboreo
6d3f8150db Implement generate_report_data for capa problems 2018-05-24 22:09:58 +03:00
Feanil Patel
8519a867e0 Merge pull request #18264 from edx/feanil/remove_flaky_entrance_exam_test 
Remove this flaky entrance exam test.
 2018-05-23 16:15:10 -04:00
Feanil Patel
8b25553590 Remove two flaky tests for the studio outline. 2018-05-23 15:02:18 -04:00