Skip to content

Commit

Permalink
Applied CodePolicy.
Browse files Browse the repository at this point in the history
  • Loading branch information
dennykorsukewitz committed Mar 30, 2022
1 parent 81535e4 commit 12651f5
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 37 deletions.
56 changes: 28 additions & 28 deletions CONTRIBUTING.md
@@ -1,16 +1,16 @@
# Contributing / How to contribute

Thank you so much for your interest in contributing!
Thank you so much for your interest in contributing!
We welcome all types of participation. Whether it is programming, expanding documentation, updating translations or reporting bugs.
If you want to participate, we prepared a list for you how we handle things.
If you want to participate, we prepared a list for you how we handle things.
If there are any open questions, you can reach out via:
- Forum
- Discord
- Issues here in this repo


Before you start with your contribution, please have a look at the sections below.
We tried to cover all relevant parts and it should help to make your contribution as smooth
Before you start with your contribution, please have a look at the sections below.
We tried to cover all relevant parts and it should help to make your contribution as smooth
as possible. For you and for us as maintainers.

Have fun!
Expand All @@ -29,18 +29,18 @@ Have fun!
* [Clean Up Issues and PRs](#Clean-Up-Issues-and-PRs)


## Where do I find:
## Where do I find:
* The developer documentation https://doc.znuny.org/manual/developer/
* The documentation in general https://doc.znuny.org/manual/



## Report an Error or Bug

If you find an error or a bug, please follow this steps

* Open an Issue at https://github.com/znuny/znuny/issues
* Use the template we provide. Please dont delete it.
* Use the template we provide. Please dont delete it.
* Include everything we need to know. Especially how to reproduce the problem

After you filed the issue:
Expand All @@ -52,7 +52,7 @@ After you filed the issue:
Special Case:
Security issues. If you want to report a security issue, please see the [Security.md] (https://github.com/znuny/Znuny/blob/dev/SECURITY.md#how-to-report-a-security-vulnerability)

Note: if you don't reply on questions, we will close the issue after 30 days. This is just a measure to keep our issue list clean.
Note: if you don't reply on questions, we will close the issue after 30 days. This is just a measure to keep our issue list clean.



Expand All @@ -64,11 +64,11 @@ If you need support / assisitence with your project or just need a helping hand,
- [Discord server](https://discord.gg/XTud3WWZTs)
- [Commercial services](https://www.znuny.com)

The community is here to help and you can rely on them. If you need immediate help for an incident,
you can also request commercial support.
The community is here to help and you can rely on them. If you need immediate help for an incident,
you can also request commercial support.

In any case, please provide as much context as you can. Please keep in mind:
the community members and the team dont know what you want to achieve or what you already tried.
In any case, please provide as much context as you can. Please keep in mind:
the community members and the team dont know what you want to achieve or what you already tried.

## Request a Feature

Expand All @@ -88,45 +88,45 @@ After you filed the request:
* If a request is declined, we close the request


Please note:
We can't accept every feature request. Especially such requests that are limited to a very small fraction of the users. Our job is not only to build cool software, sometimes it requires us to say no.
Please note:
We can't accept every feature request. Especially such requests that are limited to a very small fraction of the users. Our job is not only to build cool software, sometimes it requires us to say no.
Please respect that. There is always the of way of using add-ons or customizing to achieve your goal.


## Contribute Code

Before you make a code/feature contribution on your own, please ask our team in advance if this customization is likely to find a place in the project. We may have suggestions to make upfront or give you some more insights.
There is no special "checklist", just post a question and explain what you would like
to contribute. We will get in touch ASAP.
We value your time and respect your work. Thats why we dont want you to waste it on features
Before you make a code/feature contribution on your own, please ask our team in advance if this customization is likely to find a place in the project. We may have suggestions to make upfront or give you some more insights.
There is no special "checklist", just post a question and explain what you would like
to contribute. We will get in touch ASAP.
We value your time and respect your work. Thats why we dont want you to waste it on features
we might be working on in the background.


## Provide Support on Issues

We try provide support for free, as good as we can. Thats why we offer so many channels to get help, directly from
the community. We dont have a special team for Open Source support, but we do our best to support you.
We try provide support for free, as good as we can. Thats why we offer so many channels to get help, directly from
the community. We dont have a special team for Open Source support, but we do our best to support you.

The amount of free-support we can deliver is limited.
The amount of free-support we can deliver is limited.

If you have a general question, the documentation, the forum and the Discord chat should be a good start.
If you have a general question, the documentation, the forum and the Discord chat should be a good start.
The forum has well build search, which can help in a lot of cases. Before you open a new post, use the search.
There is a good chance that your issue was already discussed before.
There is a good chance that your issue was already discussed before.



## Clean Up Issues and PRs

We will close issues, which are not labeled as bug/verified/critical and haven't been updated in 30 days.
Accepted feature requests will remain open until they are implemented.
Feature requests that we won't implement, will be closed with an explanation.
We will close issues, which are not labeled as bug/verified/critical and haven't been updated in 30 days.
Accepted feature requests will remain open until they are implemented.
Feature requests that we won't implement, will be closed with an explanation.


## Join the Project Team

If you want to join the project, you are welcome!
If you want to join the project, you are welcome!
Just let us know and we can discuss details via Discord.

We need help for:
We need help for:
- Issue tracking and handling / labeling issues
- Code reviews
2 changes: 1 addition & 1 deletion Kernel/Language/es_MX.pm
Expand Up @@ -6088,7 +6088,7 @@ Thanks for your help!
' => '
Estimado Cliente,

Desafortunadamente no hemos podido detectar un número de ticket válido en su consulta,
Desafortunadamente no hemos podido detectar un número de ticket válido en su consulta,
por lo que este email no puede ser procesado.

Por favor creé un nuevo ticket a través del panel de cliente.
Expand Down
6 changes: 3 additions & 3 deletions Kernel/System/DynamicField.pm
Expand Up @@ -1767,10 +1767,10 @@ sub _SanitizeConfig {
}

my @ReservedKeywords = (qw(Link LinkPreview Title Value));
if ($Param{Config}->{Link}){
for my $Keyword (@ReservedKeywords){
if ( $Param{Config}->{Link} ) {
for my $Keyword (@ReservedKeywords) {
$Param{Config}->{Link} =~ s{\[\% Data\.$Keyword \%\]}{}g;
};
}
}

return 1;
Expand Down
5 changes: 3 additions & 2 deletions scripts/test/DynamicField.t
Expand Up @@ -284,7 +284,8 @@ my @Tests = (
Config => {
Name => 'Test13',
Description => 'Description for Dynamic Field.',
Link => 'https://www.znuny.org/[% Data.Link %]/[% Data.LinkPreview %]/[% Data.Title %]/[% Data.Value %]',
Link =>
'https://www.znuny.org/[% Data.Link %]/[% Data.LinkPreview %]/[% Data.Title %]/[% Data.Value %]',
},
Label => 'something for label',
FieldOrder => 10000,
Expand Down Expand Up @@ -318,7 +319,7 @@ TEST:
for my $Test (@Tests) {

my $FieldName = $Test->{Name} . $RandomID;
$Test->{Expected} //= $Test->{Data};
$Test->{Expected} //= $Test->{Data};

# get nonexisting field first
my $GetResult = $DynamicFieldObject->DynamicFieldGet(
Expand Down
4 changes: 2 additions & 2 deletions var/httpd/htdocs/js/Core.Agent.Admin.DynamicField.js
Expand Up @@ -99,8 +99,8 @@ Core.Agent.Admin.DynamicField = (function (TargetNS) {
/*eslint-enable camelcase */
});
Core.Form.Validate.AddMethod("Validate_LinkReservedKeywordsInData", function (Value) {
// \[\%\s+Data\.(Link|LinkPreview|Title|Value)\s+\%\]
if (/\[\%\s+Data\.(Link|LinkPreview|Title|Value)\s+\%\]/.test(Value) === true) {
// \[%\s+Data\.(Link|LinkPreview|Title|Value)\s+%\]
if (/\[%\s+Data\.(Link|LinkPreview|Title|Value)\s+%\]/.test(Value) === true) {
return false;
}
return true;
Expand Down
1 change: 0 additions & 1 deletion var/httpd/htdocs/skins/Agent/default/css/Core.Color.css
Expand Up @@ -78,4 +78,3 @@ did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt.
--color-grey13: #DDD;
--color-grey14: #EEE;
}

0 comments on commit 12651f5

Please sign in to comment.