Skip to content
This repository was archived by the owner on Aug 26, 2025. It is now read-only.

Commit 7af8f18

Browse files
mariuszkrzaczkowskimariuszkrzaczkowski
committed
Merge branch 'developer' into stable
2 parents 5c9030f + a4aea12 commit 7af8f18

File tree

4,852 files changed

+109893
-174035
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,852 files changed

+109893
-174035
lines changed

‎.codecov.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
coverage:
2-
range: 15..25
2+
range: 0..22
33
status:
44
project:
55
default: false
66
tests:
77
target: 100%
88
paths: "tests/"
99
app:
10-
target: 16%
11-
paths: "!tests/"
10+
target: 39%
11+
paths: "app/"
1212
patch: off
1313
ignore:
14-
- tests/copy/.*
14+
- tests/copy/.*
15+
comment: off

‎.github/CODE_OF_CONDUCT.md‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at github@yetiforce.com. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/1-bug-report.md‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
---
2+
name: "\U0001F41EBug report"
3+
about: Report a bug
4+
title: '[bug] '
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
11+
12+
Oh hi there! 😄
13+
14+
To expedite issue processing please search open and closed issues before submitting a new one.
15+
Existing issues often contain information about workarounds, resolution, or progress updates.
16+
17+
Before you create a new issue, please check out our [manual] (https://yetiforce.com/en/knowledge-base/documentation/implementer-documentation/item/how-to-report-bugs)
18+
19+
🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->
20+
21+
# 🐞 bug report
22+
23+
### ⁉️ Describe the bug
24+
<!-- Provide a more detailed introduction to the issue itself, and why you consider it to be a bug. -->
25+
26+
<!-- Descriptions can be provided in English or Polish (remember to add [PL] for Polish in the title). -->
27+
28+
<!-- ✍️-->
29+
30+
### 🔥 How to trigger the error
31+
<!-- If possible, please make a video using [ScreenToGif] (https://screentogif.codeplex.com/) or any other program used for recording actions from your desktop. -->
32+
33+
Steps to reproduce the behavior:
34+
1. Go to '...'
35+
2. Click on '....'
36+
3. Scroll down to '....'
37+
4. See error
38+
39+
### 👎 Actual Behavior
40+
<!-- Describe the result -->
41+
42+
### 👍 Expected Behavior
43+
<!-- Describe what you would want the result to be -->
44+
45+
### 📷 Screenshot of configuration
46+
<!-- Before reporting an issue, check if your server has been properly configured.
47+
Please include a screenshot of your configuration. Here is an example: https://public.yetiforce.com/gallery/#15336225417147/15336225686795 -->
48+
49+
### 📝 PHP/Apache/Nginx/Browser/CRM Logs
50+
<!-- Please send a part of logs that describes the circumstances when the error occurred to the following email address: github@yetiforce.com.
51+
DO NOT paste the logs in the issues, as they might contain sensitive info, such as credentials.
52+
The more info you provide, the quicker we will be able to solve your problem.
53+
Description how to enable logs can be found here: https://yetiforce.com/en/knowledge-base/documentation/developer-documentation/item/debugging
54+
Additionally, include a screenshot of your browser’s console (e.g. press F12 in Google Chrome).
55+
ex.
56+
57+
* cache/logs/phpError.log
58+
* cache/logs/system.log
59+
* cache/logs/errors.log
60+
61+
-->
62+
63+
64+
### 🌍 Your Environment
65+
<!--Describe the environment -->
66+
<!-- ✍️-->
67+
68+
| Environment | Version / Name |
69+
| ---------------- | -------------- |
70+
| YetiForce |
71+
| Web server (name and version)| |
72+
| PHP | |
73+
| Browser (name and version) | |
74+
| Operating System (name and version) | |
75+
| Database (name and version) | |
76+
77+
### ❓ Additional context
78+
Add any other context about the problem here.
79+
80+
<!-- Please check on your issue from time to time, in case we have questions or need some extra information. --->

‎.github/ISSUE_TEMPLATE/2-feature-request.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: "\U0001F680Feature request"
3+
about: Suggest a feature
4+
title: '[Feature] '
5+
labels: 'enhancement'
6+
assignees: ''
7+
8+
---
9+
10+
<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
11+
12+
Oh hi there! 😄
13+
14+
To expedite issue processing please search open and closed issues before submitting a new one.
15+
Existing issues often contain information about workarounds, resolution, or progress updates.
16+
17+
🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->
18+
19+
20+
## 🚀 feature request
21+
22+
### Describe the solution you'd like
23+
<!-- ✍️ A clear and concise description of the problem or missing capability... -->
24+
25+
### Is your feature request related to a problem? Please describe.
26+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
27+
28+
### Describe alternatives you've considered
29+
<!-- ✍️ A clear and concise description of any alternative solutions or features you've considered. -->
30+
31+
### Additional context
32+
<!-- ✍️ Add any other context or screenshots about the feature request here. -->

‎.github/ISSUE_TEMPLATE/3-guestions-or-docs-request.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: "\U0001F4DAQuestions or docs request"
3+
about: Questions or docs request
4+
title: '[Question] '
5+
labels: 'question'
6+
assignees: ''
7+
8+
---
9+
10+
<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
11+
12+
Oh hi there! 😄
13+
14+
To expedite issue processing please search open and closed issues before submitting a new one.
15+
Existing issues often contain information about workarounds, resolution, or progress updates.
16+
17+
🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->
18+
19+
### Description
20+
<!-- ✍️-->

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
### Final checklist
1616
<!--- Go over all the following points and check all the boxes that apply. --->
1717
<!--- We require everyone who wants to contribute to our project to sign the Contributor License Agreement. If you haven’t, please send us an email to cla@yetiforce.com and we will send you the form. --->
18-
- [ ] My code is written according to the guidelines found [here] (https://yetiforce.com/en/knowledge-base/documentation/developer-documentation/item/how-to-create-php-files).
18+
- [ ] My code is written according to the guidelines found [here] (https://github.com/php-fig/fig-standards).
1919
- [ ] I have signed the Contributor Licence Agreement between me and YetiForce.
2020

2121
<!--- Your pull request will be tested via Travis CI to automatically indicate that your changes do not prevent compilation. --->

‎.gitignore‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,23 @@
88

99
# dependencies YETIFORCE
1010
/public_html/modules/OSSMail/roundcube/
11-
11+
/dev_tools/
1212
/_private
1313
/public_html/_private
1414
/public_html/layouts/basic/styles/.sass-cache
15+
/public_html/logo.jpg
16+
/public_html/layouts/resources/fonts/*.txt
17+
/public_html/layouts/resources/fonts/*.ttf
1518

1619
/layouts/basic/modules/Settings/TestData
17-
20+
/languages/*
21+
!/languages/en-US
1822
/modules/TestData
1923
/modules/Settings/TestData
2024

2125
/user_privileges/cron.php
2226
/user_privileges/owners_colors.php
27+
/user_privileges/registration.php
2328

2429
/cache/addressBook/mails_1.php
2530
/cache/addressBook/mails_5.php
@@ -30,6 +35,17 @@
3035
/user_privileges/user_privileges_6.php
3136
/user_privileges/user_privileges_7.php
3237

38+
/config/*
39+
!/config/username_blacklist.php
40+
!/config/csrf_config.php
41+
!/config/mimetypes.php
42+
!/config/ConfigTemplates.php
43+
!/config/version.php
44+
!/config/Security.php
45+
!/config/Performance.php
46+
!/config/Debug.php
47+
!/config/Components/ConfigTemplates.php
48+
3349
# dependencies COMPOSER
3450
/vendor
3551
/public_html/vendor/*

‎.htaccess‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ RedirectMatch 403 (?i).*\.log$
44
</IfModule>
55
<IfModule mod_autoindex.c>
66
Options -Indexes -MultiViews
7-
</ifModule>
7+
</IfModule>
88
<IfModule mod_rewrite.c>
99
Options +FollowSymLinks
1010
RewriteEngine On
@@ -19,7 +19,7 @@ RedirectMatch 403 (?i).*\.log$
1919
RewriteRule /.well-known/caldav dav.php/calendars/ [R,L]
2020
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
2121
RewriteRule .* - [E=HTTP_CONTENT_TYPE:%{HTTP:Content-Type},L]
22-
</ifModule>
22+
</IfModule>
2323
<IfModule mod_headers.c>
2424
Header unset Server
2525
Header unset X-Powered-By

‎.php_cs.dist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ $config = PhpCsFixer\Config::create()
9797
'phpdoc_indent' => true,
9898
'phpdoc_inline_tag' => true,
9999
'phpdoc_no_access' => true,
100-
'phpdoc_no_empty_return' => true,
101-
'phpdoc_no_package' => true,
100+
'phpdoc_no_empty_return' => false,
101+
'phpdoc_no_package' => false,
102102
'phpdoc_no_useless_inheritdoc' => true,
103103
'phpdoc_order' => true,
104104
'phpdoc_return_self_reference' => true,

0 commit comments

Comments
 (0)