Skip to content

Commit 0626f24

Browse files
author
Sealan Cronin
committed
Updated licence / readme.
1 parent 35c31fc commit 0626f24

File tree

3 files changed

+62
-47
lines changed

3 files changed

+62
-47
lines changed

‎LICENSE.md

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1-
The MIT License (MIT)
1+
Copyright (c) 2015, Made Media Ltd. - www.mademedia.co.uk
2+
All rights reserved.
23

3-
Copyright (c) 2015 Made Media Ltd.
4+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
45

5-
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:
6+
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
7+
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
8+
documentation and/or other materials provided with the distribution.
9+
* Neither the name of SilverStripe nor the names of its contributors may be used to endorse or promote products derived from this software
10+
without specific prior written permission.
611

7-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8-
9-
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.
12+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
13+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
14+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
15+
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
16+
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
17+
OF SUCH DAMAGE.

‎README.md

+14-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,20 @@
22
SilverStripe Module. Replaces TinyMCE with a Markdown editor.
33

44
## License ##
5+
Copyright (c) 2015, Made Media Ltd. - www.mademedia.co.uk
6+
All rights reserved.
57

6-
The MIT License (MIT)
8+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
79

8-
Copyright (c) 2015 Made Media Ltd.
10+
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
11+
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
12+
documentation and/or other materials provided with the distribution.
13+
* Neither the name of SilverStripe nor the names of its contributors may be used to endorse or promote products derived from this software
14+
without specific prior written permission.
915

10-
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:
11-
12-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
13-
14-
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.
16+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
18+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
19+
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
20+
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
21+
OF SUCH DAMAGE.

‎composer.json

+34-34
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
{
2-
"name": "MadeHQ/silverstripe-markdown",
3-
"description": "SilverStripe Module. Replaces TinyMCE editor with a Markdown editor.",
2+
"name": "MadeHQ/silverstripe-markdown",
3+
"description": "SilverStripe Module. Replaces TinyMCE editor with a Markdown editor.",
44
"version": "0.0.1-dev",
5-
"type": "silverstripe-module",
6-
"keywords": ["silverstripe", "markdown"],
5+
"type": "silverstripe-module",
6+
"keywords": ["silverstripe", "markdown"],
77
"homepage": "http://www.mademedia.co.uk",
88
"time": "2015-07-19 12:15:00",
9-
"license": "BSD-3-Clause",
10-
"authors": [
11-
{
12-
"name": "Sealan Cronin",
13-
"homepage": "http://www.mademedia.co.uk/",
14-
"role": "Developer"
15-
},
16-
{
17-
"name": "Hiren Patel",
18-
"email": "[email protected]",
19-
"role": "Developer"
20-
},
21-
{
22-
"name": "Nivanka Fonseka",
23-
"email": "[email protected]",
24-
"role": "Developer"
25-
}
26-
],
9+
"license": "BSD-3-Clause",
10+
"authors": [
11+
{
12+
"name": "Sealan Cronin",
13+
"homepage": "http://www.mademedia.co.uk/",
14+
"role": "Developer"
15+
},
16+
{
17+
"name": "Hiren Patel",
18+
"email": "[email protected]",
19+
"role": "Developer"
20+
},
21+
{
22+
"name": "Nivanka Fonseka",
23+
"email": "[email protected]",
24+
"role": "Developer"
25+
}
26+
],
2727
"support": {
28-
"email": "[email protected]",
29-
"issues": "https://github.com/MadeHQ/silverstripe-markdown/issues",
30-
"wiki": "https://github.com/MadeHQ/silverstripe-markdown/wiki",
31-
"source": "https://github.com/MadeHQ/silverstripe-markdown"
28+
"email": "[email protected]",
29+
"issues": "https://github.com/MadeHQ/silverstripe-markdown/issues",
30+
"wiki": "https://github.com/MadeHQ/silverstripe-markdown/wiki",
31+
"source": "https://github.com/MadeHQ/silverstripe-markdown"
32+
},
33+
"require":
34+
{
35+
"silverstripe/framework": "3.1.13",
36+
"composer/installers": "*"
3237
},
33-
"require":
34-
{
35-
"silverstripe/framework": "3.1.13",
36-
"composer/installers": "*"
37-
},
38-
"extra": {
39-
"installer-name": "markdown"
40-
}
38+
"extra": {
39+
"installer-name": "markdown"
40+
}
4141
}

0 commit comments

Comments
 (0)