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

580 Commits

Author SHA1 Message Date
Ehtesham
b31ba9d041 upgrade Pagingcollection to edx-ui-toolkit's PagingCollection 2016-05-27 04:35:44 +05:00
Brian Jacobel
f4bede6c5b Fix library load paths (incl. jquery.scrollTo) 
Simplify paths in karma_cms_squire require paths
 2016-05-24 16:53:59 -04:00
Daniel Friedman
230f252bad Fix the way jquery and jquery-migrate are loaded 
Don't use symlinks to include node_modules
 2016-05-24 16:53:51 -04:00
Daniel Friedman
15f148141f Upgrade jQuery 1.7.2 to 2.2.0 
FEDX-25
 2016-05-24 16:52:50 -04:00
Usman Khalid
2839a42e0c Moved jasmine addons to common/js/spec_helpers. 2016-05-05 22:42:02 +05:00
cahrens
d9bb206868 Jasmine-jquery was moved to npm. 2016-05-02 10:27:33 -04:00
muzaffaryousaf
e89a32d5c6 Upgrade backbone via npm. 
TNL-4335
 2016-04-27 12:48:45 +05:00
muzaffaryousaf
1b0cda2430 Js test fixes for lms and lms-coffee. 2016-04-22 19:09:33 +05:00
muzaffaryousaf
c0fef0b0e0 Js test fixes for cms and cms-squire. 2016-04-22 19:09:33 +05:00
muzaffaryousaf
9cbfea2edd Js test fixes for common, common-requirejs, xmodule. 2016-04-22 19:09:31 +05:00
Chris Rodriguez
df5520bdf9 Video player: adding Dragabilly to closed captions 
* tests for dragging
* icon location reference updates
* pattern library usage
 2016-04-14 15:29:38 -04:00
Chris Rodriguez
fbe6160461 LMS: updating transcript skip links 2016-04-07 12:18:08 -04:00
Andy Armstrong
db62db295c Upgrade Underscore.string 
FEDX-117
 2016-04-04 10:18:43 -04:00
Andy Armstrong
6dd09a89cf Fix issues with Underscore in the asset pipeline 
FEDX-121

The previous approach for handling NPM assets was
to symlink them into the static directory. This appeared
to cause trouble with the asset pipeline where the files
in question were not installed and then old versions were
picked up instead.

This change instead copies NPM libraries to a new
static directory so that the pipeline can consume them
as with any other file. This new directory is added to
.gitignore so that the files don't get accidentally
checked in.
 2016-03-25 10:02:38 -04:00
M. Rehan
c9e1a86086 Merge pull request #11860 from edx/adam/fix-math-input-ajax 
TNL-4217 – Initialize preview once for an input for the first time
 2016-03-23 00:58:18 +05:00
Adam Palay
d3a467d366 Only add event listener if it hasn't been added yet 2016-03-23 00:00:27 +05:00
Andy Armstrong
e854690a99 Revert "Upgrade underscore.string.min.js." 
This reverts commit e5c7fdda03.

Unfortunately this change broke bundling on sandboxes, so reverting
it so that master isn't left in a bad state.
 2016-03-22 10:44:19 -04:00
cahrens
e5c7fdda03 Upgrade underscore.string.min.js. 
FED-68
 2016-03-17 23:33:55 -04:00
cahrens
dd2a203677 Upgrade underscore to newest version. 
FEDX-24
 2016-03-16 17:08:27 -04:00
Andy Armstrong
06daf79b94 Upgrade RequireJS 
FEDX-105
 2016-03-16 12:42:00 -04:00
Calen Pennington
f092550945 Merge pull request #11562 from CredoReference/tags-selectbox-in-studio-based-on-xblockasides 
XBlockAside improvement. Difficulty selectbox in Studio (based on new XBlockAside functionality)
 2016-03-10 10:32:22 -05:00
cahrens
2f3e3a55bb Remove unused profile name. 
The profile name requires escaping when displayed. Proactively removing since it is not being used. Also discovered some dead code.
 2016-03-07 09:37:39 -05:00
