Skip to content

Reconcile divergent branches #206

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
jonrandahl merged 61 commits into from
Jan 14, 2026
Merged

Reconcile divergent branches #206

Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
ad417ed
Merge pull request #114 from epimorphics/task/release-candidate-1.7.5
jonrandahl Nov 27, 2023
e540bc7
Merge pull request #115 from epimorphics/preprod
jonrandahl Nov 27, 2023
4ddf6f7
Merge pull request #122 from epimorphics/dev-infrastructure
jonrandahl Mar 15, 2024
6a840ed
docs: updated CHANGELOG
jonrandahl May 31, 2024
e01bfd5
Merge pull request #123 from epimorphics/task/release-candidate-v1.7.6
jonrandahl May 31, 2024
bdc179e
fix: resolves missing ppd doc issue
jonrandahl Mar 12, 2024
ccfcdf0
test: updated ppd doc link tests
jonrandahl Mar 12, 2024
136aa08
style: rubocop automatic fixes
jonrandahl Mar 12, 2024
ba86918
build: updated gem system update version
jonrandahl Mar 12, 2024
9d3c577
build: updated version PATCH cadence
jonrandahl Mar 12, 2024
1860a58
docs: Updated CHANGELOG
jonrandahl Mar 12, 2024
88862e6
fix: reset redirects to 302 temporary as a safety precaution
jonrandahl Mar 13, 2024
f647c60
fix: resolving too many redirections
jonrandahl Mar 13, 2024
399e375
docs: Updated CHANGELOG
jonrandahl Mar 13, 2024
4c117e3
revert: removes all changes from routes.rb
jonrandahl Mar 13, 2024
ac97bae
fix: hard-coded link paths
jonrandahl Mar 13, 2024
a726359
docs: Updated CHANGELOG
jonrandahl Mar 13, 2024
31f7050
chore: fixed punctuation in CHANGELOG entry
jonrandahl Mar 13, 2024
b75aa01
Update deployment.yaml
jonrandahl Apr 30, 2024
45e1827
docs: updated CHANGELOG
jonrandahl May 31, 2024
425fa53
Merge branch 'preprod' into task/release-candidate-1.8.0
jonrandahl Sep 6, 2024
1261c19
Merge pull request #134 from epimorphics/task/release-candidate-1.8.0
jonrandahl Sep 6, 2024
fdf95bc
Merge pull request #139 from epimorphics/dev
bogdanadrianmarc Sep 24, 2024
5975170
Merge branch 'prod' into preprod
bogdanadrianmarc Oct 1, 2024
b063ff2
Merge pull request #140 from epimorphics/preprod
bogdanadrianmarc Oct 1, 2024
03efce4
Merge pull request #148 from epimorphics/dev
bogdanadrianmarc Nov 4, 2024
779893f
Revert "Merge pull request #148 from epimorphics/dev"
bogdanadrianmarc Nov 4, 2024
15b3e31
Reapply "Merge pull request #148 from epimorphics/dev"
bogdanadrianmarc Nov 4, 2024
e38d4ef
Merge pull request #149 from epimorphics/preprod
bogdanadrianmarc Nov 4, 2024
a0e51a5
Merge pull request #155 from epimorphics/dev
jonrandahl Feb 26, 2025
53c3b9e
Merge pull request #156 from epimorphics/preprod
jonrandahl Feb 26, 2025
b465f64
Merge pull request #161 from epimorphics/dev
jonrandahl Apr 16, 2025
b06077e
Merge pull request #162 from epimorphics/preprod
jonrandahl Apr 17, 2025
bef0d8e
Merge branch 'dev' into task/release-candidate-v2.1.0
jonrandahl Jun 4, 2025
9cc6709
Task: Release Candidate v2.1.0 (#166)
jonrandahl Jun 5, 2025
d345c39
Merge remote-tracking branch 'origin/preprod' into task/release-v2.1.0
jonrandahl Jun 5, 2025
e24f529
Task: Release v2.1.0 (#167)
jonrandahl Jun 5, 2025
668770d
Merge branch 'dev' into task/release-candidate-v2.1.1
jonrandahl Jul 7, 2025
087ebdc
Task: Release Candidate v2.1.1 (#169)
jonrandahl Jul 7, 2025
56cf682
Merge remote-tracking branch 'origin/preprod' into task/release-v2.1.1
jonrandahl Jul 7, 2025
dadccdc
Task: Release v2.1.1 (#170)
jonrandahl Jul 8, 2025
e382901
Merge remote-tracking branch 'origin/dev' into task/release-candidate…
jonrandahl Sep 1, 2025
822e98e
Task: Release Candidate v2.2.1 (#175)
jonrandahl Sep 2, 2025
9056422
Patch: Updated PPD Detailed Documentation Link path (#178)
jonrandahl Sep 2, 2025
b14e2e5
Task: Release v2.2.1 (#179)
jonrandahl Sep 2, 2025
53f615c
Specify version for qonsole_rails gem
jonrandahl Sep 9, 2025
abc919f
Update CHANGELOG for version 2.2.2
jonrandahl Sep 9, 2025
af73e48
chore: downgrade faraday and related gems
jonrandahl Sep 9, 2025
8caf3bc
chore: bump patch version to 2.2.2
jonrandahl Sep 9, 2025
58a7fb0
Hotfix: Release v2.2.2 (#181)
jonrandahl Sep 9, 2025
63895bb
Revert "Hotfix: Release v2.2.2"
jonrandahl Sep 9, 2025
a7af717
Revert "Hotfix: Release v2.2.2" (#182)
jonrandahl Sep 9, 2025
ce69a40
Patch: Update Qonsole-Rails gem to resolve Faraday JSON response issu…
jonrandahl Sep 10, 2025
b61bc7d
Task: Release v2.2.2 (#186)
jonrandahl Sep 10, 2025
c028ecd
Releases 2.2.3 to pre prod (#189)
DanielCouzens Sep 15, 2025
66dffdc
Fixes Accessibility statement (#192)
DanielCouzens Sep 16, 2025
66e0e92
Releases 2.2.3 to prod (#190)
DanielCouzens Sep 17, 2025
7e79f11
Task: Release Candidate v2.2.4 (#198)
jonrandahl Nov 13, 2025
c2ce2d8
Task: Release v2.2.4 (#199)
jonrandahl Nov 13, 2025
aed1259
RC v2.3.0 (#204)
jonrandahl Jan 13, 2026
03bf670
Release v2.3.0 (#205)
jonrandahl Jan 14, 2026
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
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- (Dan) Adds underlines to links in body text to meet WCAG 2.2 accessibility
requirements [GH-126](https://github.com/epimorphics/lr-landing/issues/126)

## 1.7.6 - 2024-03-12
## 1.7.6 - 2024-06

- (Jon) - Updated the deployment.yaml file to mirror the new branch names post
branch cleanup.
- (Jon) Reconfigured the `detailed documentation` links, both english and welsh,
to point to the `app/doc/ppd` path; alongside adding tests querying the new
route to ensure the route is valid and contains the expected content. All
Expand Down
Loading