Merge 7.0 work into 7.1 #253
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add Rudra to team list, update and clean up publications
* Fixing case of non-string hash - If the About tab is the first tab clicked, and the browser is Chrome then the hash passed to this function was: null. This would cause the function to error out when attempting to regex match against it. In Firefox the value provided in the same situation was: 'null'. Which allowed the 'match' function to not error out. This small change just coerces the value of 'hash' to a string if it is not already. * Travis Fixes
Remove 5.3.3 from travis builds
The existing code used the half-baked CCR.encode function to try to encode data for a rest call. This change uses the ExtJS library function that encodes the parameters correctly.
The chart name field could have been used to inject html into the page. This pull request addresses this issue. Notes: The 'New Chart' dialog already htmlEncoded the chart name so any charts that we created using this mechanism using the old code will be displayed exactly the same (except of course the display bug in the chart menu is fixed). The code change on the server will prevent any existing saved charts with embedded html from being executed. These charts will obviously have the name appear different in this new code, by design!
Use the Ext.ajax API call correctly.
Make the Chart Name field html 'clean'.
Updated release notes and change log for 7.0.0
Conflicts: .travis.install.sh
smgallo
approved these changes
Sep 21, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This pull request merges work done for 7.0 into the 7.1 branch. Merged pull requests include: #226, #229, #232, #235, #236, #239, #247, and #248.
File conflicts manually resolved:
.travis.install.sh