Skip to content

Commit 37e942e

Browse files
committed
Merge branch 'release/4.0.0'
2 parents f54ff64 + e39dd79 commit 37e942e

32 files changed

+536
-2430
lines changed

.github/CONTRIBUTING.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Contribute to the Retour plugin
2+
3+
First of all: 🙏 thank you that you want to help! 👏
4+
5+
## Bug reports, feature requests
6+
Please direct all bug reports and requests via [GitHub issues](https://github.com/distantnative/retour-for-kirby/issues).
7+
8+
## Translations
9+
Retour could feature translations for all languages that Kirby supports as UI languages in the Panel. A list can be found [here](https://github.com/getkirby/kirby/tree/master/i18n/translations) (still a few to go for Retour).
10+
11+
So how can you help? Take a look at the English translation file for reference what language strings are needed:
12+
https://github.com/distantnative/retour-for-kirby/blob/master/src/i18n/en.json
13+
14+
You can either head over to [Transifex](https://www.transifex.com/distantnative/retour-for-kirby) and start translating or fork this repo (develop branch), create a new i18n file for your translation and open a PR. Or you simply post the strings in a new issue here in the repo.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@ about: "If something isn't working as expected 🤬"
55

66
## Describe the bug
77

8-
98
## Steps to reproduce
109

11-
1.
12-
1.
13-
1.
10+
1.
11+
1.
12+
1.
1413

1514
## Expected behavior
1615

17-
1816
## Additional context
17+
1918
E.g. screenshots
2019

21-
## Specifications
20+
## Context
2221

23-
- Retour version:
24-
- Retour config options:
25-
- Kirby version:
26-
- Browser:
22+
- Browser:
23+
- Kirby version:
24+
- Retour version:
25+
- Retour config:

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
contact_links:
2-
- name: Feature request
3-
url: https://github.com/distantnative/retour-for-kirby/discussions
4-
about: Ask for a new feature or enhancement. Share an idea.
5-
- name: Question
6-
url: https://github.com/distantnative/retour-for-kirby/discussions
7-
about: For support matters, head over to the discussions.
82
- name: Translation
93
url: http://transifex.com/distantnative/retour-for-kirby/
104
about: Contribute to language translations for Retour

.github/README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
> **✋ Pre-release**
2-
> Retour 4.0 is currently in pre-release and the only supported version in active development.
3-
> It would be great if you could help testing (please report [issues](https://github.com/distantnative/retour-for-kirby/issues)) but please test with care.
4-
> Retour 4.0 is a breaking change - start with the [release notes](https://github.com/distantnative/retour-for-kirby/releases/tag/4.0.0-beta.1).
5-
<br>
6-
7-
81
# Retour for Kirby
92

10-
[![Version](https://img.shields.io/badge/release-4.0.0_beta.1-4271ae.svg?style=for-the-badge)](https://github.com/distantnative/retour-for-kirby/releases)
11-
[![Dependency](https://img.shields.io/badge/kirby-3.6.1-cca000.svg?style=for-the-badge)](https://getkirby.com/)
3+
[![Version](https://img.shields.io/badge/release-4.0.0-4271ae.svg?style=for-the-badge)](https://github.com/distantnative/retour-for-kirby/releases)
4+
[![Dependency](https://img.shields.io/badge/kirby-3.6.1_--_3.6.x-cca000.svg?style=for-the-badge)](https://getkirby.com/)
125
[![Coverage](https://img.shields.io/codecov/c/gh/distantnative/retour-for-kirby?style=for-the-badge)](https://codecov.io/gh/distantnative/retour-for-kirby)
136
[![Donate](https://img.shields.io/badge/support-donate-c82829.svg?style=for-the-badge)](https://paypal.me/distantnative)
147

@@ -51,7 +44,7 @@ Retour lets you manage redirect routes right from the Panel – all through a fa
5144
#### Path
5245
is the path after your site's URL that you would like to catch and redirect.
5346
It can be a static path, e.g. team, or you can use placeholders to define dynamic redirects, e.g. `blog/(:all)`.
54-
Dynamic redirects use Kirby's route patterns as placholder.
47+
Dynamic redirects use [Kirby's route patterns](https://getkirby.com/docs/guide/routing#patterns) as placholder.
5548

5649
Only paths without existing pages or custom routes can be redirected.
5750

@@ -123,6 +116,10 @@ The following config options are available:
123116
// Absolut path for location of database
124117
// Default: $kirby->root('logs) + /retour/log.sqlite
125118
'database' => ...,
119+
120+
// set your own string as prefix in the Panel dialog
121+
// (disable completely by setting to `false`)
122+
'site' => 'my.short.domain'
126123
]
127124
```
128125

.github/SECURITY.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
## Reporting a vulnerability
1212

13-
If you have spotted a vulnerability in Retour, please make sure to let us know immediately. We take any report very seriously and we will react as soon as possible.
13+
If you have spotted a vulnerability in Retour, please make sure to let me know immediately. I take any report very seriously and will react as soon as possible.
1414

15-
You can always write us directly at [email protected].
15+
You can always write me directly at [email protected].
1616

17-
Please do not write to us publicly, e.g. in an issue, as making security vulnerabilities public before they are fixed can give attackers valuable time to exploit the issue. By letting us know directly, you can protect other users from such attacks.
17+
Please do not write to me publicly, e.g. in an issue, as making security vulnerabilities public before they are fixed can give attackers valuable time to exploit the issue. By letting me know directly, you can protect other users from such attacks.

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Redirects and 404 tracking for Kirby",
44
"license": "MIT",
55
"type": "kirby-plugin",
6-
"version": "4.0.0-beta.1",
6+
"version": "4.0.0",
77
"authors": [
88
{
99
"name": "Nico Hoffmann",

index.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)