diff --git a/.wordpress-org/acknowledgement-NGI0Entrust.png b/.wordpress-org/acknowledgement-NGI0Entrust.png deleted file mode 100644 index e5e722a..0000000 Binary files a/.wordpress-org/acknowledgement-NGI0Entrust.png and /dev/null differ diff --git a/.wordpress-org/acknowledgement-NLnet.png b/.wordpress-org/acknowledgement-NLnet.png deleted file mode 100644 index 983998b..0000000 Binary files a/.wordpress-org/acknowledgement-NLnet.png and /dev/null differ diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bf47e3..f1da3fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.3.5] - 2025-01-03 + +### Fixed + +* Images of Acknowledgements in Admin UI + ## [0.3.4] - 2024-12-21 * Initial release on WordPress.org diff --git a/README.md b/README.md index 80aa096..be0e565 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,11 @@ **Tags:** events, fediverse, activitypub, calendar **Requires at least:** 6.5 **Tested up to:** 6.7 +<<<<<<< HEAD **Stable tag:** 0.3.4 +======= +**Stable tag:** 0.3.5 +>>>>>>> 4dd1d56daa487caa56755e874dd7e74995f0340a **Requires PHP:** 7.4 **License:** AGPL-3.0-or-later **License URI:** https://www.gnu.org/licenses/agpl-3.0.html @@ -101,13 +105,13 @@ We're always interested in your feedback. Feel free to reach out to us via [E-Ma ## Acknowledgement -[NLnet foundation logo](https://nlnet.nl) -[NGI Zero Logo](https://nlnet.nl/entrust) - -The development of this WordPress plugin was funded through the [NGI0 Entrust](https://NLnet.nl/entrust) Fund, a fund established by [NLnet](https://nlnet.nl) with financial support from the European Commission's [Next Generation Internet](https://ngi.eu) programme, under the aegis of [Communications Networks, Content and Technology](https://commission.europa.eu/about-european-commission/departments-and-executive-agencies/communications-networks-content-and-technology_en) under grant agreement number 101069594. - -## Changelog ## - +<<<<<<< HEAD ### [0.3.4] 2024-12-21 ### * Initial release on https://wordpress.org/ +======= +[NLnet foundation logo](https://nlnet.nl) +[NGI Zero Logo](https://nlnet.nl/entrust) + +The development of this WordPress plugin was funded through the [NGI0 Entrust](https://NLnet.nl/entrust) Fund, a fund established by [NLnet](https://nlnet.nl) with financial support from the European Commission's [Next Generation Internet](https://ngi.eu) programme, under the aegis of [Communications Networks, Content and Technology](https://commission.europa.eu/about-european-commission/departments-and-executive-agencies/communications-networks-content-and-technology_en) under grant agreement number 101069594. +>>>>>>> 4dd1d56daa487caa56755e874dd7e74995f0340a diff --git a/.wordpress-org/acknowledgement-NGI0Entrust.svg b/assets/img/acknowledgement-NGI0Entrust.svg similarity index 100% rename from .wordpress-org/acknowledgement-NGI0Entrust.svg rename to assets/img/acknowledgement-NGI0Entrust.svg diff --git a/.wordpress-org/acknowledgement-NLnet.svg b/assets/img/acknowledgement-NLnet.svg similarity index 100% rename from .wordpress-org/acknowledgement-NLnet.svg rename to assets/img/acknowledgement-NLnet.svg diff --git a/event-bridge-for-activitypub.php b/event-bridge-for-activitypub.php index 72a0a89..f4cab13 100644 --- a/event-bridge-for-activitypub.php +++ b/event-bridge-for-activitypub.php @@ -3,7 +3,7 @@ * Plugin Name: Event Bridge for ActivityPub * Description: Integrating popular event plugins with the ActivityPub plugin. * Plugin URI: https://event-federation.eu/ - * Version: 0.3.4 + * Version: 0.3.5 * Author: André Menrath * Author URI: https://graz.social/@linos * Text Domain: event-bridge-for-activitypub diff --git a/readme.txt b/readme.txt index fb2603c..3a3882a 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,11 @@ Contributors: andremenrath Tags: events, fediverse, activitypub, calendar Requires at least: 6.5 Tested up to: 6.7 +<<<<<<< HEAD Stable tag: 0.3.4 +======= +Stable tag: 0.3.5 +>>>>>>> 4dd1d56daa487caa56755e874dd7e74995f0340a Requires PHP: 7.4 License: AGPL-3.0-or-later License URI: https://www.gnu.org/licenses/agpl-3.0.html @@ -65,7 +69,7 @@ This plugin depends on the [ActivityPub plugin](https://wordpress.org/plugins/ac = Configuration = -If you're new to the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/), it’s recommended to spend a few minutes reading through its documentation to familiarize yourself with its setup and functionality. +If you're new to the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/), it's recommended to spend a few minutes reading through its documentation to familiarize yourself with its setup and functionality. == Frequently Asked Questions == @@ -103,6 +107,10 @@ The development of this WordPress plugin was funded through the [NGI0 Entrust](h == Changelog == += [0.3.5] - 2025-01-03 = + +* Fixed: Images of Acknowledgements in Admin UI + = [0.3.4] 2024-12-21 = * Initial release on https://wordpress.org/ diff --git a/templates/welcome.php b/templates/welcome.php index 7134c7e..d5e8c3b 100644 --- a/templates/welcome.php +++ b/templates/welcome.php @@ -231,7 +231,7 @@ WP_Filesystem();

-

Logo NLnet: abstract logo of four people seen from above Logo NGI Zero: letterlogo shaped like a tag

+

Logo NLnet: abstract logo of four people seen from above Logo NGI Zero: letterlogo shaped like a tag

The development of this plugin was funded through the NGI0 Entrust Fund, a fund established by NLnet with financial support from the European Commission's Next Generation Internet programme, under the aegis of DG Communications Networks, Content and Technology under grant agreement No 101069594.