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

281 Commits

Author SHA1 Message Date
Greg Martin
4ddda443b8 Implement localized datetimes in browser 
moment-timezone require config

jasmine test fix, duplicate req. cleanup
 2016-10-14 15:25:38 -04:00
Pan Luo
03809c8c5c Fix the wrong target.src for annotations 
The annotation.target.src was assigned to a function instead of a string
because the missing brackets.
 2016-10-02 00:20:50 -07:00
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
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
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
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
Andy Armstrong
06daf79b94 Upgrade RequireJS 
FEDX-105
 2016-03-16 12:42:00 -04:00
cahrens
c69226841d Install underscore from npm. 
FEDX-47
 2016-02-12 13:45:41 -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
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
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
Andy Armstrong
18dabc3312 Upgrade draggabilly.js to fix Firefox iframe bug 
TNL-3627
 2015-11-05 10:10:39 -05:00
Sarina Canelake
2206b8a056 Merge pull request #10324 from stvstnfrd/debt/circuit 
Remove circuit djangoapp from LMS
 2015-10-29 11:15:15 -04:00
cahrens
c8f1987a84 Delete swfobject.js and analytics.js. 2015-10-28 14:52:43 -04:00
stv
a8d30c5de2 Remove circuit-schematic integration from wiki 2015-10-26 15:51:12 -07:00
cahrens
5c12890da5 Delete old, unused version of MathJax. 
This version was from 2012.
 2015-10-09 15:24:15 -04:00
Jesse Zoldak
1aa181c90a Update sinon to version 1.17.0 2015-09-24 10:55:48 -04:00
Andy Armstrong
6817e89f4a Fix i18n for last activity date on team cards 2015-09-09 17:59:25 -04:00
cahrens
497d76fa54 Optimize edxnotes files. 2015-07-21 10:54:02 -04:00
cahrens
4c39132f70 Correct issue for RequireJS optimizer. 2015-06-15 13:51:15 -04:00
Andy Armstrong
1689004189 Create a common paginated list view 
TNL-2384

Refactored Studio's PagingView to use RequireJS Text and moved it
to common so that it can also be used by LMS.
 2015-06-15 13:51:09 -04:00
cahrens
f70891b5c0 Add support for edX namespaced define. 2015-06-03 09:10:45 -04:00
cahrens
0ddf264714 2.0.14 version of requiresjs/text 2015-06-03 09:10:44 -04:00
David Baumgold
e8022c74f2 Merge pull request #8169 from AkA84/TNL-925-import-module-amendments 
TNL-925: Import module amendments
 2015-06-02 10:58:32 -04:00
Matt Drayer
af7277cdd9 New Feature: Certificates Web View 
- SOL-465: Initial implementation of certificates web view and signatories (names/titles)

- SOL-718 Close button is working properly

- SOL-801 Backbone Signatories Modeling

- SOL-803 Underscore template: Editor (Add)

- SOL-802 Signatories: Underscore template - Details

- SOL-804 Signatories: Underscore template: Editor (Edit)

- Add signatory delete Django view

- SOL-805 Signatory editor (Delete)

- Add Coffeescript router

- SOL-716 Jasmine Tests

- Added missing minified JS library

- client side validation of signatory fields

- SOL-390 signatories names

- Remove obsolete extends Sass files

- input maxlength limiting for signatory information

- SOL-389: Course title override

- SOL-466: Add capability to upload digitized signatures in Studio

- ziafazal: fixed css for upload signature image

- ziafazal: completed deletion of signature images

- UX-1741: Add initial static rendering/styling for Open edX web certs
  * creating new global static dir
  * adding static version of edX UX pattern library assets
  * adding web certificates static assets
  * adding static (+abstracted) web certificates rendering
  * creating two tiers of rendering (base + distinguished)
  * providing sample assets for certificate rendering
  * supporting RTL layouts
  * adding certifcates assests to edX static asset pipeline
  * temporarily hiding the mozilla open badges share action
  * wiring print button to print view/page
  * fixup! addressing conflict artifact in valid cert template
  * fixup! adding missing %hd-subsection sass extend + components comment clean up
  * fixup! correcting pattern library .hd-4 font-weight value

- SOL-468 Linked Student View for Web View Credential

- SOL-467: Add capability to upload organization logos for certificates

- SOL-391 / SOL-387: Signatory related info (assets) in certificates web view

- kelketek: Fixes for static asset collection in certificate HTML view.

- SOL-398 Web View: Public Access

- mattdrayer: Post-merge branch stabilization

- catong: Initial changes to Studio template and Help config file

- ziafazal: Branch stabilizations

- SOL-387: Display organization logo on LMS web view

- talbs/mattdrayer: Branch Stabilizations

- talbs: converting backpack action to use a button HTML element

- talbs: revising placeholder assets + their rendering in cert view

- mattdrayer: Username web view wireup

- SOL-386 Certificate Mode Previews

- SOL-905: Make organization logo and signatory signature uneditable

- SOL-922: Improve test coverage

- SOL-765: Add LinkedIn sharing

- [marco] temporary styling adjustment to account for smaller linkedin share image / fake button

- SOL-921: Address hardcoded template items

- SOL-927: Deleting certificate should delete org logo image also
  * updated invalid template
  * removed hr
  * fix invalid certificate error

- clrux: Add i18n to certificate templates and partials

- mattdrayer: Pylint violations

- SOL-920 Certificate Activation/Deactivation

- mattdrayer: Added LMS support

- SOL-932: Fix preview mode support in certificate view

- SOL-934: Fixed bug reported and broken tests

- SOL-935 removed the 'valid' word from web view title

- talbs: RTL support updates/fixes
  * revising certificate type icon/name vertical alignment
  * removing unused older certificate template
  * revising styling for message/banner actions
  * abstracting accomplishment type to use course mode + adding in honor/verified-specific placeholders

- mattdrayer: JSHint violations
 2015-06-01 19:48:04 -04:00
Alessandro
4c0bf1615e Add moment.js 
TNL-925
 2015-05-22 17:10:05 +02:00
Giulio Gratta
4726da6cf9 Upgrade PDF.js library from v0.8.1243 -> v1.0.907 2015-03-09 16:12:27 -07:00
Syed Hassan Raza
a1ffcc5259 Disable referrer (TNL-1144) 2015-01-29 09:53:55 -05:00
Will Daly
1f2b155746 Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit 1d6fceda50.
 2015-01-21 17:13:27 -05:00
Will Daly
1d6fceda50 Add RequireJS and RequireJS Optimizer configuration to the LMS 
Respond to review comments:

- Rename build and config files for consistency between lms/studio.
- Fix merge conflicts with lms require config.
- Devstack uses optimized pipeline to skip require JS optimizer step
- Add tests for render_require_js_path_overrides
 2015-01-20 14:27:23 -05:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content. 
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
 2015-01-14 23:34:11 +02:00