Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

3109 Commits

Author SHA1 Message Date
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
asadiqbal
99b883b7be WL-243 LMS Language Selection 2016-01-28 20:07:26 +05:00
Christine Lytwynec
8c8953fe32 Update discussion markdown editor add link and image modals 2016-01-27 14:43:29 -05:00
Saleem Latif
2d83449240 Remove microsite_configuration/microsite.py references from individual templates 
* mattdrayer: Updated get_themed_template_path
 2016-01-22 14:27:58 -05:00
Douglas Hall
8e22e855cb Merge pull request #11274 from edx/ibrahimahmed443/enable-copyright-url 
uncomment copyright url to enable it in microsites
 2016-01-22 13:37:12 -05:00
Ibrahim
0f09bb8a94 raise 404 when copyright template is missing 2016-01-22 12:02:46 -05:00
Jesse Zoldak
fc45b2c82e Merge pull request #11292 from edx/zoldak/phantom-bok-choy 
Harden page objects
 2016-01-22 11:49:46 -05:00
Peter Fogg
6cd12f9f39 Merge pull request #11296 from edx/peter-fogg/fix-certs-migrations 
[wip] Reintroduce generated certificate changes, with updates to not require a giant migration.
 2016-01-22 11:19:54 -05:00
Ned Batchelder
106a822def Merge pull request #11305 from edx/ned/fix-flaky-test 
Add @flaky
 2016-01-22 11:11:59 -05:00
raeeschachar
8b24d6380a Merge pull request #11303 from edx/raees/chrome-bokchoy-test-can-create-edit-signatories-of-certificate 
Fixed test can create and edit signatories of certificate failing on …
 2016-01-22 21:10:17 +05:00
Peter Fogg
96cc38951d Disable audit certificates for new audit enrollments. 
Two new certificate statuses are introduced, 'audit_passing' and
'audit_notpassing'. These signal that the GeneratedCertificate is not
to be displayed as a cert to the user, and that they either passed or
did not. This allows us to 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.

ECOM-3040
ECOM-3515
 2016-01-22 10:27:55 -05:00
Ned Batchelder
30209b1486 Add @flaky 2016-01-22 09:48:25 -05:00
raeeschachar
8dbf66fbd9 Fixed test can create and edit signatories of certificate failing on Chrome 2016-01-22 18:29:17 +05:00
Adam
c6b21d139a Merge pull request #11293 from edx/release 
Release
 2016-01-21 12:36:03 -05:00
Jesse Zoldak
6fc490e3d4 Harden page objects 2016-01-21 10:31:37 -05:00
Eric Fischer
2b2f6d18d6 Wait for text to appear 
Adding a wait statement to allow ajax calls to finish before making assertions
about text that has changed. Fixes TNL-3943 flaky test ticket.
 2016-01-20 14:08:13 -05:00
Ben Patterson
31841bdcbb Merge pull request #11271 from edx/benp/9-bokchoy-shards 
Benp/9 bokchoy shards
 2016-01-20 12:09:53 -05:00
Mushtaq Ali
d8b902ad58 Merge pull request #11200 from edx/mushtaq/ecom2082-fix-enrollment-msg 
Escape Course Name in enrolment message
 2016-01-20 20:04:23 +05:00
Peter Fogg
52d538444e Revert "Disable audit certificates for new audit enrollments." 
This reverts commit 60860e3aa8.
 2016-01-20 09:53:58 -05:00
Muhammad Ammar
4938601cd9 Merge pull request #11177 from edx/ammar/fix-play-video-event 
Avoid emitting play_video event during buffering
 2016-01-20 17:59:04 +05:00
Mushtaq Ali
8f76f3385a Fix enrollment message 2016-01-20 15:59:27 +05:00
raeeschachar
536ac77af0 Merge pull request #11263 from edx/raees/chrome-bokchoy-test-course-rerun 
Fixed test course rerun failing on Chrome
 2016-01-20 12:39:54 +05:00
Ben Patterson
ce716bbbc4 Create additional bok-choy shards for faster feedback. 2016-01-19 17:18:33 -05:00
Matt Drayer
20f6b545fb Merge pull request #11256 from edx/mattdrayer/index-page-bokchoy 
mattdrayer/index-page-bokchoy: Refactor+cover Open edX LMS index page
 2016-01-19 14:28:46 -05:00
raeeschachar
d440e209e1 Fixed test course rerun failing on Chrome 2016-01-20 00:19:40 +05:00
Matt Drayer
9b35844b98 mattdrayer/index-page-bokchoy: Refactor+cover Open edX LMS index page 2016-01-18 23:12:04 -05:00
muhammad-ammar
c4065f7b33 Avoid emitting play_video event during buffering 
TNL-2178
 2016-01-18 19:55:37 +05:00
Ben Patterson
699aa4d570 [firefox upgrade] Replace action chain with tinymce JS. 
This action chain is not reliable across firefox versions (and
in fact, even on the older firefox, fails locally). Instead we
use native JS tinymce to set the content.
 2016-01-16 12:46:49 -05:00
Ben Patterson
0c1fd7ab6b Merge pull request #11240 from edx/benp/ff42-container-block-3 
Fix flaky condition for firefox 42 on subsection container block (studio)
 2016-01-15 15:15:34 -05:00
cahrens
a47be54050 Un-deprecate teams setting. 
TNL-3803
 2016-01-15 09:18:46 -05:00
Ben Patterson
ebcafcc103 Better location. 2016-01-14 19:57:15 -05:00
Ben Patterson
29e4ba95e1 Special condition needed for newer firefox version. 
On the older firefox version (28), the offset approach fails. This
update is being made as part of an effort to upgrade to firefox 42
incrementally. So we are including logic for Firefox 28 vs 42 that
we can remove after the upgrade.
 2016-01-14 19:53:16 -05:00
Ben Patterson
2b731b70d5 Fix flaky condition only appearing in newer firefox versions. 2016-01-14 14:33:19 -05:00
Toby Lawrence
2c40454db0 Merge pull request #11223 from edx/perf/crush-all-the-imgs 
Crush down images.
 2016-01-14 09:42:17 -05:00
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
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
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
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
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
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
raeeschachar
41f27f1f9f Fixed test quality button works correctly in Video tests failing on Chrome 2016-01-08 16:27:17 +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