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

Release/3.15.5 #121

Merged
merged 19 commits into from
Jul 12, 2024
Merged

Release/3.15.5 #121

merged 19 commits into from
Jul 12, 2024

Conversation

stankut
Copy link
Collaborator

@stankut stankut commented Jul 12, 2024

can me automatically merged, original PR: #111

Stanislav Kutasevits and others added 19 commits December 22, 2023 10:32
S2FRMS-40 adding child select fields
306b988
S2FRMS-40 - Adding name&address protection text, fixing populate
5518d4c
S2FRMS-40 - child select - name address protection
d8ade8b
S2FRMS-40 - Adding other guardian element
bff89d6
S2FRMS-40 other guardian CPR fix
ed022f9
Merge branch 'master' into f/S2FRMS-40_child_select
59155d1 
* master:
  Preparing 3.14.1
  Changelog update
  CprFetchData adding ajax error fix
  Preparing 3.14.0
  OS-64 Setting a standard value for Automatic purge

# Conflicts:
#	CHANGELOG.md
S2FRMS-40 making other guardian CPR private
936813b
S2FRMS-40 hiding other guardian value for email
e12d534
S2FRMS-40 hiding other guardian value for pdf
61e4481
@stankut
Merge branch 'develop' into f/S2FRMS-40_child_select
0985fad 
* develop: (45 commits)
  Release 3.15.2
  ITKDev: php warning if unserialize fails in encrypt patch
  Release 3.15.1
  ITKDev: Enabled encrypt and revisions at the same time
  Added missing return type
  Release 3.15.0
  Apply coding standards
  1062: Removed empty void return docblock
  1062: Disabled default encrypt, to allow admin to set new key first
  #867: Update CHANGELOG
  #867: Cleanup
  Update CHANGELOG
  Ensure array key exists before accessing it
  Updated CHANGELOG
  Apply coding standards
  1062: Fixed title translation in os2form encrypt
  1062: Updated minor code style fixes in webform encrypt
  1062: Added notification to encrypt settings page
  1062: Fixed code style in module to enable webform encrypt
  1062: Added drush command to enable webform encrypt for all forms
  ...

# Conflicts:
#	CHANGELOG.md
@stankut
OS-52 Maestro notification cpr_guardian
1c4210a
@stankut
Cleaning CHANGELOG
196f8e1
@stankut
S2FRMS-40 - PHPCS fixes
43f795a
@stankut
Codereview fixes
cb6512f
@stankut
Adding translation options
58fe8c1
@stankut
S2FRMS-40 Using $this->t() instead of t()
345a9fd
@stankut
Merge branch 'develop' into f/S2FRMS-40_child_select
00e33ec
@stankut
Merge pull request #111 from OS2Forms/f/S2FRMS-40_child_select
a1a5e6b 
S2FRMS-40/S2FRMS-58 child select
@stankut
Release 3.15.5
0a39f1d
@stankut
Copy link
Collaborator Author

stankut commented Jul 12, 2024

@rimi-itk additional PR review needed, however it's a copy of:
#111

we need to have a small discussion about how we want to optimize it in the future and avoid duplicated PRs

@stankut stankut requested a review from rimi-itk July 12, 2024 11:33
@stankut stankut merged commit c643903 into master Jul 12, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rimi-itk rimi-itk rimi-itk approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@stankut @rimi-itk