Commit Graph

37797 Commits

Author SHA1 Message Date
Braden MacDonald
c0f608e638 Bump problem-builder on edx.org to edx-release 2.0.4 2016-07-13 10:37:49 -07:00
Chris
c72d2b56bc Merge pull request #12990 from edx/clrux/tabs-hotfix
Hotfix for tabs
2016-07-13 12:12:46 -04:00
Chris Rodriguez
638263027d Hotfix for tabs 2016-07-13 11:13:39 -04:00
Toby Lawrence
71bebec579 Merge pull request #12986 from edx/PERF-351
Account for settings.STATIC_URL in XBlock resource URLs when rewriting them.
2016-07-13 09:39:52 -04:00
Toby Lawrence
8ab62b5b99 [PERF-351] Account for settings.STATIC_URL in XBlock resource URLs when
rewriting them.

In PERF-341, we adjusted the static_replace middleware to try and
exclude static XBlock resource URLs from being interpreted as the marker
URLs used to signify course assets in course content.  Since they both
started with /static, this could, and did, cause issues where linking
directly to the assets of an XBlock within, say, one of its templates,
would lead to that link being rewritten and ultimately being incorrect.
The fix attempted to see if the link started with the prefix that all
static XBlock resource URLs start, and if so, it returned them
unmodified.

We incorrectly assumed that our testing captured all cases, and since
we're here, we know that this was wrong.  We weren't accounting for cases
when the URLs being generated had the STATIC_URL configuration value
prefixed -- https://example.com/static/xblock/.... -- and so our direct
check of seeing if such a URL started with "/static/xblock" would always
fail, leading to the erroneous rewriting and nonsensical output.

This fix checks if the link either starts with the prefix OR if it
starts with the STATIC_URL value and contains the prefix overall.  There
is a small overlap between the STATIC_URL and the prefix we check for,
so an inconsistency could arise down the line if we changed our
STATIC_URL to use a difference base directory, but our tests will at
least catch the issue now.
2016-07-12 22:33:11 -04:00
Douglas Hall
0332ebea9e Merge pull request #12880 from caseylitton/up_logistration_toggle_footer_setting
Add flag allow toggle logistration footer
2016-07-12 20:34:51 -04:00
Chris
facb1eb8fd Merge pull request #12953 from edx/clrux/ac-517
AC-517 fixes `color-contrast` ignores
2016-07-12 15:30:29 -04:00
caseylitton
a6e028c6b4 Add flag allow toggle logistration footer 2016-07-12 12:13:12 -07:00
caseylitton
6761be0b29 Add name and email to Authors 2016-07-12 12:13:03 -07:00
Chris Rodriguez
4e4c740c2c AC-517 fixes color-contrast ignores across platform 2016-07-12 14:41:06 -04:00
Chris
3d76f092dd Merge pull request #12983 from edx/clrux/safelint-fixup
Safelint violation count
2016-07-12 14:40:42 -04:00
Jesse Zoldak
e33ddbea98 Merge pull request #12982 from edx/zoldak/SOL-1811
Mark test for skipping SOL-1811
2016-07-12 14:24:54 -04:00
Chris Rodriguez
1b7fe5978a Safelint violation count 2016-07-12 14:03:28 -04:00
Renzo Lucioni
b1fcc51c7f Merge pull request #12965 from edx/renzo/catalog-config-model
Add ConfigurationModel governing integration with the catalog service.
2016-07-12 13:34:11 -04:00
Jesse Zoldak
c6e0813785 Mark test for skipping SOL-1811 2016-07-12 13:16:21 -04:00
Chris
53c98f10cc Merge pull request #12750 from edx/clrux/ac-486
AC-486 updating tabbed_view to use proper accessibility rules
2016-07-12 12:50:20 -04:00
Chris Rodriguez
298f168e23 AC-486 updating tabbed_view to be accessible 2016-07-12 11:01:11 -04:00
Asad Iqbal
7147a69490 Merge pull request #12968 from edx/asadiqbal08/WL-552
asadiqbal08/WL-552 ID-Verification message is responsive in activate account page
2016-07-12 11:42:11 +05:00
sanfordstudent
d13e456959 Merge pull request #12939 from edx/sstudent/TNL-4924
moving milestones/gating check to access.py
2016-07-11 16:21:53 -04:00
Fred Smith
d82292cb98 Merge pull request #12971 from edx/derf/go_away_pycharm
Remove pycharm project files and gitignore
2016-07-11 15:51:00 -04:00
Renzo Lucioni
e7cdcb9b71 Merge pull request #12954 from edx/renzo/extract-token-generation
Unify JWT generation code
2016-07-11 15:37:14 -04:00
Douglas Hall
a873bf7c7b Merge pull request #12901 from edx/douglashall/WL-541
WL-541 Add recipient key to Zendesk ticket creation API request payload
2016-07-11 15:36:11 -04:00
Douglas Hall
c38f2373c7 Add recipient key to Zendesk ticket creation API request payload 2016-07-11 14:56:44 -04:00
Renzo Lucioni
191a353078 Add ConfigurationModel governing integration with the catalog service.
This is the first in a series of commits that will retrieve and use data from the catalog API. Part of ECOM-4566.
2016-07-11 14:47:55 -04:00
Sanford Student
5db58c0038 moving milestones check to access.py 2016-07-11 14:32:52 -04:00
John Eskew
4fca1d9d98 Merge pull request #12893 from edx/jeskew/control_chars_in_string_fields
Update version of XBlock repo.
2016-07-11 13:29:51 -04:00
Fred Smith
6a4f4ca812 ignore pycharm project files 2016-07-11 11:23:14 -04:00
Fred Smith
bbc81fe922 remove pycharm created files 2016-07-11 11:20:46 -04:00
alisan617
e07094bf74 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Update git.xml Create conda_packages.xml 2016-07-11 10:56:44 -04:00
alisan617
fdd7e46ed0 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Merge branch 'master' 2016-07-11 10:14:25 -04:00
alisan617
72b6ec8242 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Create IntelliLang.xml, laf.xml, ide.general.xml, web-browsers.xml, Default.xml, databaseSettings.xml, diff.xml, git.xml, keymap.xml, debugger.xml, packages.xml 2016-07-11 10:14:20 -04:00
alisan617
b2b66980f1 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Merge branch 'master'
Conflicts:
	diff.xml