cahrens
5432ef3b5e Make it clear that the logger methods are used by xblocks. 2016-03-05 17:14:15 -05:00
Dmitry Viskov
209ddc700d Difficulty selectbox in Studio (based on new XBlockAside functionality). Include: 
- adaptation asides to be imported from the XML
- updating SplitMongo to handle XBlockAsides (CRUD operations)
- updating Studio to handle XBlockAsides handler calls
- updating xblock/core.js to properly init XBlockAsides JavaScript
 2016-03-02 03:37:13 +03:00
Braden MacDonald
cfa7cd3d87 Revert "Pass DOM element, not jQuery object to XBlock initialisation." 2016-02-26 09:06:13 -08:00
Adam Palay
c63dcf0dfe render mathjax in svg by default (TNL-4145) 
mathjax preview should be inline by default
 2016-02-24 12:51:30 -05:00
Sven Marnach
8280e224f5 Merge pull request #11433 from open-craft/smarnach/studio-add-xblock 
Pass DOM element, not jQuery object to XBlock initialisation.
 2016-02-15 17:24:10 +01:00
cahrens
c69226841d Install underscore from npm. 
FEDX-47
 2016-02-12 13:45:41 -05:00
Sven Marnach
982c3e623b Pass DOM element, not jQuery object to XBlock initialisation. 
The function initializeXBlock() expects a DOM element, and is passed one in most
cases.  However, when adding a new XBlock component in Studio, the function is
passed a jQuery object, which ends up being forwarded to the actual
initialisation function of the XBlock.
 2016-02-10 18:54:30 +01:00
asadiqbal
64778cdf69 WL-272 2016-02-10 14:33:38 +05:00
asadiqbal
99b883b7be WL-243 LMS Language Selection 2016-01-28 20:07:26 +05:00
Diana Huang
ea2a0cab27 Merge pull request #11069 from OmarIthawi/edraak/oithawi/draggable-capa-rtl 
Fixup: draggable capa icons disappear in RTL layout
 2016-01-20 13:32:56 -05:00
Toby Lawrence
3b73839ed2 Adding optimized images in batches [14/19] 2016-01-13 20:38:41 -05:00
Toby Lawrence
c19a6af96b Adding optimized images in batches [13/19] 2016-01-13 20:38:41 -05:00
Toby Lawrence
c71f0fa2ce Adding optimized images in batches [12/19] 2016-01-13 20:38:41 -05:00
Toby Lawrence
0cdaa975fc Adding optimized images in batches [11/19] 2016-01-13 20:38:40 -05:00
Toby Lawrence
7efd8773fb Adding optimized images in batches [10/19] 2016-01-13 20:38:40 -05:00
Toby Lawrence
451b0a9c66 Revert "Crush down images." 
This reverts commit 8402be3b20.
 2016-01-13 19:12:13 -05:00
Toby Lawrence
8402be3b20 Crush down images. 
Ran these suckers through ImageOptim, which crunched 'em down real nice.
 2016-01-13 18:29:00 -05:00
Calen Pennington
8cba4702ce Shrink images using trimage 
.../js/vendor/ova/images/previous_pressed.png      | Bin 755 -> 665 bytes
 .../static/js/vendor/ova/images/previous_rest.png  | Bin 661 -> 572 bytes
 .../js/vendor/ova/images/zoomin_grouphover.png     | Bin 612 -> 496 bytes
 .../static/js/vendor/ova/images/zoomin_hover.png   | Bin 608 -> 506 bytes
 .../static/js/vendor/ova/images/zoomin_pressed.png | Bin 615 -> 515 bytes
 common/static/js/vendor/ova/images/zoomin_rest.png | Bin 612 -> 496 bytes
 .../js/vendor/ova/images/zoomout_grouphover.png    | Bin 504 -> 397 bytes
 .../static/js/vendor/ova/images/zoomout_hover.png  | Bin 559 -> 461 bytes
 .../js/vendor/ova/images/zoomout_pressed.png       | Bin 561 -> 458 bytes
 .../static/js/vendor/ova/images/zoomout_rest.png   | Bin 504 -> 397 bytes
 common/test/data/aside/static/just_a_test.jpg      | Bin 547 -> 517 bytes
 common/test/data/badges/good.png                   | Bin 298 -> 91 bytes
 common/test/data/badges/large.png                  | Bin 431556 -> 429842 bytes
 common/test/data/badges/unbalanced.png             | Bin 232 -> 86 bytes
 .../static/images/course_image.jpg                 | Bin 12626 -> 12617 bytes
 .../static/images/professor-sandel.jpg             | Bin 453715 -> 447109 bytes
 .../Screen Shot 2013-04-16 at 1.43.36 PM.png       | Bin 8733 -> 1525 bytes
 .../data/simple/static/images_course_image.jpg     | Bin 547 -> 517 bytes
 common/test/data/static/picture1.jpg               | Bin 10905 -> 6857 bytes
 common/test/data/static/picture2.jpg               | Bin 13598 -> 9739 bytes
 common/test/data/static/picture3.jpg               | Bin 14977 -> 9946 bytes
 common/test/data/toy/static/just_a_test.jpg        | Bin 547 -> 517 bytes
 common/test/data/uploads/Signature-0.png           | Bin 31182 -> 14473 bytes
 common/test/data/uploads/Signature-1.png           | Bin 31182 -> 14473 bytes
 common/test/data/uploads/larger_image.jpg          | Bin 1070335 -> 1053927 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:40 -05:00
