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

Fix marriages and marriage photos #536

Merged
merged 4 commits into from
Nov 22, 2024
Merged

Fix marriages and marriage photos #536

merged 4 commits into from
Nov 22, 2024

Conversation

Neriderc
Copy link
Owner

This pull requests has a few changes around marriages and marriage photos that fix a few issues with the recent unreleased functionality:

  • Add space between marriages in family record in separated mode when one family record has multiple marriage events
  • Tweaked marriage photo display and multiple marriages in combined mode to make it look better
  • Fixed issue where only one marriage photo would show when there were multiple marriage events for one family
  • Also updated to latest translations

Related issue #531

Where a family record has multiple marriages, this change adds a space between them in Separated mode
Fixed issue where first marriage photo only shows photo for first marriage, when it should show the first photo for each marriage in the record.

This commit fixes only the Separated mode.
Fixed showing first photo for marriage in combined mode where one family has multiple marriage events.

Also made some display changes for displaying marriage photos in combined mode to make it look nicer.
Copy link

Qodana for PHP

It seems all right 👌

No new problems were found according to the checks applied

💡 Qodana analysis was run in the pull request mode: only the changed files were checked
☁️ View the detailed Qodana report

Detected 84 dependencies

Third-party software list

This page lists the third-party software dependencies used in project

Dependency Version Licenses
aura/router 3.3.0 MIT
brick/math 0.9.3 MIT
carbonphp/carbon-doctrine-types 2.1.0 MIT
dflydev/dot-access-data v3.0.2 MIT
doctrine/cache 2.2.0 MIT
doctrine/dbal 3.8.3 MIT
doctrine/deprecations 1.1.3 MIT
doctrine/event-manager 2.0.1 MIT
doctrine/inflector 2.0.10 MIT
doctrine/lexer 3.0.1 MIT
egulias/email-validator 4.0.2 MIT
ezyang/htmlpurifier v4.17.0 LGPL-2.1-or-later
fig/http-message-util 1.1.5 MIT
fisharebest/algorithm 1.6.0 GPL-3.0-or-later
fisharebest/ext-calendar 2.6.0 GPL-3.0-or-later
fisharebest/flysystem-chroot-adapter 2.0.0 MIT
fisharebest/localization 1.17.0 GPL-3.0-or-later
fisharebest/webtrees 2.1.20 GPL-3.0-or-later
guzzlehttp/guzzle 7.8.1 MIT
guzzlehttp/promises 2.0.2 MIT
guzzlehttp/psr7 2.6.2 MIT
illuminate/collections v8.83.27 MIT
illuminate/container v8.83.27 MIT
illuminate/contracts v8.83.27 MIT
illuminate/database v8.83.27 MIT
illuminate/macroable v8.83.27 MIT
illuminate/support v8.83.27 MIT
intervention/image 2.7.2 MIT
io-developer/php-whois 4.1.10 MIT
league/commonmark 2.4.2 BSD-3-Clause
league/config v1.2.0 BSD-3-Clause
league/flysystem-ziparchive 2.3.1 MIT
league/flysystem 2.5.0 MIT
league/mime-type-detection 1.15.0 MIT
middlewares/client-ip v2.0.1 MIT
mlocati/ip-lib 1.18.0 MIT
nesbot/carbon 2.72.3 MIT
nette/schema v1.3.0 BSD-3-Clause
GPL-2.0-only
GPL-3.0-only
nette/utils v4.0.4 BSD-3-Clause
GPL-2.0-only
GPL-3.0-only
nyholm/psr7-server 1.1.0 MIT
nyholm/psr7 1.8.1 MIT
oscarotero/middleland v1.0.1 MIT
psr/cache 1.0.1 MIT
psr/clock 1.0.0 MIT
psr/container 1.1.2 MIT
psr/event-dispatcher 1.0.0 MIT
psr/http-client 1.0.3 MIT
psr/http-factory 1.1.0 MIT
psr/http-message 1.1 MIT
psr/http-server-handler 1.0.2 MIT
psr/http-server-middleware 1.0.2 MIT
psr/log 2.0.0 MIT
psr/simple-cache 1.0.1 MIT
ralouphie/getallheaders 3.0.3 MIT
ramsey/collection 1.3.0 MIT
ramsey/uuid 4.2.3 MIT
sabre/uri 3.0.1 BSD-3-Clause
sabre/vobject 4.5.4 BSD-3-Clause
sabre/xml 4.0.5 BSD-3-Clause
symfony/cache-contracts v2.5.3 MIT
symfony/cache v5.4.36 MIT
symfony/console v5.4.40 MIT
symfony/deprecation-contracts v3.5.0 MIT
symfony/event-dispatcher-contracts v3.5.0 MIT
symfony/event-dispatcher v6.4.8 MIT
symfony/expression-language v5.4.35 MIT
symfony/mailer v5.4.36 MIT
symfony/mime v6.4.8 MIT
symfony/polyfill-ctype v1.29.0 MIT
symfony/polyfill-intl-grapheme v1.29.0 MIT
symfony/polyfill-intl-idn v1.29.0 MIT
symfony/polyfill-intl-normalizer v1.29.0 MIT
symfony/polyfill-mbstring v1.29.0 MIT
symfony/polyfill-php72 v1.29.0 MIT
symfony/polyfill-php73 v1.29.0 MIT
symfony/polyfill-php80 v1.29.0 MIT
symfony/polyfill-php81 v1.29.0 MIT
symfony/service-contracts v3.5.0 MIT
symfony/string v6.4.8 MIT
symfony/translation-contracts v3.5.0 MIT
symfony/translation v6.4.8 MIT
symfony/var-exporter v6.4.8 MIT
tecnickcom/tcpdf 6.7.4 LGPL-3.0-or-later
voku/portable-ascii 1.6.1 MIT
Contact Qodana team

Contact us at [email protected]

@Neriderc Neriderc merged commit 7f4d563 into main Nov 22, 2024
2 checks passed
@Neriderc Neriderc deleted the fix-marriages branch November 22, 2024 08:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant