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

P#110445 adress detailpage template #900

Merged
merged 62 commits into from
Sep 24, 2024
Merged

P#110445 adress detailpage template #900

merged 62 commits into from
Sep 24, 2024

Conversation

andernath
Copy link
Contributor

No description provided.

dai-eastgate and others added 30 commits April 25, 2024 15:53
@dai-eastgate
47365 revision of the address list template
5c8e4e0
@yeneastgate
Merge branch 'master' of https://github.com/onOfficeGmbH/oo-wp-plugin …
6655e21 
…into 47365-revision-of-the-address-list-template
@dai-eastgate
47365 update content for image alt & unit test
d06e50b
@fredericalpers
Merge branch 'master' into 47365-revision-of-the-address-list-template
184b7e6
@yeneastgate
47941 add address detail page
07d82dd
@yeneastgate
47941 update unit test
88e5909
@yeneastgate
47941 update unit test
ea46e52
@dai-eastgate
47944 add form selection
c6870b6
@dai-eastgate
47945 update config show estate
b8a0220
@dai-eastgate
47945 refactor code & update unit test
b574c58
@dai-eastgate
Merge branch 'master' into 47365-revision-of-the-address-list-template
3fdfeeb
@yeneastgate
Merge branch 'master' into 47941-improvement-of-the-address-list-func…
e5e52d1 
…tionality-add-detail-page
@dai-eastgate
47945 refactor code
a267708
@dai-eastgate
47945 fix conflict
95d15df
@yeneastgate
Merge branch 'master' into 47941-improvement-of-the-address-list-func…
757c366 
…tionality-add-detail-page
@dai-eastgate
Merge branch 'master' into 47365-revision-of-the-address-list-template
641216d
@dai-eastgate
Merge branch 'master' into 47944-improvement-of-the-address-list-func…
25812ee 
…tionality-add-form-selection
@dai-eastgate
Merge branch 'master' into 47945-improvement-of-the-address-list-func…
3bf0089 
…tionality-add-property-list-selection
@dai-eastgate
Merge branch 'master' into 47945-improvement-of-the-address-list-func…
8536328 
…tionality-add-property-list-selection
@dai-eastgate
Merge branch 'master' into 47944-improvement-of-the-address-list-func…
9c4ff93 
…tionality-add-form-selection
@dai-eastgate
Merge branch 'master' into 47365-revision-of-the-address-list-template
c7d3628
@yeneastgate
Merge branch 'master' into 47941-improvement-of-the-address-list-func…
53395db 
…tionality-add-detail-page
@yeneastgate
Merge branch 'master' into 47941-improvement-of-the-address-list-func…
db7211b 
…tionality-add-detail-page
@yeneastgate
Merge branch 'master' into 47365-revision-of-the-address-list-template
d84e341
@fredericalpers
Merge branch 'master' into 47365-revision-of-the-address-list-template
221c59b
@dai-eastgate
Merge branch 'master' into 47365-revision-of-the-address-list-template
d4b6f6d
@dai-eastgate
Merge branch 'master' into 47941-improvement-of-the-address-list-func…
83a5b3c 
…tionality-add-detail-page
@dai-eastgate
Merge branch 'master' into 47944-improvement-of-the-address-list-func…
4773df4 
…tionality-add-form-selection
@dai-eastgate
Merge branch 'master' into 47945-improvement-of-the-address-list-func…
3bfcd16 
…tionality-add-property-list-selection
@fredericalpers
Merge branch 'master' into 47365-revision-of-the-address-list-template
b7a1b8f
dai-eastgate and others added 20 commits August 27, 2024 11:54
@dai-eastgate
52295 refactor code
661025f
@dai-eastgate
Merge branch 'master' into 52295-improvement-of-the-address-list-func…
a549531 
…tionality
@andernath
render template
2611ea0
@andernath
Merge branch '47365-revision-of-the-address-list-template' into p#110…
bf8ed08 
…445-adress-detailpage-frontend-logic

