10000 Bump Faircode to v0.2.1: Fix typo · Claercio/ungit@429dd66 · GitHub
[go: up one dir, main page]

Skip to content

Commit

Permalink
Bump Faircode to v0.2.1: Fix typo
Browse files Browse the repository at this point in the history
  • Loading branch information
FredrikNoren committed Nov 11, 2017
1 parent 126b1ed commit 429dd66
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
Use the following format for additions: ` - VERSION: [feature/patch (if applicable)] Short description of change. Links to relevant issues/PRs.`

- 1.2.3: Bump license text to v0.2.1 (fixes typo). [Faircode License changelog](https://github.com/faircodeio/faircode-license/blob/master/CHANGELOG.md)
- 1.2.2: Bump license text to v0.2 to fix two small inconsistencies: Clarify currency (USD) and remove "no additional rights" clause as it's problematic and superfluous. License changelog at https://github.com/faircodeio/faircode-license/blob/master/CHANGELOG.md [#947](https://github.com/FredrikNoren/ungit/issues/974)
- 1.2.1: fix for not launching browser when executed at the git repo [#986](https://github.com/FredrikNoren/ungit/issues/986)
- 1.2.0:
Expand Down
26 changes: 21 additions & 5 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
## Ungit license (Faircode v0.2)
## Ungit license (Faircode v0.2.1)

(Discussion about our license here: https://github.com/FredrikNoren/ungit/issues/974)

Copyright (C) 2013-2017 Fredrik Norén

Permission is hereby granted to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies ("Use") of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
Permission is hereby granted to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software
without restriction, including without limitation the rights to use, copy,
modify, merge, publish, distribute, sublicense, and/or sell copies ("Use") of
the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

If you are a commercial entity with a revenue in excess of $1,000,000 of the previous fiscal year, and/or organization with a budget in excess of 1,000,000 USD, you must acquire a commercial license grant from Fredrik Norén to Use this software. A commercial license grant can be acquired at [https://faircode.io/product/Ungit](https://faircode.io/product/Ungit).
If you are a commercial entity with a revenue in excess of 1,000,000 USD of
the previous fiscal year, and/or organization with a budget in excess of
1,000,000 USD, you must acquire a commercial license grant from
Fredrik Norén to Use this software. A commercial license grant can be
acquired at [https://faircode.io/product/Ungit](https://faircode.io/product/Ungit).

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
The above copyright noti A6E2 ce and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ungit",
"author": "Fredrik Norén <fredrik.jw.noren@gmail.com>",
"description": "Git made easy",
"version": "1.2.2",
"version": "1.2.3",
"ungitPluginApiVersion": "0.2.0",
"scripts": {
"start": "node ./bin/ungit",
Expand Down

0 comments on commit 429dd66

Please sign in to comment.
0