Skip to content

Merge for v1.6.0 #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2025
Merged

Merge for v1.6.0 #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.6.0] - 2025-03-17

### Added

- Support for multiple configurations (#69, #49).
- Collections of known configurations are gathered in subdirectories of main/configs (#175).
- Templated queries: variables shown in title of result table (#163).
- Templated queries: changing variables dialogue is preloaded with previous values (#167).
- About dialog, reachable from the application bar (#171).
- An about dialog, reachable from the application bar (#171).

## [1.5.0] - 2025-01-02

Expand Down Expand Up @@ -212,4 +214,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[1.4.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.4.0
[1.4.1]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.4.1
[1.5.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.5.0
[Unreleased]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/compare/v1.5.0...HEAD
[1.6.0]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/releases/tag/v1.6.0
[Unreleased]: https://github.com/SolidLabResearch/generic-data-viewer-react-admin/compare/v1.6.0...HEAD
7 changes: 3 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Table of contents:
* [Additional prerequisites](#additional-prerequisites)
* [Testing the production version](#testing-the-production-version)
* [Testing the development version](#testing-the-development-version)
* [Setting the version string](#setting-the-version-string)
* [Maintaining the version string](#maintaining-the-version-string)

## Preface

Expand Down Expand Up @@ -444,7 +444,6 @@ The procedure is the same as for testing the production version, except for step
npm run dev-with-path
```

### Setting the version string
### Maintaining the version string

Before every merge to the main branch and before every release, set the version string [here](./main/src/version.js)
according to the rules in that file.
Maintain the version string [here](./main/src/version.js) according to the rules in that file.
8 changes: 4 additions & 4 deletions main/src/version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Set to a next intermediate version string vX.Y.Z-tttt when merging an unreleased version to the main branch.
// Set to the new release version string vX.Y.Z right before make a new release tag vX.Y.Z (see https://github.com/SolidLabResearch/generic-data-viewer-react-admin/tags).
// ... All in accordance with https://semver.org/spec/v2.0.0.html.
const version = "v1.6.0.0003";
// Maintain the version string on the development branch:
// - during development: set to (unreleased);
// - right before merging to the main branch for making a new release: set to the new release tag (see https://github.com/SolidLabResearch/generic-data-viewer-react-admin/tags).
const version = "v1.6.0";
export default version;