Calen Pennington
ae283f6ac6 Shrink images using trimage 
.../vendor/ova/catch/img/expandableIcon_Arrow.png   | Bin 3002 -> 2085 bytes
 common/static/js/vendor/ova/catch/img/fish.jpg      | Bin 11572 -> 11482 bytes
 .../js/vendor/ova/catch/img/geolocation_icon.png    | Bin 740 -> 624 bytes
 .../static/js/vendor/ova/catch/img/groups_icon.png  | Bin 747 -> 624 bytes
 .../static/js/vendor/ova/catch/img/privacy_icon.png | Bin 635 -> 538 bytes
 .../js/vendor/ova/catch/img/shareControls.png       | Bin 9691 -> 7624 bytes
 .../static/js/vendor/ova/catch/img/share_icon.png   | Bin 655 -> 520 bytes
 .../js/vendor/ova/images/fullpage_grouphover.png    | Bin 698 -> 584 bytes
 .../static/js/vendor/ova/images/fullpage_hover.png  | Bin 831 -> 723 bytes
 .../js/vendor/ova/images/fullpage_pressed.png       | Bin 817 -> 709 bytes
 .../static/js/vendor/ova/images/fullpage_rest.png   | Bin 698 -> 584 bytes
 .../static/js/vendor/ova/images/home_grouphover.png | Bin 672 -> 565 bytes
 common/static/js/vendor/ova/images/home_hover.png   | Bin 737 -> 631 bytes
 common/static/js/vendor/ova/images/home_pressed.png | Bin 741 -> 645 bytes
 common/static/js/vendor/ova/images/home_rest.png    | Bin 672 -> 565 bytes
 .../js/vendor/ova/images/newan_grouphover.png       | Bin 746 -> 641 bytes
 common/static/js/vendor/ova/images/newan_hover.png  | Bin 815 -> 710 bytes
 .../static/js/vendor/ova/images/newan_pressed.png   | Bin 828 -> 721 bytes
 common/static/js/vendor/ova/images/newan_rest.png   | Bin 746 -> 641 bytes
 .../static/js/vendor/ova/images/next_grouphover.png | Bin 656 -> 574 bytes
 common/static/js/vendor/ova/images/next_hover.png   | Bin 753 -> 667 bytes
 common/static/js/vendor/ova/images/next_pressed.png | Bin 752 -> 666 bytes
 common/static/js/vendor/ova/images/next_rest.png    | Bin 656 -> 574 bytes
 .../js/vendor/ova/images/previous_grouphover.png    | Bin 661 -> 572 bytes
 .../static/js/vendor/ova/images/previous_hover.png  | Bin 755 -> 667 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:39 -05:00
