Skip to content
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

Jump to bottom

Update 74x with 62x #10188

Merged
merged 20 commits into from
Oct 31, 2023
Merged

Update 74x with 62x #10188

merged 20 commits into from
Oct 31, 2023

Conversation

chiatt
Copy link
Member

@chiatt chiatt commented Oct 24, 2023

Updates 7.4 with bug fixes in 6.2.x

khodgkinson-he and others added 19 commits August 22, 2023 12:04
@khodgkinson-he
Fixed function call parameters #9953
c9e38d5
@chiatt
Merge pull request #9954 from HistoricEngland/9953_fix_multiproc_inde…
9a6d664 
…xing

Fixed function call parameters #9953
@jacobtylerwalls
Correct version number of arches-django-revproxy
0489e6d
@chiatt
Merge pull request #10025 from archesproject/fix-package-number-6.2
35bb8d8 
[6.2.x] Fix version number of arches-django-revproxy in release note
@chiatt
Ensure link property is a string not a uuid, re #10084 (#10085)
94a8f47
@chiatt @jacobtylerwalls
Prep 6.2.5 release (#10086)
5cec264 
* Upgrade django to 3.2.21

* Adds draft 6.2.5 release notes

* Updates version number

* Update releases/6.2.5.md

Co-authored-by: Jacob Walls <[email protected]>

* Update readme link to release notest

---------

Co-authored-by: Jacob Walls <[email protected]>
@aarongundel
Check 'to' type and add better error logging
b89c58b
@chiatt
Merge pull request #10093 from archesproject/10084_email_to_type
e62ade0 
Check 'to' type and add better error logging
@jacobtylerwalls
Fix validation of required list nodes #10077
2bacfcb
@jacobtylerwalls
Implement clean() instead
90b5424
@jacobtylerwalls
Handle ResourceInstanceDataType also re #10077
5d4ee8c
@chiatt
Merge pull request #10132 from archesproject/10077-required-file-list
13c7f7e 
Fix validation of required list nodes #10077
@chiatt
Prevents undefined graph error, re #10151
ad10013
@jacobtylerwalls
Merge pull request #10152 from archesproject/10151_ri_widget_iconclas…
8f9ef93 
…s_error

Prevents undefined graph error, re #10151
@jacobtylerwalls
Add RENDERERS to settings.py template
b9763ce
@chiatt
Merge pull request #10171 from archesproject/add-renderers-to-template
f9d7524 
Add `RENDERERS` to settings.py template
@chiatt
Merge branch 'dev/6.2.x' into update_74x_with_62x
84ad189
@aj-he
match with multiple EDTF nodes in card criteria
bc81342
@apeters
Merge pull request #10202 from HistoricEngland/10112_fix_edtf_search_…
966f53e 
…filter_extra_results

Fixes multiple EDTF nodes in single card used in advanced search returning too many records
@chiatt chiatt requested a review from aarongundel October 30, 2023 21:16
aarongundel
aarongundel approved these changes Oct 30, 2023
View reviewed changes
Copy link
Contributor

@aarongundel aarongundel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@aarongundel aarongundel assigned chiatt and unassigned aarongundel Oct 30, 2023
@chiatt chiatt merged commit 77dcfef into dev/7.4.x Oct 31, 2023
1 check passed
@chiatt chiatt deleted the update_74x_with_62x branch November 10, 2023 22:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aarongundel aarongundel aarongundel approved these changes

Assignees

@chiatt chiatt

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@chiatt @aarongundel @khodgkinson-he @jacobtylerwalls @aj-he @apeters