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

Merge release into master2 #7568

Merged
merged 83 commits into from
Mar 12, 2024
Merged

Merge release into master2 #7568

merged 83 commits into from
Mar 12, 2024

Conversation

PhotoNomad0
Copy link
Contributor

Describe what your pull request addresses (Please include relevant issue numbers):

Please include detailed Test instructions for your pull request:

Standard Test Instructions for PR Review Process:

  • Double check unit tests that have been written
  • Check for documentation for code changes
  • Check that there are not inadvertent commits to tC Apps when reviewing a tC Core PR
  • Checkout the branch locally and ensure that app runs as expected
    • Ensure tests pass
    • Open and watch the console for errors
    • Make sure all actions perform as expected
    • Import and Load a new Project
    • Load a tool and perform basic actions
    • Switch tools and perform basic actions
    • Switch project to an existing project
    • Load a tool and perform basic actions
    • Switch tools and perform basic actions
    • Next time reverse the order of importing after loading an existing project
  • Reviewer should double check the DoD in the ISSUE, including the “spirit” of the story
  • Ask Ben or Koz if you have any concerns about implementation (especially UI related)

PhotoNomad0 and others added 30 commits July 31, 2023 10:07
@PhotoNomad0
update change log
70ed53d
@PhotoNomad0
Merge pull request #7517 from unfoldingWord/merge-3.5.0-to-develop
6595ccc 
Merge 3.5.0 to develop
add jsdoc generation to github actions
6312c26
@PhotoNomad0
fix jsdocs generation
83069c0
@PhotoNomad0
fix jsdocs generation. fix some jsdocs
d79133d
@PhotoNomad0
fix jsdocs generation. fix some jsdocs.
dd32915
fix jsdocs folder name
427c0a2
Merge remote-tracking branch 'origin/feature-mcleanb-integrateJsdocs'…
32a8a96 
… into feature-mcleanb-integrateJsdocs

# Conflicts:
#	.github/workflows/main.yml
adding git commit of jsdocs
ef88c73
adding git commit of jsdocs
fd60875
adding git commit of jsdocs
8ca2c69
adding git commit of jsdocs
606e7dc
adding git commit of jsdocs
42ed484
adding git commit of jsdocs
fbfad2c
adding git commit of jsdocs
15a0d35
adding git commit of jsdocs
bb7a27a
adding git commit of jsdocs
fe71e67
adding git commit of jsdocs
3e2f683
adding git commit of jsdocs
c840161
working on adding jsDocs to github pages
f166edb
README.md cleanup
9a8cc64
README.md cleanup
f960e8a
remove the git version update code which does not succeed.
da5d7af
fix github actions
f85c9c9
cleanup github actions
0afbc52
fix git commit of jsdocs
69ec7c8
fix git commit of jsdocs
8fcb94c
updated container
6765f76
tweak logging
faef4d4
back out fix the npm cache
aba4c95
blm and others added 28 commits August 14, 2023 11:20
updated docker container
f020c5c
exclude test folder.
a27180f
@PhotoNomad0
Merge pull request #7527 from unfoldingWord/feature-mcleanb-release-v…
99ddee0 
…3.5.1-updateChangeLog

Feature mcleanb release v3.5.1 update change log
@PhotoNomad0
fix for test failure
1adc682
@PhotoNomad0
fix for test failure
d1ffcfb
@PhotoNomad0
fix for test failure
c7b717a
@PhotoNomad0
fix for test failure
5ceda7e
@PhotoNomad0
fix for test failure
4860716
@PhotoNomad0
Merge pull request #7521 from unfoldingWord/feature-mcleanb-integrate…
795c60b 
…Jsdocs

