Commit Graph

39994 Commits

Author SHA1 Message Date
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
Felipe Montoya
df1d4ea8fc Moving the files using git mv 2016-06-23 12:41:28 -05: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
Andy Armstrong
11fa2f3711 Merge pull request #12782 from edx/ekolpakov/coffee_to_js_discussions
Hackathon project: burn coffee
2016-06-23 12:55:16 -04:00
Jesse Zoldak
2fab4938ea Merge pull request #12839 from edx/revert-12838-clee/update-oauth-provider
Revert "Upgrade edx-oauth2-provider to v1.1.2"
2016-06-23 12:49:51 -04:00
Jesse Zoldak
bbd0a82920 Revert "Upgrade edx-oauth2-provider to v1.1.2" 2016-06-23 12:46:45 -04:00
Christopher Lee
1bec9fd35d Merge pull request #12838 from edx/clee/update-oauth-provider
Upgrade edx-oauth2-provider to v1.1.2
2016-06-23 12:36:45 -04:00
christopher lee
76bdacdde8 Upgrade edx-oauth2-provider to v1.1.2 2016-06-23 12:34:20 -04:00
Ned Batchelder
dd9139374f Update translations (autogenerated message) 2016-06-23 15:29:59 +00:00
alisan617
0e7c33a8b7 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Update packages.xml 2016-06-23 11:17:59 -04:00
E. Kolpakov
2b8c02a759 Discussion coffee files to JS 2016-06-23 11:05:36 -04:00
Andy Armstrong
b1af59ad99 Move discussion .coffee files to .js 2016-06-23 11:05:36 -04:00
Christina Roberts
5b187d6f05 Merge pull request #12726 from edx/christina/deserialize_config_models
ConfigurationModel deserializer and management command
2016-06-23 08:45:14 -04:00
alisan617
d5a5c39c53 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Merge branch 'master' 2016-06-22 20:42:59 -04:00
cahrens
0a6406e863 Add ConfigurationModel deserializer and management command.
TNL-4781, TNL-4782
2016-06-22 20:37:02 -04:00
Andy Armstrong
caedc92d67 Merge pull request #12796 from eduNEXT/fmo/coffee_to_js_module_edit
Converting cms module_edit.coffee to js
2016-06-22 18:20:41 -04:00
Felipe Montoya
82db66d945 Converting the module_edit coffee file to a js file
Converting to js and fixing references

Linting the generated code
2016-06-22 15:49:48 -05:00
Kevin Falcone
2c41d79c6d Merge pull request #12827 from edx/release
Release -> Master after revert
2016-06-22 15:37:27 -04:00
Clinton Blackburn
d7c570aacd Corrected name of static file (#12817)
ECOM-4610
2016-06-22 15:07:40 -04:00
Douglas Hall
51d8580982 Fix default from email lookups 2016-06-22 13:54:57 -04:00
Douglas Hall
7b86da02f7 Check theme overrides when retrieving platform name from settings 2016-06-22 13:54:57 -04:00
Michael Frey
ad45681a53 mjfrey/micro-settings-merge: Override base dictionary keys with microsite configuration keys
* mattdrayer: Add helpers.get_value test
* mattdrayer: Change to simpler implementation, per @douglashall
* mattdrayer: Address quality violations and test failures
2016-06-22 13:54:56 -04:00
Douglas Hall
40543ca0de Upgrade edx-proctoring to 0.12.20 2016-06-22 13:54:56 -04:00
Kevin Falcone
a5a235bd70 Merge pull request #12826 from edx/jibsheet/revert-pr-12573
Revert "[PERF-325] Add versioned course asset URLs when canonicalizin…
2016-06-22 13:38:45 -04:00
Kevin Falcone
9967b6fd58 Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths."
We're seeing errors in NR from objects read out of the cache lacking the
'StaticContent' object has no attribute 'content_digest'
File "/edx/app/edxapp/edx-platform/common/djangoapps/contentserver/middleware.py",
    line 70, in process_request

This reverts commit 849ebc5f22.
2016-06-22 12:11:35 -04:00
Sofiya Semenova
1d09f78742 Merge pull request #12756 from edx/ssemenova/flakeytest
Fix flakey TextbooksTest
2016-06-22 11:36:25 -04:00
mdinino
0a7c534d56 Merge pull request #12824 from edx/release
Release
2016-06-22 11:31:34 -04:00
ssemenova
9545c90a58 fixed flakiness
TNL-4806
2016-06-22 10:28:29 -04:00
Sofiya Semenova
08aeb27d94 Merge pull request #12803 from edx/ssemenova/disabledstates
Got rid of aria-disabled states
2016-06-22 09:47:25 -04:00
Ned Batchelder
0d8cf05d17 Merge pull request #12788 from edx/ned/update-transifex-client
Use the latest version of the transifex client
2016-06-22 09:36:54 -04:00
Michael Frey
48b80b519f Merge pull request #12811 from edx/mjfrey/micro-settings-merge
mjfrey/micro-settings-merge: Override base dictionary keys with microsite configuration keys
2016-06-22 08:31:50 -04:00
Muddasser
d336e246b6 Merge pull request #12801 from edx/muddasser/bok-choy-to-lettuce/component
Conversion of cms/component.feature into bokchoy tests
2016-06-22 17:07:16 +05:00
Hamza Munir
29864eeacf TNL 4141
Problem was when we added a problem with
empty string as an answer it created the problem instead of throwing an excpetion

A test added to check that and exception is thrown when a problem is
being created with empty string as an answer.

A test is removed which used to test that problem should be graded incorrect if blank space is chosen as answer.
2016-06-22 16:57:04 +05:00
Muddasser
ce665e3b4c Conversion of cms/component.feature into bokchoy tests 2016-06-22 11:20:48 +00:00
Syed Hasan raza
01c8b3499c Merge pull request #12790 from edx/shr/bug/ECOM-4645-Certificate-exception-whitelisted-users
exception_handling_for_unverified_cert_status
2016-06-22 15:46:49 +05:00
Muddasser
591d86a912 Changed setup.py to ensure page objects have all the files needed when installed 2016-06-22 08:57:11 +00:00