Skip to content

Commit 7c90047

Browse files
committed
Merge branch 'master' of https://github.com/msaroff/bbCodeWebEx
2 parents e31a8bf + 0225b98 commit 7c90047

7 files changed

Lines changed: 649 additions & 651 deletions

File tree

README.md

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,22 @@ Additionally, I am using the internatinal language codes he maintained for bbCod
2222
Wrote the code used to access the contents of the clipboard, available at https://github.com/NiklasGollenstede/es6lib/, specifically the dom.js file.
2323

2424
## License
25-
This code is licensed under the Church of the Flying Spaghetti Monster, which is identical to the TBD free and open source license, except that an addendum is added as performance art requiring users to go outside and play pirate, or make pasta, every so often.
25+
The MIT License (MIT)
2626

27-
This addendum has no force of law, nor any effect on the rest of the document and is actually a form of performance art, and as such this addendum is licensed under the Creative Commons Attribution 4.0 International Public License.
27+
Copyright 2018 Matthew G. Saroff
28+
29+
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:
30+
31+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
32+
33+
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.
34+
35+
## Curse/Geas
36+
Users are compelled, under a threat of a completely legally non-binding curse, to go outside (weather permitting) and play pirate, or to go outside and make pasta (you can use the store bought stuff, but you should really make your own pasta) on a regular basis.
37+
38+
A regular basis is defined as being on the 5<sup>th</sup> Tuesday of any month that has one.
39+
40+
Failure to do so will result in the user, and his children, and his children's children, being compelled to enter the service of the Church of the Flying Spaghetti Monster, or to be a pirate. (If you can be a space pirate, do it, space pirates are cool.)
2841

2942
## Health Warning
3043
This is profoundly ugly code, and the author assumes no responsibility for any of the following conditions that might develop as a result of reading said code:
@@ -38,3 +51,7 @@ This is profoundly ugly code, and the author assumes no responsibility for any o
3851

3952
Seriously, this is Vogon code Javascript, and I keep expecting a bodily organ to leap up and throttle my brain.
4053

54+
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JBHQBS83HLWFY&source=url"><img src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif">
55+
<br>Donate to Matthew Saroff's Beer Fund and Javascript Crib</a>
56+
57+

0 commit comments

Comments
 (0)