Commit Graph

37622 Commits

Author SHA1 Message Date
alisan617
8ea177f9c9 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Update packages.xml 2016-06-27 09:17:09 -04:00
alisan617
c526d57947 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Merge branch 'master' 2016-06-24 20:02:21 -04:00
Ned Batchelder
35267e4777 Merge pull request #12835 from edx/ned/update-translations
Update translations (autogenerated message)
2016-06-24 16:38:29 -04:00
Douglas Hall
32798f5422 Merge pull request #12861 from edx/douglashall/bump_safe_template_thresholds
Bump safe template linter thresholds to fix failing builds
2016-06-24 16:36:27 -04:00
Renzo Lucioni
67c39aa35a Merge pull request #12849 from edx/renzo/include-certificate-urls
Include link to shareable run mode certificate, when available.
2016-06-24 16:27:11 -04:00
Douglas Hall
826d791bca Bump safe template linter thresholds to fix failing builds 2016-06-24 15:15:55 -04:00
Chris
65bca48e94 Merge pull request #12825 from edx/clrux/tnl-4853
TNL-4853
2016-06-24 14:27:36 -04:00
Renzo Lucioni
3ceba5622c Include link to shareable run mode certificate, when available.
Part of ECOM-4224.
2016-06-24 14:04:52 -04:00
Nimisha Asthagiri
525e047533 Merge pull request #12857 from edx/tnl/grading-query-fixup
Grading followup
2016-06-24 13:42:01 -04:00
Chris Rodriguez
f9b8865367 Hiding focus outline on programmatically focusable els 2016-06-24 12:50:33 -04:00
Douglas Hall
10214839d6 Merge pull request #12856 from edx/douglashall/merge_patch_2016_06_22_to_master
Merge patch-2016-06-22 release to master
2016-06-24 12:27:55 -04:00
Douglas Hall
56055cc47e Merge branch 'release' into douglashall/merge_patch_2016_06_22_to_master 2016-06-24 11:07:43 -04:00
Christopher Lee
d794fc5c4d Merge pull request #12842 from edx/clee/update-oauth
Upgrade edx-oauth2-provider to v1.1.3
2016-06-24 10:58:47 -04:00
Kevin Falcone
de7c993921 Merge pull request #12828 from edx/jibsheet/pa11y-version
Convert to tag syntax for version
2016-06-24 10:45:50 -04:00
Nimisha Asthagiri
a7a6fa77fe Grading followup
1. update query counts with more accuracy
2. don't use defaultdict in block_structure
2016-06-24 09:07:45 -04:00
Nimisha Asthagiri
1798b1f1bc Merge pull request #12567 from edx/tnl/grading
Grading uses Block Transformers
2016-06-24 09:01:30 -04:00
christopher lee
084a5bdddd Upgrade edx-oauth2-provider to v1.1.3 2016-06-24 08:15:22 -04:00
Chris
b42a9ff4d9 Merge pull request #12716 from edx/clrux/ac-484
AC-484 changing aria- to data-, a to button
2016-06-24 06:19:46 -04:00
Douglas Hall
1fcf32cf24 Merge pull request #12822 from edx/patch/2016-06-22
Patch Release 2016-06-22
2016-06-24 05:50:51 -04:00
Nimisha Asthagiri
7fe002ff82 Improve error handling in Split Modulestore 2016-06-24 00:46:01 -04:00
J. Cliff Dyer
d2670a1110 Certificate Tests: remove EventTrackingTestCase when unneeded 2016-06-23 20:22:33 -04:00
Nimisha Asthagiri
8513e823bc Add block_metadata_utils 2016-06-23 20:22:33 -04:00
Nimisha Asthagiri
57dde6516a Update ENABLED_CACHES values 2016-06-23 20:22:33 -04:00
Nimisha Asthagiri
fb120426e0 Fix Typos 2016-06-23 20:22:32 -04:00
Nimisha Asthagiri
d0fcabd407 CCX: Use Modulestore Field Overrides instead of User-specific Overrides 2016-06-23 20:22:32 -04:00
Nimisha Asthagiri
74a3665289 Update query and mongo counts 2016-06-23 20:22:32 -04:00
Nimisha Asthagiri
1fbb4b8b25 Update BlockStructure API 2016-06-23 20:22:31 -04:00
Nimisha Asthagiri
f016647fef Enable Block Transformer Registry in tests 2016-06-23 20:22:31 -04:00
Nimisha Asthagiri
85687dcf60 Enable Grade Transformer 2016-06-23 20:22:31 -04:00
Nimisha Asthagiri
02e6925275 Update grades to use Block Structures 2016-06-23 20:22:31 -04:00
Chris Rodriguez
76df13487c AC-484 removing aria-activedescendent 2016-06-23 19:55:28 -04:00
raeeschachar
469dac6f90 Merge pull request #12830 from edx/raees/bokchoy-test-default-sort-preference
Fixed test default sort preference failing on chrome
2016-06-24 03:09:05 +05:00
Renzo Lucioni
157c68506d Merge pull request #12836 from edx/renzo/switch-cert-icon
Use SVG cert icon for program detail page certificate section
2016-06-23 17:28:45 -04:00
Eric Fischer
d3128f4d36 Masquerading staff override hidden special exams [TNL-4808] (#12806)
Allows staff using "view as specific student" mode to bypass edx-proctoring
hiding special exams from students, to allow for more useful debugging.

Includes "shim" pattern library implementation of alerts, and a bokchoy
test for this functionality.
2016-06-23 16:54:57 -04:00
raeeschachar
c07cb1905c Fixed test default sort preference failing on chrome 2016-06-24 01:46:14 +05:00
Renzo Lucioni
c151761e64 Use SVG cert icon for program detail page certificate section
Part of ECOM-4224.
2016-06-23 16:39:58 -04:00
Andy Armstrong
518a428f54 Merge pull request #12845 from edx/andya/fix-discussion-jasmine-tests
Add back and fix missing discussion Jasmine tests
2016-06-23 16:28:00 -04:00
Ned Batchelder
8e57e248c3 Merge pull request #12846 from mitocw/gs/fix_certificates_comment
Edited docstring to have URL match urls.py
2016-06-23 16:25:46 -04:00
George Schneeloch
f8da2f1e37 Edited docstring to have URL match urls.py 2016-06-23 16:01:49 -04:00
Andy Armstrong
ac977ba4ce Add back and fix missing discussion Jasmine tests 2016-06-23 15:43:04 -04:00
Toby Lawrence
959c97d74a Merge pull request #12821 from edx/PERF-341
[PERF-341] Don't rewrite XBlock resource URLs.
2016-06-23 15:33:07 -04:00
Douglas Hall
e2fd776aab Upgrading edx-proctoring to 0.12.21 to pull in additional fix 2016-06-23 15:27:36 -04:00
Toby Lawrence
faaa30c02d [PERF-341] Fix up to not rewrite XBlock resource URLs.
For XBlocks that used their static.public resources in the rendered
output -- for example, a link to a bundled image -- those URLs would be
treated as course assets using the '/static/' prefix trick, and thus,
rewritten.  These rewritten URLs don't work because they aren't course
assets.

When course content authors are creating their courses, we provide them
a special shorthand way of writing URLs that reference assets they have
uploaded to the course. If they uploaded a file called my-lil-pony.mp4,
and they wanted to provide a link to it when users view the course, they
would use /static/my-lil-pony.mp4. This special prefix -- /static/ --
signals to the static_replace middleware that it's a course asset and we
should write /static/my-lil-pony.mp4 to a URL that properly references
the asset based on the course ID, and things like the configured asset
CDN, etc.

Thus, the URL /static/my-lil-pony.mp4 gets turned into something like:

/assets/courseware/<md5hash>/asset-v1:edX+Demo+2016T1+type@asset+block/my-lil-pony.mp4

when viewed in the courseware.

Now, we also serve actual static assets from a prefix of /static/. This
is stuff like our JavaScript and CSS, and the JS/CSS/etc of
XBlocks/XModules. These paths look like:

/static/js/lms-main_vendor.46d6a8c02600.js

or

/static/xblock/resources/xmodule.vertical_block/public/js/vertical_student_view.43727a907769.js

Normally, these paths are caught by nginx, before they reach the LMS,
and are served straight from the filesystem. However, if you were to
have one of these paths in your course content, the static_replace
middleware would see the /static/ at the front and immediately think
it's a course asset, and would dutifully rewrite the URL to something
like:

/assets/courseware/<md5hash>/asset-v1:edX+Demo+2016T1+type@asset+block/static_xblock_resources_xmodule.vertical_block_public_js_vertical_student_view.43727a907769.js

which is not a course asset, and so it will always fail to load.

Long story short, I changed the static_replace middleware to
specifically check to see if the path being matched starts with
/static/xblock/, and if so, it keeps the original instead of rewriting
it.
2016-06-23 14:47:02 -04:00
Toby Lawrence
d20e545512 Merge pull request #12841 from edx/bugfix/versioned-assets-cutover
Fixed-up versioned assets implementation.
2016-06-23 14:41:09 -04:00
Kevin Falcone
dbc4eccf8e Convert to tag syntax for version 2016-06-23 14:34:11 -04:00
christopher lee
141276e925 Upgrade edx-oauth2-provider to v1.1.2 2016-06-23 14:19:57 -04:00
Adam Palay
07f5bacce2 Revert "AC-454 adding visual clarify for selected menu options"
This reverts commit 55d84d34b8.
2016-06-23 14:13:48 -04:00
christopher lee
92a48dfe71 Upgrade edx-oauth2-provider to v1.1.2 2016-06-23 14:13:21 -04:00
Toby Lawrence
4795067ab1 Cautiously grab the content digest. 2016-06-23 13:42:00 -04:00
Toby Lawrence
bb29ad5f30 Revert "Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths.""
This reverts commit 9967b6fd58.
2016-06-23 13:27:15 -04:00