Merge #98, #100, #101, #102, #103, #104, #107, #108, #113, #114, #115, #118, #119, #121, #122, #126 into 7.0 #127
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
…ngleton Replace singleton composite logger
Add upgrade notes
Remove old README file
Remove script used to generate API docs
Modify xdmod source for php7 compatibility. Schema version changes requested by @jtpalmer are included.
Add xdmod-test-artifacts as a compuser dev dependency.
Fix the forgot password form so that it looks correct
fix forgot password form
The file included by the removed script tag is part of the App Kernels module.
* Initial version of support for RFC-6901 JSON References * Remove warning for duplicate data endpoint name * Move local config dir handling into Configuration object * Add documentation for JSON references and verification script * Add component tests for Configuration, EtlConfiguration, RFC-6901 parsing * PHPCS and extra whitespace cleanup
Remove script tag
Updated publication with doi
- Typing a '%' character in a form field contained within the MetricExplorer chart options menu would not have the desired effect. Instead, the whole menu would close and the '%' character would not be recorded in the field. The reason for this is because the doRelay handler for the chartOptionsMenu.keyNav currently always relays events regardless of whether or not the event is an actual keyNav event or not. This updates that handler to only call the handler in the case the event is for a keyNav event, thus '%' is no longer interpreted as 'left'. This version of the fix was pointed out by a code review comment by @jpwhite4.
* Bumped build_packager memory limit - When executing a local deploy ( as opposed to pulling down the source from a git repo ) this script consistently runs out of memory. Bumping the limit to 256M alleviates this issue. * Removed Memory Limit for build_package.php script - Updated per code review comment by @jtpalmer
- Fix for NavKey handlers being executed for non-NavKey key presses.
Add 'character set' specification for XRAS ingestors to ETLv1
…irst-update Metric Explorer: Fixed errors not displaying if help graphic active
tyearke
changed the title
tyearke
force-pushed
the
merges/6.7-2017-05-04
branch
from
a377c7c
to
6c5bdeb
Compare
Conflicts: bin/xdmod-upgrade configuration/portal_settings.ini open_xdmod/modules/xdmod/build.json package.json
tyearke
force-pushed
the
merges/6.7-2017-05-04
branch
from
6c5bdeb
to
3d85387
Compare
plessbd
approved these changes
May 5, 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 #98, #100, #101, #102, #103, #104, #107, #108, #113, #114, #115, #118, #119, #121, #122, #126 from Open XDMoD 6.7 to 7.0.
This merge requires conflict resolution, which was done in merge commit 6c5bdeb.
File conflicts:
bin/xdmod-upgradeconfiguration/portal_settings.iniopen_xdmod/modules/xdmod/build.jsonpackage.json