Merge branch 'developer' into stable

Author: mariuszkrzaczkowski

.github/CODE_OF_CONDUCT.md

@@ -47,7 +47,7 @@ Steps to reproduce the behavior:
 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: github@yetiforce.com. 
+<!--  Please send a part of logs that describes the circumstances when the error occurred to the following email address: github@yetiforce.com. The subject of the email MUST include your issue number.
 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 
@@ -77,4 +77,4 @@ ex.
 ### ❓ 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. --->
+<!-- Please check on your issue from time to time, in case we have questions or need some extra information. Issues that don't have enough info and can't be reproduced will be closed.--->

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

@@ -0,0 +1,17 @@
+---
+name: "⚠ Security issues"
+about: Security issues
+title: '[Security] '
+assignees: ''
+
+---
+
+<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
+
+⚠If you find a security issue please report it directly to security@yetiforce.com.⚠
+
+Reporting this type of issues publicly on GitHub might expose other users to attacks. Please be considerate.
+
+Thank you!
+
+🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->

…_TEMPLATE/3-guestions-or-docs-request.md …_TEMPLATE/3-questions-or-docs-request.md.github/ISSUE_TEMPLATE/3-guestions-or-docs-request.md renamed to .github/ISSUE_TEMPLATE/3-questions-or-docs-request.md .github/ISSUE_TEMPLATE/3-guestions-or-docs-request.md renamed to .github/ISSUE_TEMPLATE/3-questions-or-docs-request.md

@@ -2,6 +2,7 @@
 /cache/*/*/*
 !/cache/*/index.html
 !/cache/*/*/index.html
+/cache/registration.php
 
 /config/config_override.php
 /config/csrf_secret.php
@@ -64,3 +65,4 @@ yarn-error.log
 .settings/
 *.sublime-workspace
 .babelrc
+.sonarlint/

.github/ISSUE_TEMPLATE/4-security.md

