Fix merge conflicts #100
Merged
Fix merge conflicts #100
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
* Change default branch to dev (#49) * Update CHANGELOG * Bump path-parse from 1.0.6 to 1.0.7 Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump grunt from 1.0.4 to 1.5.3 Bumps [grunt](https://github.com/gruntjs/grunt) from 1.0.4 to 1.5.3. - [Release notes](https://github.com/gruntjs/grunt/releases) - [Changelog](https://github.com/gruntjs/grunt/blob/main/CHANGELOG) - [Commits](gruntjs/grunt@v1.0.4...v1.5.3) --- updated-dependencies: - dependency-name: grunt dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> * add orcid and ror to namespaces * implement feedback * Updating JSON files * bump version * add data quality report type codelist * update descriptions * update file name * bump version * Update description * Bump lodash from 4.17.15 to 4.17.21 (#42) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump minimatch from 3.0.4 to 3.0.8 (#45) Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.0.8. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.0.8) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump async from 2.6.1 to 3.2.3 (#46) Bumps [async](https://github.com/caolan/async) from 2.6.1 to 3.2.3. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md) - [Commits](caolan/async@v2.6.1...v3.2.3) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update npm version --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Josh Bradley <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tim Zwolak <[email protected]> Co-authored-by: Chris MacDermaid <[email protected]> Co-authored-by: Chris MacDermaid <[email protected]> Co-authored-by: Johnathan <[email protected]> * Merge dev into develop (#59) * Remove "geographic" from description (#54) * Remove "geographic" from description * Update iso_scope.yml Update definition from "a dataset" to "the dataset" to match the definition as defined in https://standards.iso.org/iso/19115/-3/mcc/1.0/codelists.xml. --------- Co-authored-by: Hilmar Maier <[email protected]> * Data Quality Code Lists (#53) * Fix Data Quality Element Rename iso_dataQualityElement.yml to adiwg_dataQualityElement.yml. Fix codelistName, source, and sourceName. * Add iso_valueStructure.yml * Add iso_evaluationMethodTypeCode * Add adiwg_evaluationMethod * Add iso_uom * Rename iso_uom to adiwg_unitsOfMeasure Also add more units. * Remove Comment * Update .gitignore --------- Co-authored-by: Johnathan <[email protected]> * Fix Yaml Files & Increment Version (#62) * 2.9.0 * Update buildify dependency * Fix Yaml & Json Files * Remove bower.json * Update mdCodes Version Increment minor version to 2.9.0 * Update README.md (and hopefully fix develop master conflicts) (#63) * Update CHANGELOG * Bump path-parse from 1.0.6 to 1.0.7 Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump grunt from 1.0.4 to 1.5.3 Bumps [grunt](https://github.com/gruntjs/grunt) from 1.0.4 to 1.5.3. - [Release notes](https://github.com/gruntjs/grunt/releases) - [Changelog](https://github.com/gruntjs/grunt/blob/main/CHANGELOG) - [Commits](gruntjs/grunt@v1.0.4...v1.5.3) --- updated-dependencies: - dependency-name: grunt dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> * add orcid and ror to namespaces * implement feedback * Updating JSON files * bump version * add data quality report type codelist * update descriptions * update file name * bump version * Update description * Bump lodash from 4.17.15 to 4.17.21 (#42) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump minimatch from 3.0.4 to 3.0.8 (#45) Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.0.8. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.0.8) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump async from 2.6.1 to 3.2.3 (#46) Bumps [async](https://github.com/caolan/async) from 2.6.1 to 3.2.3. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md) - [Commits](caolan/async@v2.6.1...v3.2.3) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update npm version * Fix Merge Errors * Fix Merge Errors * Fix package-lock.json * Update README.md --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Josh Bradley <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tim Zwolak <[email protected]> Co-authored-by: Chris MacDermaid <[email protected]> Co-authored-by: Chris MacDermaid <[email protected]> * Code list updates (#69) * Update CHANGELOG * Bump path-parse from 1.0.6 to 1.0.7 Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump grunt from 1.0.4 to 1.5.3 Bumps [grunt](https://github.com/gruntjs/grunt) from 1.0.4 to 1.5.3. - [Release notes](https://github.com/gruntjs/grunt/releases) - [Changelog](https://github.com/gruntjs/grunt/blob/main/CHANGELOG) - [Commits](gruntjs/grunt@v1.0.4...v1.5.3) --- updated-dependencies: - dependency-name: grunt dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> * add orcid and ror to namespaces * implement feedback * Updating JSON files * bump version * add data quality report type codelist * update descriptions * update file name * bump version * Update description * Bump lodash from 4.17.15 to 4.17.21 (#42) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump minimatch from 3.0.4 to 3.0.8 (#45) Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.0.8. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.0.8) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump async from 2.6.1 to 3.2.3 (#46) Bumps [async](https://github.com/caolan/async) from 2.6.1 to 3.2.3. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md) - [Commits](caolan/async@v2.6.1...v3.2.3) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update npm version * Update data quality element class names Removed DQ_ prefix. * Update package versions to 2.9.1 * Update codeName in adiwg_dataQualityElement.json * Update version to 2.9.1 * Remove iso_dataQualityElement.json * Fix bug in login functionality * Add build script to package.json * Refactored data quality in version 2.9.1 * Delete iso_dataQualityElement.yml codelist --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Josh Bradley <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tim Zwolak <[email protected]> Co-authored-by: Chris MacDermaid <[email protected]> Co-authored-by: Chris MacDermaid <[email protected]> * Add Missing Data Quality Report Type (#70) * Update adiwg_dataQualityElement.yml codelist * Update version to 2.9.2 * Update adiwg_dataQualityElement.json and mdcodes.json codelists * fix typo in codeName (#75) * fix typo in codeName * chore: Update package version to 2.9.3-beta.0 --------- Co-authored-by: Johnathan Aspinwall <[email protected]> * fix code list (#76) * fix code list * chore: Bump version to 2.9.3-beta.1 in package.json --------- Co-authored-by: Johnathan Aspinwall <[email protected]> Co-authored-by: Hilmar Maier <[email protected]> * Add mi event type code list (#77) * Add eventTypeCode list * update source name and codelist name * chore: Bump version to 2.9.3-beta.2 in package.json * Change to numerical codes * change description --------- Co-authored-by: Johnathan Aspinwall <[email protected]> * Add parameterDirection codelist (#80) * Update codes with requested changes (#81) * Update codes with requested changes * Update adiwg_dataQualityElement.yml * Update adiwg_dataQualityElement.yml * Update data quality element code list --------- Co-authored-by: Johnathan <[email protected]> Co-authored-by: Johnathan Aspinwall <[email protected]> * Update Gemfile.lock and package-lock.json versions to 2.9.3 (#83) * chore: Remove unused ISO data quality element codelist * Remove unused ISO data quality element codelist * Remove resources/json resources/json is a build artifact, it does not need to be stored in the repository. It does need to be included in the published versions. * feat: Add GitHub Actions workflow for automated release creation (#95) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Hilmar Maier <[email protected]> Co-authored-by: Josh Bradley <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tim Zwolak <[email protected]> Co-authored-by: Chris MacDermaid <[email protected]> Co-authored-by: Chris MacDermaid <[email protected]> Co-authored-by: J-Oliveros <[email protected]>
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.
Merge with merge commit