Calen Pennington
dade7f49b0 Shrink images using trimage 
.../gwt/chrome/images/ie6/vborder_blue_shadow.png     | Bin 144 -> 130 bytes
 .../gwt/chrome/images/ie6/vborder_gray_shadow.png     | Bin 148 -> 131 bytes
 .../capa/jsme/gwt/chrome/images/splitPanelThumb.png   | Bin 308 -> 220 bytes
 .../gwt/chrome/images/valuespinner/bg_textbox.png     | Bin 193 -> 87 bytes
 .../static/js/capa/jsme/gwt/chrome/images/vborder.png | Bin 188 -> 125 bytes
 .../js/capa/jsme/gwt/chrome/images/vborder_ie6.png    | Bin 201 -> 110 bytes
 .../js/capa/jsmolcalc/gwt/clean/images/circles.png    | Bin 1492 -> 974 bytes
 .../capa/jsmolcalc/gwt/clean/images/circles_ie6.png   | Bin 432 -> 358 bytes
 .../js/capa/jsmolcalc/gwt/clean/images/corner.png     | Bin 1140 -> 709 bytes
 .../js/capa/jsmolcalc/gwt/clean/images/corner_ie6.png | Bin 412 -> 328 bytes
 .../js/capa/jsmolcalc/gwt/clean/images/hborder.png    | Bin 1995 -> 1205 bytes
 .../capa/jsmolcalc/gwt/clean/images/hborder_ie6.png   | Bin 706 -> 607 bytes
 .../js/capa/jsmolcalc/gwt/clean/images/thumb_horz.png | Bin 222 -> 113 bytes
 .../jsmolcalc/gwt/clean/images/thumb_vertical.png     | Bin 231 -> 119 bytes
 .../js/capa/jsmolcalc/gwt/clean/images/vborder.png    | Bin 298 -> 182 bytes
 .../capa/jsmolcalc/gwt/clean/images/vborder_ie6.png   | Bin 189 -> 136 bytes
 .../js/vendor/markitup/sets/wiki/images/clean.png     | Bin 667 -> 544 bytes
 .../vendor/markitup/sets/wiki/images/list-bullet.png  | Bin 344 -> 312 bytes
 .../vendor/markitup/sets/wiki/images/list-numeric.png | Bin 357 -> 319 bytes
 .../js/vendor/markitup/sets/wiki/images/preview.png   | Bin 537 -> 536 bytes
 .../js/vendor/markitup/skins/simple/images/handle.png | Bin 258 -> 130 bytes
 .../js/vendor/markitup/skins/simple/images/menu.png   | Bin 27151 -> 169 bytes
 .../vendor/markitup/skins/simple/images/submenu.png   | Bin 240 -> 170 bytes
 common/static/js/vendor/ova/catch/img/closeIcon.png   | Bin 1114 -> 550 bytes
 .../static/js/vendor/ova/catch/img/expandableIcon.png | Bin 1279 -> 621 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:38 -05:00
Calen Pennington
9a7443bfdb Shrink images using trimage 
common/static/js/capa/genex/images/thumb_horz.png     | Bin 222 -> 113 bytes
 common/static/js/capa/genex/images/thumb_vertical.png | Bin 231 -> 119 bytes
 common/static/js/capa/genex/images/vborder.png        | Bin 298 -> 182 bytes
 common/static/js/capa/genex/images/vborder_ie6.png    | Bin 189 -> 136 bytes
 .../jsme/40BAF81124143A595056A9CCA0E9DBBA.cache.png   | Bin 2890 -> 2795 bytes
 .../images/button/menu-button-arrow-disabled.png      | Bin 173 -> 109 bytes
 .../gwt/chrome/images/button/menu-button-arrow.png    | Bin 173 -> 109 bytes
 .../images/button/split-button-arrow-active.png       | Bin 280 -> 222 bytes
 .../images/button/split-button-arrow-disabled.png     | Bin 185 -> 125 bytes
 .../chrome/images/button/split-button-arrow-focus.png | Bin 185 -> 125 bytes
 .../chrome/images/button/split-button-arrow-hover.png | Bin 185 -> 125 bytes
 .../gwt/chrome/images/button/split-button-arrow.png   | Bin 185 -> 125 bytes
 .../chrome/images/combobox/arrow-down-disabled.png    | Bin 170 -> 104 bytes
 .../jsme/gwt/chrome/images/combobox/arrow-down.png    | Bin 170 -> 104 bytes
 .../gwt/chrome/images/combobox/ellipsis-disabled.png  | Bin 165 -> 108 bytes
 .../capa/jsme/gwt/chrome/images/combobox/ellipsis.png | Bin 166 -> 100 bytes
 .../static/js/capa/jsme/gwt/chrome/images/corner.png  | Bin 1181 -> 750 bytes
 .../js/capa/jsme/gwt/chrome/images/corner_ie6.png     | Bin 397 -> 314 bytes
 .../jsme/gwt/chrome/images/glasspanel/blue_ridge.png  | Bin 263 -> 96 bytes
 .../static/js/capa/jsme/gwt/chrome/images/hborder.png | Bin 1591 -> 808 bytes
 .../js/capa/jsme/gwt/chrome/images/hborder_ie6.png    | Bin 970 -> 815 bytes
 .../gwt/chrome/images/ie6/corner_dialog_topleft.png   | Bin 213 -> 162 bytes
 .../gwt/chrome/images/ie6/corner_dialog_topright.png  | Bin 258 -> 226 bytes
 .../gwt/chrome/images/ie6/hborder_blue_shadow.png     | Bin 150 -> 133 bytes
 .../gwt/chrome/images/ie6/hborder_gray_shadow.png     | Bin 153 -> 136 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:36 -05:00
