1. 14 Jan, 2016 13 commits
  2. 13 Jan, 2016 1 commit
  3. 08 Jan, 2016 12 commits
  4. 07 Jan, 2016 14 commits
    • Merge pull request #11170 from edx/jsa/programs-app-username · 8d3fe518
      add username to program app config attrs in DOM.
      Jim Abramson committed
    • Merge pull request #10878 from mitocw/refactor/aq/move_code_from_view · 91be959b
      CCX app refactoring. Moved some code to utils.py from views.py
      Peter Pinch committed
    • Merge pull request #11154 from ovnicraft/patch-2 · 56207946
      Remove duplicate import
      David Baumgold committed
    • Shrink images using trimage · bd7e4dd3
       lms/static/images/wmd-buttons-transparent.png       | Bin 9698 -> 7046 bytes
       lms/static/images/wmd-buttons.png                   | Bin 7465 -> 5970 bytes
       .../credit_notifications/edx-logo-header.png        | Bin 1894 -> 1225 bytes
       .../ebe754f90bc88acf8ec6a1d27b87f743_120.jpg        | Bin 3168 -> 2752 bytes
       .../ebe754f90bc88acf8ec6a1d27b87f743_30.jpg         | Bin 957 -> 648 bytes
       .../ebe754f90bc88acf8ec6a1d27b87f743_50.jpg         | Bin 1362 -> 1048 bytes
       .../ebe754f90bc88acf8ec6a1d27b87f743_500.jpg        | Bin 15852 -> 13940 bytes
       .../f0d065035a5c4d32df318fbc54138765_120.jpg        | Bin 3168 -> 2752 bytes
       .../f0d065035a5c4d32df318fbc54138765_30.jpg         | Bin 957 -> 648 bytes
       .../f0d065035a5c4d32df318fbc54138765_50.jpg         | Bin 1362 -> 1048 bytes
       .../f0d065035a5c4d32df318fbc54138765_500.jpg        | Bin 15852 -> 13940 bytes
       themes/edge.edx.org/lms/static/images/logo.png      | Bin 7465 -> 4574 bytes
       themes/edx.org/cms/static/images/studio-logo.png    | Bin 4782 -> 4779 bytes
       themes/edx.org/lms/static/images/logo-large.png     | Bin 4581 -> 3367 bytes
       themes/edx.org/lms/static/images/logo.png           | Bin 1244 -> 1184 bytes
       .../lms/static/images/profiles/default_120.png      | Bin 6398 -> 3252 bytes
       .../lms/static/images/profiles/default_30.png       | Bin 993 -> 522 bytes
       .../lms/static/images/profiles/default_50.png       | Bin 2068 -> 1035 bytes
       .../lms/static/images/profiles/default_500.png      | Bin 91560 -> 0 bytes
       themes/red-theme/lms/static/images/logo.png         | Bin 909 -> 559 bytes
       20 files changed, 0 insertions(+), 0 deletions(-)
      Calen Pennington committed
    • Shrink images using trimage · 0dfb9870
       lms/static/images/linkedin_add_to_profile.png    | Bin 139290 -> 1320 bytes
       lms/static/images/logo-large.png                 | Bin 20342 -> 8447 bytes
       lms/static/images/logo.png                       | Bin 4243 -> 885 bytes
       lms/static/images/opencourseware.png             | Bin 13203 -> 11395 bytes
       lms/static/images/openedx-logo-tag-dark.png      | Bin 2539 -> 1624 bytes
       lms/static/images/openedx-logo-tag-light.png     | Bin 2702 -> 1776 bytes
       lms/static/images/openedx-logo-tag.png           | Bin 2596 -> 1607 bytes
       lms/static/images/pencils.jpg                    | Bin 30064 -> 25607 bytes
       lms/static/images/play.png                       | Bin 2966 -> 1729 bytes
       lms/static/images/problem-editor-icons.png       | Bin 2307 -> 2304 bytes
       lms/static/images/profiles/default_120.png       | Bin 2690 -> 1133 bytes
       lms/static/images/profiles/default_30.png        | Bin 576 -> 274 bytes
       lms/static/images/profiles/default_50.png        | Bin 1023 -> 449 bytes
       lms/static/images/profiles/default_500.png       | Bin 17594 -> 5671 bytes
       lms/static/images/search-icon.png                | Bin 1195 -> 423 bytes
       lms/static/images/show-hide-discussion-icon.png  | Bin 1610 -> 771 bytes
       lms/static/images/small-header-home-icon.png     | Bin 1128 -> 276 bytes
       lms/static/images/social/google-plus-sharing.png | Bin 1161 -> 1046 bytes
       lms/static/images/textbook/textbook-left.png     | Bin 783 -> 705 bytes
       lms/static/images/textbook/textbook-right.png    | Bin 822 -> 690 bytes
       lms/static/images/ui-icons_222222_256x240.png    | Bin 4369 -> 3714 bytes
       lms/static/images/vcert-ribbon-s.png             | Bin 4843 -> 3147 bytes
       lms/static/images/verified-ribbon.png            | Bin 1791 -> 751 bytes
       lms/static/images/white-error-icon.png           | Bin 1107 -> 344 bytes
       lms/static/images/wiki-icons.png                 | Bin 2410 -> 1464 bytes
       25 files changed, 0 insertions(+), 0 deletions(-)
      Calen Pennington committed
    • Shrink images using trimage · d3da2585
       .../images/bulk_email/GooglePlusIcon_gray.png       | Bin 680 -> 678 bytes
       lms/static/images/bulk_email/LinkedInIcon.png       | Bin 751 -> 417 bytes
       lms/static/images/bulk_email/MeetupIcon.png         | Bin 1283 -> 679 bytes
       lms/static/images/bulk_email/MeetupIcon_gray.png    | Bin 685 -> 678 bytes
       lms/static/images/bulk_email/TwitterIcon.png        | Bin 998 -> 517 bytes
       lms/static/images/bulk_email/TwitterIcon_gray.png   | Bin 518 -> 515 bytes
       lms/static/images/bulk_email/VKontakteIcon.png      | Bin 2480 -> 1272 bytes
       lms/static/images/bulk_email/VKontakteIcon_gray.png | Bin 3099 -> 3092 bytes
       lms/static/images/bulk_email/YoutubeIcon.png        | Bin 1964 -> 1856 bytes
       lms/static/images/bulk_email/YoutubeIcon_gray.png   | Bin 1961 -> 1878 bytes
       lms/static/images/bulk_email/edXHeaderImage.jpg     | Bin 25814 -> 24906 bytes
       lms/static/images/bullet-closed.png                 | Bin 230 -> 191 bytes
       lms/static/images/bullet-open.png                   | Bin 219 -> 188 bytes
       lms/static/images/default-badges/honor.png          | Bin 20814 -> 13316 bytes
       lms/static/images/default-badges/professional.png   | Bin 21855 -> 14603 bytes
       lms/static/images/default-badges/verified.png       | Bin 21855 -> 14603 bytes
       lms/static/images/edx-theme/edx-logo-77x36.png      | Bin 5139 -> 3674 bytes
       lms/static/images/green-pointer.png                 | Bin 3474 -> 887 bytes
       lms/static/images/homepage-hero-video-thumb.jpg     | Bin 4537 -> 4517 bytes
       lms/static/images/honor-ribbon.png                  | Bin 5956 -> 4251 bytes
       lms/static/images/icon-sm-professional.png          | Bin 2892 -> 1883 bytes
       lms/static/images/icon-sm-verified.png              | Bin 3247 -> 776 bytes
       lms/static/images/icon-sm-xseries-white.png         | Bin 706 -> 475 bytes
       lms/static/images/large-white-error-icon.png        | Bin 1800 -> 951 bytes
       lms/static/images/link-icon.png                     | Bin 326 -> 296 bytes
       25 files changed, 0 insertions(+), 0 deletions(-)
      Calen Pennington committed
    • Shrink images using trimage · 9daaa35d
       common/test/data/xml_dag/static/just_a_test.jpg    | Bin 547 -> 517 bytes
       .../test_microsite/images/background-image.jpg     | Bin 160660 -> 160625 bytes
       .../test_microsite/images/header-logo.png          | Bin 1215 -> 1212 bytes
       docs/en_us/architecture/locator_ubiquity.jpg       | Bin 51876 -> 47455 bytes
       docs/en_us/architecture/presplit.jpg               | Bin 43129 -> 38944 bytes
       docs/en_us/architecture/studio mapping.jpg         | Bin 48247 -> 43786 bytes
       .../enrollment_api/source/_static/homepage-bg.jpg  | Bin 160660 -> 160625 bytes
       docs/en_us/internal/test_pyramid.png               | Bin 24698 -> 17598 bytes
       .../platform_api/source/_static/homepage-bg.jpg    | Bin 160660 -> 160625 bytes
       .../shared/images/Announcement_subscriptions.png   | Bin 43413 -> 15474 bytes
       lms/static/certificates/images/backpack-logo.png   | Bin 2107 -> 1112 bytes
       lms/static/certificates/images/backpack-ui.png     | Bin 76558 -> 54810 bytes
       lms/static/certificates/images/bg-verified.png     | Bin 25152 -> 5169 bytes
       lms/static/certificates/images/demo-sig1.png       | Bin 3852 -> 2099 bytes
       lms/static/certificates/images/demo-sig2.png       | Bin 3695 -> 1990 bytes
       lms/static/certificates/images/demo-sig3.png       | Bin 7315 -> 3721 bytes
       .../certificates/images/demo-user-profile.png      | Bin 61749 -> 40719 bytes
       lms/static/certificates/images/ico-honor.png       | Bin 59443 -> 35743 bytes
       .../certificates/images/ico-mozillaopenbadges.png  | Bin 3638 -> 1870 bytes
       lms/static/certificates/images/ico-verified.png    | Bin 59571 -> 35713 bytes
       lms/static/images/app/google_play_badge_45.png     | Bin 8913 -> 4548 bytes
       lms/static/images/bg-footer-divider.jpg            | Bin 416 -> 390 bytes
       lms/static/images/bg-texture.png                   | Bin 10028 -> 2092 bytes
       lms/static/images/bulk_email/FacebookIcon.png      | Bin 550 -> 333 bytes
       lms/static/images/bulk_email/GooglePlusIcon.png    | Bin 1286 -> 679 bytes
       25 files changed, 0 insertions(+), 0 deletions(-)
      Calen Pennington committed
    • Shrink images using trimage · 8cba4702
       .../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(-)
      Calen Pennington committed
    • Shrink images using trimage · ae283f6a
       .../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(-)
      Calen Pennington committed
    • Shrink images using trimage · dade7f49
       .../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(-)
      Calen Pennington committed