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

14320 Commits

Author SHA1 Message Date
Toby Lawrence
dc727104ae Revert larger_image.png so test passes. 
There's a test to ensure users can't upload too large of a profile picture, so the picture was too small to trigger that behavior, and now fails.  This just returns the image to its original size.
 2016-01-13 22:02:36 -05:00
Edward Zarecor
546610084c Removing CDN RPC 
CR comments

Whitespace

wip test refactoring

more test refactoring

Re-write download URL too.

Test fixes related to download change, and fix

wip, re-locating tests

update classname

Quality fixes
 2016-01-13 21:46:57 -05:00
Toby Lawrence
0009d53c53 Adding optimized images in batches [15/19] 2016-01-13 20:38:42 -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
f18b2a7fe2 Adding optimized images in batches [09/19] 2016-01-13 20:38:39 -05:00
Toby Lawrence
10e9517de2 Adding optimized images in batches [08/19] 2016-01-13 20:38:39 -05:00
Toby Lawrence
3824f0a68c Adding optimized images in batches [07/19] 2016-01-13 20:38:39 -05:00
Toby Lawrence
fc0775be2b Adding optimized images in batches [06/19] 2016-01-13 20:38:38 -05:00
Toby Lawrence
9cf0589200 Adding optimized images in batches [05/19] 2016-01-13 20:38:38 -05:00
Toby Lawrence
b991f2ec88 Adding optimized images in batches [04/19] 2016-01-13 20:38:37 -05:00
Toby Lawrence
23ed311d4f Adding optimized images in batches [03/19] 2016-01-13 20:38:37 -05:00
Toby Lawrence
0e518535c2 Adding optimized images in batches [02/19] 2016-01-13 20:38:37 -05:00
Toby Lawrence
944725e35b Adding optimized images in batches [01/19] 2016-01-13 20:37:48 -05:00
Dmitry Viskov
efb86f2169 XBlockAsides Hello world example 2016-01-14 03:19:23 +03: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
raeeschachar
9cf16cd279 Merge pull request #11201 from edx/raees/chrome-bokchoy-test-annotation-component 
Fixed test annotation component failing on Chrome
 2016-01-14 00:09:22 +05:00
Jesse Zoldak
0f9cfbffb8 Create a new bok-choy DB cache 2016-01-13 11:01:14 -05:00
Peter Fogg
fe4555bc7a Merge pull request #11151 from edx/peter-fogg/disable-audit-cert-gen 
[wip] Mark GeneratedCertificate records for audit mode as not eligible for a certificate.
 2016-01-13 07:51:56 -05:00
Syed Hassan Raza
e630fba9a7 Add accessible text 2016-01-13 14:13:56 +05:00
raeeschachar
c790b62aa0 Fixed test annotation component failing on Chrome 2016-01-13 11:34:46 +05:00
Peter Fogg
60860e3aa8 Disable audit certificates for new audit enrollments. 
An `eligible_for_certificate` field is added to the
GeneratedCertificate model. This way we can retain existing grading
logic, as well as maintaining correctness in analytics and reporting.

Ineligible certificates are hidden by using the
`eligible_certificates` manager on GeneratedCertificate. Some places
in the coe (largely reporting, analytics, and management commands) use
the default `objects` manager, since they need access to all
certificates.

This commit also updates the DB cache for acceptance tests.
 2016-01-12 22:44:53 -05:00
Douglas Hall
28a7b3e2d1 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-01-12 15:12:06 -05:00
Brian Talbot
7ac287af19 Merge pull request #11185 from open-craft/sequence-link-color-default 
Mark sequence link-color scss variable default.
 2016-01-12 14:57:10 -05:00
Matt Drayer
b549adf476 Merge pull request #10623 from eduNEXT/fmo/wiki-support-for-microsites 
WIP wiki support for microsite templates
 2016-01-12 14:27:27 -05:00
Christina Roberts
6f66483876 Merge pull request #11202 from edx/release 
Release for Jan 12, 2016
 2016-01-12 11:29:42 -05:00
Felipe Montoya
f2a6a27ec9 Adding support for microsite template_paths on django templates 
Stripping the leading / for the django_templates finder

Enabling the microsite configurations before running django.setup()

Adding only the templates directory before startup

Adding the missing overrides file at the django templates main

Using the comp_theming way of overriding css

Adding test for the microsite_template_path filter
 2016-01-12 10:34:00 -05:00
muzaffaryousaf
b4189784da Fixed POST bookmarks bug when display_name is None. 
Added tests & general message to js when parsing fails.

TNL-3989
 2016-01-12 09:47:51 -05:00
Awais Jibran
ded3786d0c Merge pull request #11157 from edx/aj/tnl3968-mathjax-in-static-pages 
Enable MathJax in Course Pages
 2016-01-12 18:25:33 +05:00
Ayub-Khan
dce5bbc039 fix TNL-767 When students click "check" without submitting an answer, our basic problem types respond in inconsistent ways. 2016-01-12 15:41:48 +05:00
Syed Hassan Raza
cfb761bf29 Indicator-container div apply to status 2016-01-12 15:03:03 +05:00
raeeschachar
d6673ca3fd Merge pull request #11174 from edx/raees/chrome-bokchoy-test-quality-button-works-correctly 
Fixed test quality button works correctly in Video tests failing on C…
 2016-01-12 14:01:11 +05:00
Awais Jibran
a72d4a04e8 Enable MathJax in Course Pages 
TNL-3968
 2016-01-12 13:49:30 +05:00
Matjaz Gregoric
95884642a2 Mark sequence link-color scss variable default. 
There's already a global $link-color variable defined in
lms/static/sass/base/_variables.scss. Mark the $link-color
variable in sequence scss file with !default, so that the
global $link-color variable gets used, if defined.
 2016-01-11 08:52:21 +01:00
Adam
e8925972d9 Merge pull request #11168 from edx/adam/fix-userstanding-page 
userstanding is now OneToOneField
 2016-01-08 13:36:54 -05:00
Toby Lawrence
fb984206cf Add the migrations necessary for asset base URL support. 2016-01-08 13:16:50 -05:00
Calen Pennington
96478f823d Merge pull request #11163 from cpennington/shrink-images 
Shrink images
 2016-01-08 13:13:02 -05:00
Peter Fogg
17a69a30e4 Revert "Add options trailing slashes to the Enrollment API." 
This reverts commit 3149aaa319.
 2016-01-08 09:47:39 -05:00
raeeschachar
41f27f1f9f Fixed test quality button works correctly in Video tests failing on Chrome 2016-01-08 16:27:17 +05:00
Adam Palay
7dc54723d3 userstanding is now OneToOneField 2016-01-07 15:11:23 -05:00
Calen Pennington
9daaa35d8d Shrink images using trimage 
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(-)
 2016-01-07 10:48:40 -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