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.

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

Merge main into v7.1 #516

Merged
merged 24 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
43d30e9
Update extracted files (#443)
github-actions[bot] Mar 8, 2024
e9ca421
decribe branches in README.md (#451)
tychonievich Mar 8, 2024
33acf8e
Add contact info to auto-generated YAML files (#454)
tychonievich Apr 11, 2024
b1b355c
Add CI/CD workflow to validate YAML files (#457)
dthaler Apr 25, 2024
f62020f
yamllint is recursive (#460)
dthaler May 1, 2024
f00a9a8
Add Separation event (#459)
cdhorn May 11, 2024
bd43eb7
Fix workflow (#462)
dthaler May 11, 2024
f00c223
Track request for Separated as a future FAM attribute (#469)
dthaler May 23, 2024
73000c2
Fix reference to FilePath data type (#466)
dthaler May 23, 2024
a6c05e1
Typo in README.md (#472)
dstathis May 30, 2024
5f4f42b
Add the meaning of WWW (#480)
tychonievich Jun 18, 2024
c762c9b
Remove substructure-specific extension wording (#481)
tychonievich Jun 18, 2024
9ae5646
Add some possible additional family events for consideration (#479)
cdhorn Jun 18, 2024
e871b23
Clarify no-FORM PLACs (#487)
tychonievich Jun 25, 2024
18028c7
Define "principle date" (#492)
tychonievich Jun 25, 2024
e731e3c
Update extracted files (#485)
github-actions[bot] Jul 1, 2024
68bbe57
Clarify nickname (#482)
tychonievich Jul 2, 2024
0630554
Update extracted files (#501)
github-actions[bot] Jul 6, 2024
7dad7fe
Restore 3.0's definition of jurisdiction (#506)
tychonievich Jul 9, 2024
3b379a1
Update extracted files (#508)
github-actions[bot] Jul 9, 2024
c967b75
Increase largest PLAC example (#514)
tychonievich Jul 16, 2024
b11458a
Update extracted files (#515)
github-actions[bot] Jul 16, 2024
f461257
Fix validate-yaml warnings (#513)
dthaler Jul 16, 2024
7bfb0b3
Merge branch 'v7.1' into merge-main-into-v7.1
tychonievich Jul 16, 2024
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
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# For documentation on the format of this file, see
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
---

version: 2
updates:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/generate-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
#
# For documentation on the syntax of this file, see
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
---
name: Build

on:

Check warning on line 11 in .github/workflows/generate-files.yml

View workflow job for this annotation

GitHub Actions / validate-yaml

11:1 [truthy] truthy value should be one of [false, true]
push:
branches: [main, v7.1]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/propagate-main-to-v7.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
#
# For documentation on the syntax of this file, see
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
---
name: Build

on:

Check warning on line 11 in .github/workflows/propagate-main-to-v7.1.yml

View workflow job for this annotation

GitHub Actions / validate-yaml

11:1 [truthy] truthy value should be one of [false, true]
push:
branches: [main]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/validate-yaml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
#
# For documentation on the syntax of this file, see
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
---
name: Validate-YAML

on:

Check warning on line 9 in .github/workflows/validate-yaml.yml

View workflow job for this annotation

GitHub Actions / validate-yaml

9:1 [truthy] truthy value should be one of [false, true]
push:
branches: [main, v7.1, next-patch]
pull_request:
Expand Down
1 change: 1 addition & 0 deletions .yamllint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Configuration file for yamllint. For documentation, see
# https://yamllint.readthedocs.io/en/stable/configuration.html
---

extends: default

Expand Down
8 changes: 4 additions & 4 deletions extracted-files/tags/PLAC
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ specification:
The principal place in which the superstructure's subject occurred, represented
as a [List] of jurisdictional entities in a sequence from the lowest to the
highest jurisdiction, where "jurisdiction" includes units in a political,
ecclesiastical, and geographical hierarchies and may include units as large as
a nation or as specific as a building, farm, or cemetery. As with other lists,
the jurisdictions are separated by commas. Any jurisdiction's name that is
missing is still accounted for by an empty string in the list.
ecclesiastical, and geographical hierarchies and may include units of any size,
such as a continent, "at sea", or a specific building, farm, or cemetery. As
with other lists, the jurisdictions are separated by commas. Any jurisdiction's
name that is missing is still accounted for by an empty string in the list.

The type of each jurisdiction is given in the `PLAC`.`FORM` substructure, if
present, or in the `HEAD`.`PLAC`.`FORM` structure. If neither is present, the
Expand Down
2 changes: 1 addition & 1 deletion specification/gedcom-3-structures-3-meaning.md
Original file line number Diff line number Diff line change
Expand Up @@ -1122,7 +1122,7 @@ A name given to a foundling orphan might be
The principal place in which the superstructure's subject occurred,
represented as a [List] of jurisdictional entities in a sequence from the lowest to the highest jurisdiction,
where "jurisdiction" includes units in a political, ecclesiastical, and geographical hierarchies
and may include units as large as a nation or as specific as a building, farm, or cemetery.
and may include units of any size, such as a continent, "at sea", or a specific building, farm, or cemetery.
As with other lists, the jurisdictions are separated by commas.
Any jurisdiction's name that is missing is still accounted for by an empty string in the list.

Expand Down