Skip to content

[pull] master from YOURLS:master#36

Open
pull[bot] wants to merge 329 commits into
caesar-team:masterfrom
YOURLS:master
Open

[pull] master from YOURLS:master#36
pull[bot] wants to merge 329 commits into
caesar-team:masterfrom
YOURLS:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented Feb 9, 2022

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull Bot added the ⤵️ pull label Feb 9, 2022
@pull pull Bot added the merge-conflict Resolve conflicts manually label Feb 16, 2022
yourls-bot Bot and others added 28 commits October 17, 2022 09:43
Co-authored-by: ozh <ozh@users.noreply.github.com>
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.21.2 to 2.22.0.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.21.2...2.22.0)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: ozh <ozh@users.noreply.github.com>
Co-authored-by: ozh <ozh@users.noreply.github.com>
Co-authored-by: ozh <ozh@users.noreply.github.com>
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.22.0 to 2.23.0.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.22.0...2.23.0)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
  - Upgrading composer/ca-bundle (1.3.1 => 1.3.4)
  - Upgrading geoip2/geoip2 (v2.12.2 => v2.13.0)
  - Upgrading ozh/bookmarkletgen (1.2 => 1.2.2)
  - Upgrading pomo/pomo (v1.4.1 => v1.5.0)
  - Upgrading rmccue/requests (2.0.2 => v2.0.5)
  - Upgrading spatie/array-to-xml (2.16.0 => 2.17.1)
  - Upgrading symfony/polyfill-intl-idn (v1.25.0 => v1.27.0)
  - Upgrading symfony/polyfill-intl-normalizer (v1.25.0 => v1.27.0)
  - Upgrading symfony/polyfill-mbstring (v1.25.0 => v1.27.0)
  - Upgrading symfony/polyfill-php72 (v1.25.0 => v1.27.0)
Co-authored-by: ozh <ozh@users.noreply.github.com>
Co-authored-by: Léo Colombaro <git@colombaro.fr>
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.23.0 to 2.24.0.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.23.0...2.24.0)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: ozh <ozh@users.noreply.github.com>
* wrapped $user in preg_quote function
* updated auth test for special character in username

Co-authored-by: Léo Colombaro <git@colombaro.fr>
Co-authored-by: ྅༻ Ǭɀħ ༄༆ཉ <ozh@ozh.org>
- updated calls to functions
- deprecate function yourls_activate_plugin_sandbox()
- add unit tests
- log loaded files
- tweak yourls_debug_log to allow early uses

Co-authored-by: e-ht <1045813+e-ht@users.noreply.github>
Co-authored-by: eht <1045813+e-ht@users.noreply.github.com>
Co-authored-by: ྅༻ Ǭɀħ ༄༆ཉ <ozh@ozh.org>

Closes #3321
…3485)

Pass id to yourls_table_edit_row() so the correct line in the table is updated.
Fixes #3485 

Co-authored-by: ྅༻ Ǭɀħ ༄༆ཉ <ozh@ozh.org>
Co-authored-by: ozh <ozh@users.noreply.github.com>
Co-authored-by: ozh <ozh@users.noreply.github.com>
ozh and others added 30 commits February 2, 2026 13:32
* Improve shunt filters

Fixes #4057

Also, update the shunt logic in GeoIP functions and while I'm at it update the geoip tests

* Make the default shunt value a string
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6 to 7.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v6...v7)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 7 to 8.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v7...v8)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Fix notice overlapping logo in admin panel

The `h1` element was using a hardcoded `height: 50px` which,
combined with its `float: right`, caused `div.notice` to
overlap the logo when shown after plugin activation or
deactivation. Block elements do not clear floats by default,
so the notice would render at the top of the collapsed header
rather than below it.

Two changes made to css/style.css:

- Remove `height: 50px` from `h1` so the header height is
  no longer artificially constrained to a fixed value.

- Add `clear: both` to `.notice` so it always starts below
  any preceding floated elements, directly preventing the
  overlap with the logo.

Fixes #3578
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.36.0 to 2.37.0.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.36.0...2.37.0)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-version: 2.37.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 2 to 3.
- [Release notes](https://github.com/actions/create-github-app-token/releases)
- [Commits](actions/create-github-app-token@v2...v3)

---
updated-dependencies:
- dependency-name: actions/create-github-app-token
  dependency-version: '3'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dgw <dgw@technobabbl.es>
* Introduce fetch* wrapper
* Filter query statements
* More generic test
* Improve debug message: get real function calling the query (ie "fetchPair", not just "perform")
* Prevent notice when no URL
Text & tags left as comment to be used next time
* Fix debug log messages with correct function
* debug mode and log improvements

- yourls_get_debug_mode() gets actual debug mode, not just the CONST value
- yourls_debug_log() only logs if debug mode is true

Fixes #4041

* Don't enforce twice the error reporting
it's already taken care of in yourls_db_connect()
Also : code style

* Don't force debug after install
As a result unit tests were always running with debug mode on

* Update tests
Everything must run the same no matter the value of YOURLS_DEBUG
Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.37.0 to 2.37.1.
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@2.37.0...2.37.1)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-version: 2.37.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
* Make tests debugging easier

* Remove displayDetailsOnPhpunitNotices because PHPUnit 10 & 11 trip up
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Projects

None yet

Development

Successfully merging this pull request may close these issues.