# Conflicts:
#	plugin/AddressList.php
@andernath
Add test template
36cb0be
@ingoKrOffice
increase limit for Estatelist-Select in AdressDetailSettings
c48fc8f
@ingoKrOffice
Add AddressDetail-Logic, add estatelist in addressdetailpage, add for…
62e943b 
…m in addressdetailpage
@ingoKrOffice
fix tests
11a4f2b
@ingoKrOffice
some fixes
65a9388
@ingoKrOffice
remove AddressListEnvironment from AdressList
c2fddcf
@ingoKrOffice
remove useless test
0f4bd6f
@ingoKrOffice
remove php 7.3 tests
5252947
@ingoKrOffice
fix tests and remove comments
42e47f0
@ingoKrOffice
validate integer pageId
271c63f
@andernath
prepare style sheets for address styling
5a7d1da
@andernath
Merge branch 'master' into p#110445-adress-detailpage-template
e37f948 
# Conflicts:
#	plugin/AddressDetail.php
#	plugin/AddressList.php
#	plugin/Controller/AddressListBase.php
#	plugin/Controller/ContentFilter/ContentFilterShortCodeAddressDetail.php
#	plugin/Controller/ContentFilter/ContentFilterShortCodeEstateList.php
#	plugin/DataView/DataAddressDetailView.php
#	plugin/DataView/DataAddressDetailViewHandler.php
#	plugin/EstateList.php
#	plugin/Filter/DefaultFilterBuilderListViewAddress.php
#	plugin/Filter/DefaultFilterBuilderListViewAddressFactory.php
#	plugin/FormPostContact.php
#	plugin/Gui/AdminPageAddressDetail.php
#	plugin/Model/FormModelBuilder/FormModelBuilderAddressDetailSettings.php
#	plugin/Model/InputModel/InputModelOptionFactoryAddressDetailView.php
#	templates.dist/address/default_detail.php
#	tests/TestClassDataAddressDetailView.php
#	tests/TestClassFormModelBuilderAddressDetailSettings.php
#	tests/TestClassRewriteRuleBuilder.php
@andernath
Use getRows() to avoid duplicated fields with default email and phone
35957be 
Add Styling
Merge conflicts
#p110445
@andernath
Add image alt tag
c581dbb 
#p110445
@andernath
Adjust styling
c0da892 
#p110445
@andernath
Refactor code and merging conflicts
f27ed69 
#p110445
@andernath andernath added the deploy test Triggers event to create test version label Sep 18, 2024
@github-actions GitHub Actions
Copy link

Steps to install the approved version:

  1. Download onoffice-5.1-60-gf27ed691-please-unpack.zip from https://github.com/onOffice-Web-Org/oo-wp-plugin/actions/runs/10921022303.
  2. Unpack the downloaded file to get another .zip file.
  3. Upload that inner .zip file to WordPress.

@andernath andernath added this to the v5.2 milestone Sep 19, 2024
@andernath andernath merged commit 4859bcd into master Sep 24, 2024
2 checks passed
@andernath andernath deleted the p#110445-adress-detailpage-template branch September 24, 2024 04:27
@andernath andernath restored the p#110445-adress-detailpage-template branch September 24, 2024 04:27
pospisk
pospisk reviewed Sep 24, 2024
View reviewed changes
Copy link
Collaborator

@pospisk pospisk left a comment

Choose a reason for hiding this comment

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

All good, ready for release.

@andernath andernath deleted the p#110445-adress-detailpage-template branch October 30, 2024 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pospisk pospisk pospisk left review comments

Assignees
No one assigned
Labels
deploy test Triggers event to create test version
Projects
None yet
Milestone
v5.2
Development

Successfully merging this pull request may close these issues.
6 participants
@andernath @pospisk @dai-eastgate @yeneastgate @fredericalpers @ingoKrOffice