@@ -4,11 +4,18 @@ $config = PhpCsFixer\Config::create()
         ->setIndent("\t")
         ->setUsingCache(false)
         ->setRules([
+			'@PHP56Migration' => true,
+			'@PHPUnit60Migration:risky' => true,
+			'@PhpCsFixer' => true,
+			'@PhpCsFixer:risky' => true,
+			'list_syntax' => ['syntax' => 'short'],
             '@PSR2' => true,
             'align_multiline_comment' => true,
             'array_syntax' => ['syntax' => 'short'],
             'blank_line_after_namespace' => true,
             'blank_line_after_opening_tag' => true,
+            'blank_line_before_statement' => false,
+            'binary_operator_spaces' => true,
             'cast_spaces' => true,
             'class_keyword_remove' => false,
             'combine_consecutive_issets' => true,
@@ -17,6 +24,7 @@ $config = PhpCsFixer\Config::create()
             'concat_space' => [
                 'spacing' => 'one',
             ],
+            'explicit_string_variable' => false,
             'declare_equal_normalize' => true,
             'dir_constant' => false,
             'doctrine_annotation_braces' => true,

.gitignore

@@ -124,7 +124,7 @@ jobs:
         - ./tests/setup/selenium.sh
       script:
         - cd tests
-        - ../vendor/bin/phpunit --verbose --log-junit 'tests/execution.xml' --coverage-clover 'tests/coverage.xml' --debug
+        - ../vendor/bin/phpunit --verbose --log-junit 'tests/execution.xml' --coverage-clover 'tests/coverage.xml'
         - sudo ls -all
         - cd ..
         - if [ "$TRAVIS_SECURE_ENV_VARS" = true ]; then sonar-scanner; fi

.php_cs.dist

@@ -88,6 +88,9 @@ jstree-bootstrap-theme/dist/libs/
 jstree-bootstrap-theme/dist/.esformatter
 jstree-bootstrap-theme/dist/jstree.js
 jstree-bootstrap-theme/dist/jstree.min.js
+jstree-bootstrap-theme/libs/bootstrap/js/bootstrap.js
+jstree-bootstrap-theme/libs/jquery.js
+jstree-bootstrap-theme/libs/bootstrap/js/bootstrap.min.js
 leaflet.awesome-markers/screenshots
 leaflet.markercluster/spec
 mousetrap/plugins

.travis.yml

@@ -0,0 +1,24 @@
+# CODE OF CONDUCT
+We prepared a very short and easy to follow CODE OF CONDUCT. If you want to be a member of our community, please follow these simple guidelines.
+
+## ✔BE KIND, PATIENT, AND TOLERANT
+Remember that all of us had to start learning at some point.
+
+## ✔RESPECT OTHERS AND THEIR CONTRIBUTIONS
+the same way you want them to respect you and your contributions.
+
+## ✔REMEMBER THAT NOT EVERYBODY IS FLUENT IN ENGLISH
+Short answers do not necessarily mean that the person who answered is rude, they might mean that despite the language barrier they still want to help you.
+
+## ✔BE RESPONSIBLE AND CONSIDERATE
+Remember that your contribution will be used by people all around the world, who will depend on its reliability.
+
+## ✔CHOOSE YOUR WORDS CAREFULLY AND DON’T INSULT
+Insults and verbal abuse towards other community members will not be tolerated.
+
+## ✔REMEMBER THAT WE ALL HAVE DIFFERENT OPINIONS
+We do not all think alike, and everyone is entitled to their opinion. You cannot force people to agree with you, what you can do is convince them by presenting reasonable arguments that prove why your idea is great. Blaming others will not lead anywhere. Try to understand why that person has a different opinion.
+
+❗If you would like to report someone for violating our code of conduct, please send an email to help@yetiforce.com❗
+
+## THANK YOU!

.yarnclean

@@ -0,0 +1,25 @@
+# How to contibute to YetiForce?
+
+First of all - THANK YOU❤ for taking the time to contribute to our project. We appreciate your effort and willingness to help us make YetiForce even better.
+If you want to contribute to YetiForce even if  have no (or little) programming knowledge don’t worry, you can still help us out big time! Here’s how:
+
+## 👍TRANSLATE the system
+We are always looking for people who would like to help us translate YetiForce to different languages in order to be able to reach people all over the world. We as a company only take care of the English and Polish translations of the system, all the other languages are maintained by our wonderful community. 
+Adding and updating translations in YetiForce is very simple and doesn’t require any programming knowledge thanks to [Crowdin](https://crowdin.com/project/yetiforcecrm). This [guide](https://yetiforce.com/en/knowledge-base/documentation/implementer-documentation/item/adding-translations-via-crowdin) explains how to add new translations.
+
+## 👍TEST the system
+Help us find all the bugs in the developer version of our system - [gitdeveloper](https://gitdeveloper.yetiforce.com). We add changes to the this version several times per day and sometimes some bugs manage to sneak in as well, so testers are always most welcome and appreciated. Once you do find a bug you should definitely ↓
+
+## 👍REPORT issues
+We can only fix the issues that we know of, so whenever you spot a bug, please let us know. If you find a bug on your own instance, please test whether it also exists on our [testing version](https://gitdeveloper.yetiforce.com/).  We prepared several different issue templates for you to choose depending on what you want to report. The templates will guide you through the reporting process so please fill them in carefully and give us as much information as possible. Issues that don't provide enough information and can't be reproduced will be closed. Additionally, before you submit an issue, search the open and closed tickets at GitHub. Someone might have already reported this or a similar problem, so you will have a ready solution.
+
+IMPORTANT: Please report only one problem in one issue, it makes it easier for us to keep track of all the issues we still need to fix. Thank you!
+
+# 
+If you are a developer or programming is your hobby and you’d like to send us your code, this is how you can do it:
+## 👍PULL REQUESTS
+If you want to send us a fix, patch, functionality or any other code you wrote you can send us a pull request. We will review it and either merge it or let you know what to fix. There is a template for pull requests so please read it and fill it before submitting it to us. In our company, we follow certain coding rules and make sure our code complies with the current standards. We have a special folder where you can find the most important [coding guides](https://github.com/YetiForceCompany/guides) in Polish and English. Please get familiar with the rules before you send a pull request. 
+#
+If you are an advanced user of our system and would like to write and send us an article to add to our documentation, that’s the way to go:
+## 👍DOCUMENTATION articles
+If you wrote an article or a guide that explains the system’s functionalities that you would like to share with the community, you can send your article to us (info@yetiforce.com). We will review it and add it to the proper section in our documentation. We will of course give you credit for your work.