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

Merging next_release branch back to 4.x-dev #19815

Closed
wants to merge 11 commits into from

Conversation

justinvelluppillai
Copy link
Contributor

Description:

There are a few changes only on the next_release branch that we need to merge back to 4.x-dev and then eventually 5.x-dev. We don't want to delete this branch in the process of merging.

Review

* Added config option to disable archiving for actions goals

* Additionally disable entry page goals archiving if the config option is set

* Use GeneralConfig::getConfigValue to allow support for site specific config settings

* Updated UI test screenshot
* De-duplicate the plugin name in the what's new entry

Fixes #19792

* Updated UI screenshot
…19794)

* Detect known consent managers on the current website and show a configuration guide link

* Added exception handing for outbound http/s requests, added type hints and phpdoc

* Fix tests
…t up from design (#19707)

* add copy link button and style

* add design copy link

add design copy link

* Revert "add design copy link"

This reverts commit bb081bd.

* add link token

add link token

* update tests

update tests

* built vue files

* update xml tests

update xml tests

* update UI

update UI

* built vue files

* update ui

update ui

* Update UsersManagerTest.php

update tests

* update tests

update tests

* update tests

update tests

* Update UsersManager_spec.js

update screenshots

* update ui

update ui

* update css

update css

* built vue files

* remove password confirm for invite

remove password confirm for invite

* built vue files

* update css

update css

* convert vue scoped to less

convert vue scoped to less

* Update UsersManager.vue

fix vue error

* update vue tests

update vue tests

* built vue files

* update tests

update tests

* update ui

update ui

* update UserSetting token UI

update UserSetting token UI

* add new screen short copied success

add new screen short copied success

* revert failed UI

revert failed UI

* Update plugins/UsersManager/lang/en.json

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Update plugins/UsersManager/lang/en.json

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Update plugins/UsersManager/lang/en.json

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Update plugins/UsersManager/lang/en.json

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* remove DB field and convert the copy link

remove DB field and convert the copy link

* update error

update error

* update notification

update notification

* built vue files

* revert database changes

revert database changes

* update api and tests

update api and tests

* built vue files

* update padding css

update padding css

* move global button css to modal

move global button css to modal

* update modal to global

update modal to global

* remove invite token

remove invite token

* Update plugins/CoreHome/vue/src/Notification/Notification.ts

* update fonts and screenshots

update fonts and screenshots

* update fonts

update fonts

* exclude woff2 file on release check

exclude woff2 file on release check

* Update plugins/UsersManager/API.php

* update tests

update tests

* remove duplicated

remove duplicated

* update confirm box

update confirm box

* built vue files

* tidy up some file

tidy up some file

* update icon and update version number

update icon and update version number

* update change log and translation

update change log and translation

* update button trigger generate link twice

update button trigger generate link twice

* add updates

add updates

* add missing param

add missing param

* update missing comma

update missing comma

* remove un use variable

remove un use variable

* update tests

update tests

* built vue files

* add password confirm for the invite action and add popup notes

add password confirm for the invite action and add popup notes

* update vue error

update vue error

* revert 4.120-b2 update to b4

revert 4.120-b2 update to b4

* update vue error

update vue

* built vue files

* update typescript error

update typescript error

* update type script

update type script

* update vue error

update vue error

* built vue files

* update tests

update tests

* update screenshots

update screenshots

* update tests

update tests

* update tests and wording on the popup

update tests and wording on the popup

* built vue files

* adding clipboard copy error in safari etc

adding clipboard copy error in safari etc

* built vue files

* update double error message

update double error message

* update wording

update wording

* built vue files

* hot fix give default period (#19724)

* hot fix give default period

hot fix give default period

* update to user default period

update to user default period

* add default date param in templates

add default date param in templates

* update tests prevent random fail

update tests prevent random fail

* built vue files

* update ui

update ui

* Improve no data check in html visualization (#19740)

* add command copy over http

add command copy over http

* built vue files

* Adding the abililty to exclude specific sites from the site selector (#19738)

* Adding the abililty to exclude specific sites from the Vue site selector component.

* Adding more time to make sure that the select is loaded before trying to search.

* Changed things to filter the site on the server side.

* Added a few new test cases.

* Increasing amount of time for test.

* Updated the omnifixture.

* Fixing logic error in view.

* Removed collation from omnifixture since it was causing issues.

* Switching omnifixture back to 4.x-dev version.

* Making just the bare essential changes to make local test fixtures build correctly.

* Updating screenshot of API list.

* revert OmniFixture-dump to 4.x-dev

revert OmniFixture-dump to 4.x-dev

Co-authored-by: Peter <peter@innocraft.com>

* merge 4.x and update copied success ui tests

merge 4.x and update copied success ui tests

* rebase to next release

rebase to next release

* rebase to next release

rebase to next release

* update safrai and enable copy success and copy again

update safrai and enable copy success and copy again

* fix Safrai showing random token

fix Safrai showing random token

* built vue files

* Revert "Adding the abililty to exclude specific sites from the site selector (#19738)"

This reverts commit a53a628.

* update fonts and text

update fonts and text

* built vue files

* update wording

update wording

* built vue files

* Updated UI test screenshots

Co-authored-by: peterhashair <peterhashair@users.noreply.github.com>
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Co-authored-by: snake14 <snake14@users.noreply.github.com>
Co-authored-by: Ben <ben.burgess@innocraft.com>
@justinvelluppillai justinvelluppillai added the Needs Review PRs that need a code review label Oct 5, 2022
@sgiehl
Copy link
Member

sgiehl commented Oct 5, 2022

I think I mentioned that before already: We should not merge back the changes using a pull request (unless we allow something else than squash). Otherwise we will loose the merge commits of the PRs that had been merged to next_release only.
I'll close this one and push the merge directly on command line to preserve history

@sgiehl sgiehl closed this Oct 5, 2022
@justinvelluppillai justinvelluppillai deleted the next_release branch October 19, 2022 00:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants