Skip to content
This repository has been archived by the owner on Sep 13, 2024. It is now read-only.

Commit

Permalink
Merge branch 'developer' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
mariuszkrzaczkowski committed Feb 12, 2019
2 parents 5c9030f + a4aea12 commit 7af8f18
Show file tree
Hide file tree
Showing 4,852 changed files with 109,893 additions and 174,035 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
9 changes: 5 additions & 4 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
coverage:
range: 15..25
range: 0..22
status:
project:
default: false
tests:
target: 100%
paths: "tests/"
app:
target: 16%
paths: "!tests/"
target: 39%
paths: "app/"
patch: off
ignore:
- tests/copy/.*
- tests/copy/.*
comment: off
76 changes: 76 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
26 changes: 0 additions & 26 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

80 changes: 80 additions & 0 deletions .github/ISSUE_TEMPLATE/1-bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
---
name: "\U0001F41EBug report"
about: Report a bug
title: '[bug] '
labels: ''
assignees: ''

---

<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
Oh hi there! 😄
To expedite issue processing please search open and closed issues before submitting a new one.
Existing issues often contain information about workarounds, resolution, or progress updates.
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)
🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->

# 🐞 bug report

### ⁉️ Describe the bug
<!-- Provide a more detailed introduction to the issue itself, and why you consider it to be a bug. -->

<!-- Descriptions can be provided in English or Polish (remember to add [PL] for Polish in the title). -->

<!-- ✍️-->

### 🔥 How to trigger the error
<!-- If possible, please make a video using [ScreenToGif] (https://screentogif.codeplex.com/) or any other program used for recording actions from your desktop. -->

Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

### 👎 Actual Behavior
<!-- Describe the result -->

### 👍 Expected Behavior
<!-- Describe what you would want the result to be -->

### 📷 Screenshot of configuration
<!-- Before reporting an issue, check if your server has been properly configured.
Please include a screenshot of your configuration. Here is an example: https://public.yetiforce.com/gallery/#15336225417147/15336225686795 -->

### 📝 PHP/Apache/Nginx/Browser/CRM Logs
<!-- Please send a part of logs that describes the circumstances when the error occurred to the following email address: [email protected].
DO NOT paste the logs in the issues, as they might contain sensitive info, such as credentials.
The more info you provide, the quicker we will be able to solve your problem.
Description how to enable logs can be found here: https://yetiforce.com/en/knowledge-base/documentation/developer-documentation/item/debugging
Additionally, include a screenshot of your browser’s console (e.g. press F12 in Google Chrome).
ex.
* cache/logs/phpError.log
* cache/logs/system.log
* cache/logs/errors.log
-->


### 🌍 Your Environment
<!--Describe the environment -->
<!-- ✍️-->

| Environment | Version / Name |
| ---------------- | -------------- |
| YetiForce |
| Web server (name and version)| |
| PHP | |
| Browser (name and version) | |
| Operating System (name and version) | |
| Database (name and version) | |

### ❓ Additional context
Add any other context about the problem here.

<!-- Please check on your issue from time to time, in case we have questions or need some extra information. --->
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/2-feature-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: "\U0001F680Feature request"
about: Suggest a feature
title: '[Feature] '
labels: 'enhancement'
assignees: ''

---

<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
Oh hi there! 😄
To expedite issue processing please search open and closed issues before submitting a new one.
Existing issues often contain information about workarounds, resolution, or progress updates.
🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->


## 🚀 feature request

### Describe the solution you'd like
<!-- ✍️ A clear and concise description of the problem or missing capability... -->

### Is your feature request related to a problem? Please describe.
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

### Describe alternatives you've considered
<!-- ✍️ A clear and concise description of any alternative solutions or features you've considered. -->

### Additional context
<!-- ✍️ Add any other context or screenshots about the feature request here. -->
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/3-guestions-or-docs-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: "\U0001F4DAQuestions or docs request"
about: Questions or docs request
title: '[Question] '
labels: 'question'
assignees: ''

---

<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
Oh hi there! 😄
To expedite issue processing please search open and closed issues before submitting a new one.
Existing issues often contain information about workarounds, resolution, or progress updates.
🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->

### Description
<!-- ✍️-->
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
### Final checklist
<!--- Go over all the following points and check all the boxes that apply. --->
<!--- 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 [email protected] and we will send you the form. --->
- [ ] 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).
- [ ] My code is written according to the guidelines found [here] (https://github.com/php-fig/fig-standards).
- [ ] I have signed the Contributor Licence Agreement between me and YetiForce.

<!--- Your pull request will be tested via Travis CI to automatically indicate that your changes do not prevent compilation. --->
Expand Down
20 changes: 18 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,23 @@

# dependencies YETIFORCE
/public_html/modules/OSSMail/roundcube/

/dev_tools/
/_private
/public_html/_private
/public_html/layouts/basic/styles/.sass-cache
/public_html/logo.jpg
/public_html/layouts/resources/fonts/*.txt
/public_html/layouts/resources/fonts/*.ttf

/layouts/basic/modules/Settings/TestData

/languages/*
!/languages/en-US
/modules/TestData
/modules/Settings/TestData

/user_privileges/cron.php
/user_privileges/owners_colors.php
/user_privileges/registration.php

/cache/addressBook/mails_1.php
/cache/addressBook/mails_5.php
Expand All @@ -30,6 +35,17 @@
/user_privileges/user_privileges_6.php
/user_privileges/user_privileges_7.php

/config/*
!/config/username_blacklist.php
!/config/csrf_config.php
!/config/mimetypes.php
!/config/ConfigTemplates.php
!/config/version.php
!/config/Security.php
!/config/Performance.php
!/config/Debug.php
!/config/Components/ConfigTemplates.php

# dependencies COMPOSER
/vendor
/public_html/vendor/*
Expand Down
4 changes: 2 additions & 2 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RedirectMatch 403 (?i).*\.log$
</IfModule>
<IfModule mod_autoindex.c>
Options -Indexes -MultiViews
</ifModule>
</IfModule>
<IfModule mod_rewrite.c>
Options +FollowSymLinks
RewriteEngine On
Expand All @@ -19,7 +19,7 @@ RedirectMatch 403 (?i).*\.log$
RewriteRule /.well-known/caldav dav.php/calendars/ [R,L]
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
RewriteRule .* - [E=HTTP_CONTENT_TYPE:%{HTTP:Content-Type},L]
</ifModule>
</IfModule>
<IfModule mod_headers.c>
Header unset Server
Header unset X-Powered-By
Expand Down
4 changes: 2 additions & 2 deletions .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ $config = PhpCsFixer\Config::create()
'phpdoc_indent' => true,
'phpdoc_inline_tag' => true,
'phpdoc_no_access' => true,
'phpdoc_no_empty_return' => true,
'phpdoc_no_package' => true,
'phpdoc_no_empty_return' => false,
'phpdoc_no_package' => false,
'phpdoc_no_useless_inheritdoc' => true,
'phpdoc_order' => true,
'phpdoc_return_self_reference' => true,
Expand Down
Loading

0 comments on commit 7af8f18

Please sign in to comment.