diff options
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | ISSUE_TEMPLATE.md | 4 | ||||
| -rw-r--r-- | LICENSE | 18 |
3 files changed, 11 insertions, 13 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1e5461ff..aff47918 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ ####Contributing to zmNinja -The source code will always be available under CCSA-NC. If you'd like to contribute please know that if your changes are accepted and merged they will make it to the App/Play Store when I publish the app. This does not entitle you to any renumeration - If you still would like to contribute and make this solution better, please go right ahead. If you feel this prohibits you from contributing, please create a bug report or enhancement request via the github issue tracker and I'll incorporate it when I have time/agree its a good idea. +The source code will always be available under CC BY-NC-SA 4.0. If you'd like to contribute please know that if your changes are accepted and merged they will make it to the App/Play Store when I publish the app. This does not entitle you to any renumeration - If you still would like to contribute and make this solution better, please go right ahead. If you feel this prohibits you from contributing, please create a bug report or enhancement request via the github issue tracker and I'll incorporate it when I have time/agree its a good idea. Thanks. diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 064eb47e..2ceb8329 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -1,6 +1,6 @@ -Tip: switch to preview mode to see how the issue will look like after you hit submit. +Before you create an issue, please make sure you have read the FAQ at https://github.com/pliablepixels/zmNinja/wiki/FAQ. Common questions on API, no image etc are covered there. + -Before you submit an issue, please make sure you fill up the template. **Platform & OS Version** (example only, please edit this line) Android 6.0 Marshmallow @@ -4,29 +4,27 @@ The apps in Apple App store and Google Play store can be used for any purpose (p For Desktop Clients Binaries: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The Desktop clients binaries free to download and use ONLY for users who are using the desktop client with the free and open source ZoneMinder -software. If you are selling a service based on zoneminder and are either distributing the Desktop Client to your users or asking your users to use the desktop client by download it themselves, you are violating the non-commercial use. You will need to procure a license before you do so. +software. If you are selling a service based on ZoneMinder and are either distributing the Desktop Client to your users or asking your users to use the desktop client by download it themselves, you are violating the non-commercial use. You will need to procure a license before you do so. Source Code License -~~~~~~~~~~~~~~~~~~~~~~ - +~~~~~~~~~~~~~~~~~~~ The source code of zmNinja is dual licensed. a) The code is free for personal, non commercial use http://creativecommons.org/licenses/by-nc-sa/4.0/ In summary: Share Alike, Adapt,Attribute, NonCommercial -b) zmNinja source code is also open for commerical licensing and white-labeling. +b) zmNinja source code is also open for commercial licensing and white-labeling. Please contact pliablepixels@gmail.com - Third Party credits -======================= +=================== Ninja icon; https://openclipart.org/detail/172393/ninja-logo License: https://openclipart.org/share @@ -44,12 +42,12 @@ http://packery.metafizzy.co A commercial single developer license has been purchased for the same. Note that this license allows me (pliablepixels) to use Packery for commercial apps that I develop (such as zmNinja). Given that I publish my source under -CCSA-NC-SA, you can compile the code for your personal use (non commercial purposes) -and continue to use packery. This is compliant to Packery's license too, where they +CC BY-NC-SA 4.0, you can compile the code for your personal use (non commercial purposes) +and continue to use Packery. This is compliant to Packery's license too, where they prohibit other developers to build for profit using the license I purchased. If however you purchase the source code from me, you will -still have to purchase an additional license for packery from David via http://packery.metafizzy.co/#commercial-license +still have to purchase an additional license for Packery from David via http://packery.metafizzy.co/#commercial-license It's very cheap ($25 for unlimited products by one developer). |