Feature / add jsdoc generation to github actions
@PhotoNomad0
Feature / update electronite to v25.3.2 (#7530)
b621903 
* trying updated electronite

* testing

* trying updated electronite

* update to use electronite 25.3.2

* update to use electronite 23.3.10

---------

Co-authored-by: blm <[email protected]>
@PhotoNomad0
feature / updated tc-source-content-updater to use the latest catalog…
2fe1dfc 
… URLs (#7531)

* updated tc-source-content-updater to use the latest catalog URLs

* bump version

---------

Co-authored-by: blm <[email protected]>
@PhotoNomad0
Feature / fix URL for catalog (#7532)
0160b7b 
* updated tc-source-content-updater to use the latest catalog URLs

* bump version

* bump version

* updated tc-source-content-updater to use the latest catalog URLs

* Revert "bump version"

This reverts commit 80fbb45.

* bump version

* bump version

* updated tc-source-content-updater to use the latest catalog URLs

* updated tc-source-content-updater to use the latest catalog URLs

* updated tc-source-content-updater to use the latest catalog URLs

* updated resources

---------

Co-authored-by: blm <[email protected]>
@PhotoNomad0
Bugfix 7533/broken preview paragraph (#7534)
9d8cdec 
* fix charis definition

* fix print preview for case missing paragraph marker before

---------

Co-authored-by: PhotoNomad0 <[email protected]>
@PhotoNomad0
Feature 7536 / front matter alignment support (#7538)
95ef435 
* fixes for front matter alignment

* update resources

* fix to migrate original language bible on upgrade of version.
fix to export front matter alignments

* fix migration unit tests to match replacement of original language bibles parsed with older tC versions.

* fix migration to remove derived original language translationWords.

* Clean up highlight colors in log file.

* Clean up

* bump version

* updated dependencies

---------

Co-authored-by: PhotoNomad0 <[email protected]>
@PhotoNomad0
Feature 5885 / alignment enhancements (#7542)
2bc4476 
* updated word alignment tool

* updated locales

* updated translation helps tools

* updated tools

* updated tools

* updated tools

---------

Co-authored-by: PhotoNomad0 <[email protected]>
@PhotoNomad0
updated CHANGELOG.md (#7544)
58f2b51 
Co-authored-by: PhotoNomad0 <[email protected]>
@PhotoNomad0
bugfix 7546 / fix creating WA group data - allow for verses to be str…
7e87603 
…ing format (#7547)

* fix creating WA group data - allow for verses to be string format

* add warning when group data is generated and verse span is not found

---------

Co-authored-by: PhotoNomad0 <[email protected]>
@PhotoNomad0
Bugfix mcleanb 7546 fix verse span support (#7549)
81a42f9 
* fix creating WA group data - allow for verses to be string format

* add warning when group data is generated and verse span is not found

* add unit tests to check for verse span in WA group data

---------

Co-authored-by: PhotoNomad0 <[email protected]>
@PhotoNomad0
Bugfix 7555 / multiselect bug (#7556)
d1f76d8 
* add python script to get latest

* add javascript to get latest

* add javascript to get latest versions of tCore

* change default upgrade of macos arm64 to universal

* got getLatestTcore.js working.  fixed versioning in getLatestTcore.py

* update unit tests for arm64 update

* update unit tests

* update wordAlignment

* update wordAlignment

---------

Co-authored-by: PhotoNomad0 <[email protected]>
@PhotoNomad0
Merge changelog release 3.6.2 (#7557)
e56071c 
* bugfix 7546 / fix creating WA group data - allow for verses to be string format (#7547)

* fix creating WA group data - allow for verses to be string format

* add warning when group data is generated and verse span is not found

---------

Co-authored-by: PhotoNomad0 <[email protected]>

* Bugfix mcleanb 7546 fix verse span support (#7549)

* fix creating WA group data - allow for verses to be string format

* add warning when group data is generated and verse span is not found

* add unit tests to check for verse span in WA group data

---------

Co-authored-by: PhotoNomad0 <[email protected]>

* Bugfix 7555 / multiselect bug (#7556)

* add python script to get latest

* add javascript to get latest

* add javascript to get latest versions of tCore

* change default upgrade of macos arm64 to universal

* got getLatestTcore.js working.  fixed versioning in getLatestTcore.py

* update unit tests for arm64 update

* update unit tests

* update wordAlignment

* update wordAlignment

---------

Co-authored-by: PhotoNomad0 <[email protected]>

* update wordAlignment

---------

Co-authored-by: PhotoNomad0 <[email protected]>
@PhotoNomad0
Feature 7552 / download right version (#7553)
0546c47 
* add python script to get latest

* add javascript to get latest

* add javascript to get latest versions of tCore

* change default upgrade of macos arm64 to universal

* got getLatestTcore.js working.  fixed versioning in getLatestTcore.py

* update unit tests for arm64 update

* Merge changelog release 3.6.2 (#7557)

* bugfix 7546 / fix creating WA group data - allow for verses to be string format (#7547)

* fix creating WA group data - allow for verses to be string format

* add warning when group data is generated and verse span is not found

---------

Co-authored-by: PhotoNomad0 <[email protected]>

* Bugfix mcleanb 7546 fix verse span support (#7549)

* fix creating WA group data - allow for verses to be string format

* add warning when group data is generated and verse span is not found

* add unit tests to check for verse span in WA group data

---------

Co-authored-by: PhotoNomad0 <[email protected]>

* Bugfix 7555 / multiselect bug (#7556)

* add python script to get latest

* add javascript to get latest

* add javascript to get latest versions of tCore

* change default upgrade of macos arm64 to universal

* got getLatestTcore.js working.  fixed versioning in getLatestTcore.py

* update unit tests for arm64 update

* update unit tests

* update wordAlignment

* update wordAlignment

---------

Co-authored-by: PhotoNomad0 <[email protected]>

* update wordAlignment

---------

Co-authored-by: PhotoNomad0 <[email protected]>

* add python script to get latest

* add javascript to get latest

* add javascript to get latest versions of tCore

* got getLatestTcore.js working.  fixed versioning in getLatestTcore.py

---------

Co-authored-by: PhotoNomad0 <[email protected]>
Merge remote-tracking branch 'origin/release-v3.6.2' into develop
f939bfc
update Ukrainian
af6ac8e
update Ukrainian in tools
ccdbe5f
@PhotoNomad0
add fixes for invalid localization (#7564) (#7565)
ef72f01 
Co-authored-by: PhotoNomad0 <[email protected]>
@PhotoNomad0
Merge latest (#7567)
e859026 
* add fixes for invalid localization (#7564)

Co-authored-by: PhotoNomad0 <[email protected]>

* Bugfix / fix tn import (#7566)

* add fixes for invalid localization (#7564) (#7565)

Co-authored-by: PhotoNomad0 <[email protected]>

* add fixes for tn import and migration errors

* add fixes for tn import

---------

Co-authored-by: PhotoNomad0 <[email protected]>

---------

Co-authored-by: PhotoNomad0 <[email protected]>
Merge remote-tracking branch 'origin/release-v3.6.3' into merge-relea…
4159c57 
…se-into-master2

# Conflicts:
#	CHANGELOG.md
#	package-lock.json
#	package.json
#	src/js/helpers/ResourcesHelpers.js
#	src/tC_apps/translationNotes
#	src/tC_apps/translationWords
#	src/tC_apps/wordAlignment
resolve conflicts
c31d67f
@PhotoNomad0 PhotoNomad0 merged commit dcab01c into master Mar 12, 2024
8 checks passed
@delete-merged-branch delete-merged-branch bot deleted the merge-release-into-master2 branch March 12, 2024 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@PhotoNomad0