2016-07-11 10:12:47 -04:00
Toby Lawrence
54fa8aebbc Merge pull request #12959 from edx/PERF-346
[PERF-346] Add a second version component to versioned course asset URLs
2016-07-11 09:32:09 -04:00
asadiqbal
682fde96d9 WL-552 2016-07-11 17:44:54 +05:00
Toby Lawrence
f15533dc8f [PERF-346] Add a second version component to versioned course asset URLs
This version component reflects the "version" of the StaticContent
objects which we cache server-side.  If the layout of those objects
changes between releases, errors occur when loading them from cache.

By using a separate version value, which can be incremented on its own
after a change has been made to the StaticContent class, we can avoid
loading older cached content and in turn take advantage of these changes
faster, without needing to intervene operationally.
2016-07-10 19:20:20 -04:00
Chris
db04911268 Merge pull request #12924 from edx/clrux/ac-521
AC-521 fixes 'data-table' ignores
2016-07-08 17:10:22 -07:00
Chris Rodriguez
ddc93abf81 AC-521 fixes data-table ignores in the platform 2016-07-08 15:28:31 -04:00
Christina Roberts
6d7a545276 Merge pull request #12932 from edx/christina/deprecated-components
Move deprecating of XBlocks to new XBlockConfiguration model
2016-07-08 15:05:42 -04:00
Christina Roberts
b6b792826c Merge pull request #12864 from edx/christina/disable-xblocks
Move disabling of XBlocks to new XBlockConfiguration model
2016-07-08 15:05:17 -04:00
Albert (AJ) St. Aubin
c25dd2ee1d Merge pull request #12960 from edx/staubina/TNL-4723_indexOfBug
Updated to check and ensure the progress Detail is a string before lo…
2016-07-08 15:05:04 -04:00
John Eskew
ea6812e954 Update version of XBlock repo. 2016-07-08 14:04:37 -04:00
John Eskew
1131edc9a2 Change test to reflect how XBlock handles control chars. 2016-07-08 14:04:00 -04:00
Albert St. Aubin
4df50e9008 Updated to check and ensure the progress Detail is a string before looking for the index of /
TNL-4723

Added basic JS test to check for progress with integer detail

Added another test with a non-string value to force the failure state with data returns a non-string value

Removed test with unrealistic int input for progress_detail

Cleaned up duplicate code in renderProgress tests
2016-07-08 11:44:09 -04:00
Calen Pennington
0aceb231ef Merge pull request #12961 from cpennington/fix-xunit-commands
[TE-1511] Make --with-xunit(mp)? and --xunit(mp)?-file match in all test suites
2016-07-08 10:52:35 -04:00
Calen Pennington
2e5936f0f5 [TE-1511] Make --with-xunit(mp)? and --xunit(mp)?-file match in all test suites 2016-07-08 09:48:51 -04:00
Ned Batchelder
bb9a6283ef Merge pull request #12956 from edx/ned/update-translations
Update translations (autogenerated message)
2016-07-07 21:57:51 -04:00
Ned Batchelder
9132b7d555 Update translations (autogenerated message) 2016-07-07 21:02:43 -04:00
Peter Pinch
cf572af191 Merge pull request #12889 from mitocw/fix/aq/caoch_dashboard_navigation_issues
Fixed CCX coach dashboard access issues
2016-07-07 20:29:24 -04:00
Amir Qayyum Khan
0d3f96d4b5 Fixed CCX coach dashboard access issues. 2016-07-08 04:24:19 +05:00
Renzo Lucioni
f6d7371dd1 Unify JWT generation code
These changes unify four different approaches to JWT creation, moving the core of the AccessTokenView to a general-purpose JwtBuilder class. This utility class defaults to using the system's JWT configuration, but it will allow overriding of the signing key and audience claim to support those clients which still require this. Part of ECOM-4566.
2016-07-07 16:38:39 -04:00