Skip to content

Commit

Permalink
MIT License now.
Browse files Browse the repository at this point in the history
  • Loading branch information
toxuin committed Aug 11, 2016
1 parent 6b9dfb3 commit 7d15d76
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 11 deletions.
25 changes: 19 additions & 6 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
Copyright (c) 2013-2014, psychobunny <[email protected]>
All rights reserved.
MIT License

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Copyright (c) 2016 toxuin

Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Permission is hereby granted, free of charge, 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 of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice 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.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ Please fork and do stuff.
License
------

I'd love to switch to more liberal license, but since this thing is based off someone else's code, I have a file called LICENSE, go read.
MIT Licence allows you to do almost whatever you can imagine with this software. I have a file called LICENSE, go read.

Credits
------

- This is my first plugin for NodeBB and I started off [psychobunny's badges plugin](https://github.com/psychobunny/nodebb-plugin-badges). I'd say it is loosely based on it. Thanks, psychobunny!
- Thanks, psychobunny!

- Default badge art generously contributed by Pablo Macuso
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Trophies.awardTrophy = function(socket, data, callback) {
bodyShort: 'You just got a trophy!',
bodyLong: "Congratulations! You just got a new trophy!",
nid: 'trophy_' + uid + '_' + data.trophy,
from: 2,
from: 1,
path: '/user/' + data.user,
}, function(err, notification) {
if (!err && notification) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nodebb-plugin-trophies",
"version": "0.0.1",
"version": "0.0.2",
"description": "Trophies for users of NodeBB",
"main": "library.js",
"minver": "0.9.2",
Expand Down
2 changes: 1 addition & 1 deletion plugin.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "nodebb-plugin-trophies",
"name": "Trophies",
"description": "Plugin for giving users a Trophy",
"description": "Trophies: award badges on user profile pages. See Readme on how to install.",
"url": "https://github.com/toxuin/nodebb-plugin-trophies",
"library": "./index.js",
"hooks": [
Expand Down

0 comments on commit 7d15d76

Please sign in to comment.