From f4f8b8eeb0fc56b5ec7eab75e34f5f0473169b50 Mon Sep 17 00:00:00 2001 From: Philip Guyton Date: Tue, 9 Aug 2016 13:21:34 +0100 Subject: simple spelling typo #297 Former-commit-id: 244bced377f907ade84b77bf36cd9f799ab47ab3 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index df627096..9c2fa384 100644 --- a/LICENSE +++ b/LICENSE @@ -19,7 +19,7 @@ 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 -- cgit v1.2.3 From 21dc32df3741a911e9e158f608310ad97337c4e9 Mon Sep 17 00:00:00 2001 From: Philip Guyton Date: Tue, 9 Aug 2016 13:25:09 +0100 Subject: make CC references consistent #297 Former-commit-id: 659947fa561fba9a9c9f599cad04dd673e10cba9 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 9c2fa384..b8d7a80f 100644 --- a/LICENSE +++ b/LICENSE @@ -44,7 +44,7 @@ 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) +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. -- cgit v1.2.3 From 1334b416a2a5999f43a0bc7d36cc29ffd103537b Mon Sep 17 00:00:00 2001 From: Philip Guyton Date: Tue, 9 Aug 2016 13:27:33 +0100 Subject: consistently capitalize 'Packery' #297 Former-commit-id: 800836f274157cb1365ea8493271d66de2393743 --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index b8d7a80f..bdb4fbe0 100644 --- a/LICENSE +++ b/LICENSE @@ -45,11 +45,11 @@ 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 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 +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). -- cgit v1.2.3 From db92ad4ba706b875a2e98c2912ce0c8ca3c40d2d Mon Sep 17 00:00:00 2001 From: Philip Guyton Date: Tue, 9 Aug 2016 13:30:56 +0100 Subject: consistently capitalize 'ZoneMinder' #297 As per their web page and the first instance in this doc. Former-commit-id: ce175b55e1635b8100d53d2fb9b42d13c48618ec --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index bdb4fbe0..b8f26b4e 100644 --- a/LICENSE +++ b/LICENSE @@ -7,7 +7,7 @@ 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 -- cgit v1.2.3 From bf0d624544358ca70dd1959dfba92cf66f709fb6 Mon Sep 17 00:00:00 2001 From: Philip Guyton Date: Tue, 9 Aug 2016 13:42:35 +0100 Subject: removal redundant formatting characters #297 Former-commit-id: 22d087acb1290dde755dd4dc5cc6650d310f372e --- LICENSE | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index b8f26b4e..70fda3a2 100644 --- a/LICENSE +++ b/LICENSE @@ -4,15 +4,14 @@ 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. Source Code License -~~~~~~~~~~~~~~~~~~~~~~ - +~~~~~~~~~~~~~~~~~~~ The source code of zmNinja is dual licensed. a) The code is free for personal, non commercial use @@ -24,9 +23,8 @@ Please contact pliablepixels@gmail.com - Third Party credits -======================= +=================== Ninja icon; https://openclipart.org/detail/172393/ninja-logo License: https://openclipart.org/share -- cgit v1.2.3 From 06617d1a7dc7db5b4bda63e451b2ebb09762e201 Mon Sep 17 00:00:00 2001 From: Philip Guyton Date: Tue, 9 Aug 2016 13:51:19 +0100 Subject: make contributing.md consistent with license file #297 Former-commit-id: bbc89ef44069b19838f82a8c67dcc95b2d588c62 --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. -- cgit v1.2.3 From 59dc6611a79ae8870e7434df99c98f15869b518e Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 10 Aug 2016 10:34:44 -0400 Subject: Update ISSUE_TEMPLATE.md Former-commit-id: 0068807da098c16403c524cf0a52a63ca861593d --- ISSUE_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3