Calen Pennington
ed12c61dd0 Shrink images using trimage 
.../static/images/capa/vsepr/T-shaped-3D-balls.png | Bin 57074 -> 53926 bytes
 .../images/capa/vsepr/Tetrahedral-3D-balls.png     | Bin 53631 -> 48796 bytes
 .../static/images/capa/vsepr/Trigonal-3D-balls.png | Bin 56071 -> 51879 bytes
 .../capa/vsepr/Trigonal-bipyramidal-3D-balls.png   | Bin 47683 -> 43395 bytes
 .../images/capa/vsepr/Trigonal-planar-stick.png    | Bin 89521 -> 69265 bytes
 common/static/images/hd.png                        | Bin 364 -> 355 bytes
 common/static/images/high_pass_filter.png          | Bin 48150 -> 26132 bytes
 common/static/images/ico-tinymce-code.png          | Bin 337 -> 228 bytes
 common/static/images/ml_grading_icon.png           | Bin 405 -> 379 bytes
 common/static/images/partially-correct-icon.png    | Bin 1141 -> 1047 bytes
 common/static/images/peer_grading_icon.png         | Bin 610 -> 472 bytes
 common/static/images/placeholder-faculty.png       | Bin 9137 -> 9130 bytes
 common/static/images/placeholder-image.png         | Bin 2312412 -> 1930682 bytes
 .../static/images/sequence-nav/list-finished.png   | Bin 1063 -> 139 bytes
 .../static/images/sequence-nav/list-unfinished.png | Bin 1070 -> 142 bytes
 .../static/images/sequence-nav/list-unstarted.png  | Bin 1067 -> 142 bytes
 common/static/images/sequence-nav/next-icon.png    | Bin 1079 -> 264 bytes
 .../static/images/sequence-nav/previous-icon.png   | Bin 1062 -> 256 bytes
 common/static/images/voltage_divider.png           | Bin 27331 -> 13855 bytes
 common/static/js/capa/genex/images/circles.png     | Bin 1492 -> 974 bytes
 common/static/js/capa/genex/images/circles_ie6.png | Bin 432 -> 358 bytes
 common/static/js/capa/genex/images/corner.png      | Bin 1140 -> 709 bytes
 common/static/js/capa/genex/images/corner_ie6.png  | Bin 412 -> 328 bytes
 common/static/js/capa/genex/images/hborder.png     | Bin 1995 -> 1205 bytes
 common/static/js/capa/genex/images/hborder_ie6.png | Bin 706 -> 607 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:35 -05:00
Omar Al-Ithawi
7cf1353f01 Fixup: draggable capa icons disappear in RTL layout 2015-12-28 09:41:30 +02:00
Ibrahim Ahmed
5832b579be Merge pull request #11004 from edx/ibrahimahmed443/SOL-1479-change-time-allotment 
Ibrahimahmed443/sol 1479 change time allotment
 2015-12-21 21:55:30 +05:00
ibrahimahmed443
f3d43ab5db SOL-1479 set max time limit to 99:59 hours; add jasmine tests to validate time limit 2015-12-21 19:30:49 +05:00
Christine Lytwynec
ba53f97bf1 prevent duplicate #lean_overlay elements 2015-12-17 12:16:12 -05:00
Chris Rodriguez
78c6a38ca6 LMS: new UI for video player + AFontGarde iconfonts 2015-11-12 16:37:29 -05:00
Andy Armstrong
7a1469633f Fix optimizing of draggabilly and json2 2015-11-06 09:40:20 -05:00