Skip to content

Conversation

@wilsonge
Copy link
Contributor

@wilsonge wilsonge commented Mar 27, 2019

Always merge with a merge commit for 3.x -> 4.0 merges

Michael Babker and others added 12 commits June 26, 2018 07:39
* actionlogs-for-superusers-only

* delete superusers only

* only for superusers

* superusers only

* superusers only

* superuseronly

* superonly

* superonly

* superonly
* Time based consent expiration params

* time based consent expiration

* added remind and token fields to #__privacy_consents tbale

* add remind me before consent expire param

* remindExpiringConsents()

Method to send the remind for privacy consents renew

* remind view

* remind model

* remind form

* remind controller

* #__privacy_consents table

* lang strings 1 of n

* ops

* minor+lang fix

* minor+lang fix

* lang strings fix

* minor+lang fix

* postgresql install

* mssql install

* mysql update

* postgresql update

* mssql update

* notify admin's when consent expires

* admin's notification on expired consent

* extend lang string

* lang string

* lang string

* grr

* reminder

* reminder

* lang CACHETIMEOUT_LABEL

* lang fix

* menu item lang string

* sort string

* multiple of 30

* placeholders comment

* Fix consent expiration

* Add view to routing

* Change back to JDatabaseException
@joomla-cms-bot
Copy link

Please add more information to your issue. Without test instructions and/or any description we will close this issue within 4 weeks. Thanks.
This is an automated message from the J!Tracker Application.

@wilsonge wilsonge requested review from rdeutz and zero-24 as code owners March 27, 2019 13:46
@joomla-cms-bot joomla-cms-bot removed the Language Change This is for Translators label Mar 27, 2019
@wilsonge
Copy link
Contributor Author

Just to flag for those coming back in the future that this one has an extra "Fix" in the privacy suite e07e3a5 similar to that in #23525 to make the module not throw php errors

@wilsonge wilsonge merged commit 81ed3dd into joomla:4.0-dev Mar 28, 2019
@wilsonge wilsonge deleted the 390-merge6 branch March 28, 2019 23:03
@wilsonge wilsonge added this to the Joomla 4.0 milestone Mar 28, 2019
@zero-24 zero-24 removed this from the Joomla 4.0 milestone Mar 29, 2019
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.