updated license notices and readme

LICENSE.md

@@ -1,7 +1,7 @@
-Copyright 2018 Ilixa Ltd
+Copyright 2018 Ilixa Ltd.
 
 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.
+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.

README.md

@@ -28,8 +28,8 @@ There are however notable differences between the the PsychoJs and PsychoPy libr
 Under the hood PsychoJs relies on [PixiJs](http://www.pixijs.com) to present stimuli and collect responses. PixiJs is a multi-platform, accelerated, 2-D renderer, that runs in most modern browsers. It uses WebGL wherever possible and silently falls back to HTML5 canvas where not. WebGL directly addresses the graphic card, thereby considering improving the rendering performance.
 
 
-### Hosting experiments
+### Hosting Experiments
-A convenient way to make experiment available to participants is to host them on [pavlovia.org](pavlovia.org), an open-science server under active development. PsychoPy Builder offers the possibility of uploading the experiment directly to pavlovia.
+A convenient way to make experiment available to participants is to host them on [pavlovia.org](https://www.pavlovia.org), an open-science server under active development. PsychoPy Builder offers the possibility of uploading the experiment directly to pavlovia.
 
 
 ## Which PsychoPy Components are supported by PsychoJs?
@@ -46,10 +46,11 @@ PsychoJs currently supports the following Components:
 * Mouse
 * Keyboard
 
+We are constantly adding new Components and are regularly updating this list.
 
 ## Authors
 
-The PsychoJs library is written and maintained by Ilixa Ltd. (http://www.ilixa.com). The PsychoPy Builder's javascript code generator is built and maintain by the creators of PsychoPy, at the [University of Nottingham](nottingham.ac.uk). Both efforts are generously supported by the Wellcome Trust (https://wellcome.ac.uk).
+The PsychoJs library is written and maintained by Ilixa Ltd. (http://www.ilixa.com). The PsychoPy Builder's javascript code generator is built and maintained by the creators of PsychoPy, at the [University of Nottingham](https://www.nottingham.ac.uk). Both efforts are generously supported by the Wellcome Trust (https://wellcome.ac.uk).
 
 
 ## License

js/core/EventManager.js

@@ -2,9 +2,9 @@
  * @file Manager handling the keyboard and mouse/touch events.
  * 
  * @author Alain Pitiot
- * @version 3.0.0b10
+ * @version 3.0.0b11
  * @copyright (c) 2018 Ilixa Ltd. ({@link http://ilixa.com})
- * @license Distributed under the terms of the GNU General Public License (GPL).
+ * @license Distributed under the terms of the MIT License
  */
 
 import { MonotonicClock, Clock } from '../util/Clock';

js/core/GUI.js

@@ -2,9 +2,9 @@
  * @file Graphic User Interface
  *
  * @author Alain Pitiot
- * @version 3.0.0b10
+ * @version 3.0.0b11
  * @copyright (c) 2018 Ilixa Ltd. ({@link http://ilixa.com})
- * @license Distributed under the terms of the GNU General Public License (GPL).
+ * @license Distributed under the terms of the MIT License
  */
 
 

js/core/MinimalStim.js

@@ -2,9 +2,9 @@
  * @file Base class for all stimuli.
  * 
  * @author Alain Pitiot
- * @version 3.0.0b10
+ * @version 3.0.0b11
  * @copyright (c) 2018 Ilixa Ltd. ({@link http://ilixa.com})
- * @license Distributed under the terms of the GNU General Public License (GPL).
+ * @license Distributed under the terms of the MIT License
  */
 
 import { PsychObject } from '../util/PsychObject';

js/core/Mouse.js

@@ -2,9 +2,9 @@
  * @file Manager responsible for the interactions between the experiment's stimuli and the mouse.
  * 
  * @author Alain Pitiot
- * @version 3.0.0b10
+ * @version 3.0.0b11
  * @copyright (c) 2018 Ilixa Ltd. ({@link http://ilixa.com})
- * @license Distributed under the terms of the GNU General Public License (GPL).
+ * @license Distributed under the terms of the MIT License
  */
 
 import { PsychoJS } from './PsychoJS';

js/core/PsychoJS.js

@@ -3,9 +3,9 @@
  * @file Main component of the PsychoJS library.
  *
  * @author Alain Pitiot
- * @version 3.0.0b10
+ * @version 3.0.0b11
  * @copyright (c) 2018 Ilixa Ltd. ({@link http://ilixa.com})
- * @license Distributed under the terms of the MIT License.
+ * @license Distributed under the terms of the MIT License
  */
 
 

js/core/ServerManager.js

@@ -2,9 +2,9 @@
  * @file Manager responsible for the communication between the experiment running in the participant's browser and the remote PsychoJS manager running on the remote https://pavlovia.org server.
  * 
  * @author Alain Pitiot
- * @version 3.0.0b10
+ * @version 3.0.0b11
  * @copyright (c) 2018 Ilixa Ltd. ({@link http://ilixa.com})
- * @license Distributed under the terms of the GNU General Public License (GPL).
+ * @license Distributed under the terms of the MIT License
  */
 
 

js/core/Window.js

@@ -2,9 +2,9 @@
  * @file Window responsible for displaying the experiment stimuli
  * 
  * @author Alain Pitiot
- * @version 3.0.0b10
+ * @version 3.0.0b11
  * @copyright (c) 2018 Ilixa Ltd. ({@link http://ilixa.com})
- * @license Distributed under the terms of the GNU General Public License (GPL).
+ * @license Distributed under the terms of the MIT License
  */
 
 import { Color } from '../util/Color';

js/core/WindowMixin.js

@@ -2,9 +2,9 @@
  * @file Mixin implementing various unit-handling measurement methods.
  * 
  * @author Alain Pitiot
- * @version 3.0.0b10
+ * @version 3.0.0b11
  * @copyright (c) 2018 Ilixa Ltd. ({@link http://ilixa.com})
- * @license Distributed under the terms of the GNU General Public License (GPL).
+ * @license Distributed under the terms of the MIT License
  */
 
 

js/data/ExperimentHandler.js

@@ -2,9 +2,9 @@
  * @file Experiment Handler
  * 
  * @author Alain Pitiot
- * @version 3.0.0b10
+ * @version 3.0.0b11
  * @copyright (c) 2018 Ilixa Ltd. ({@link http://ilixa.com})
- * @license Distributed under the terms of the GNU General Public License (GPL).
+ * @license Distributed under the terms of the MIT License
  */
 
 

js/data/TrialHandler.js

@@ -3,9 +3,9 @@
  * @file Trial Handler
  * 
  * @author Alain Pitiot
- * @version 3.0.0b10
+ * @version 3.0.0b11
  * @copyright (c) 2018 Ilixa Ltd. ({@link http://ilixa.com})
- * @license Distributed under the terms of the GNU General Public License (GPL).
+ * @license Distributed under the terms of the MIT License
  */
 
 

js/sound/Sound.js

@@ -5,7 +5,7 @@
  * @author Alain Pitiot
  * @version 3.0.0b11
  * @copyright (c) 2018 Ilixa Ltd. ({@link http://ilixa.com})
- * @license Distributed under the terms of the GNU General Public License (GPL).
+ * @license Distributed under the terms of the MIT License
  */
 
 import { PsychoJS } from '../core/PsychoJS';

js/sound/SoundPlayer.js

@@ -2,9 +2,9 @@
  * @file Sound player interface
  * 
  * @author Alain Pitiot
- * @version 3.0.0b10
+ * @version 3.0.0b11
  * @copyright (c) 2018 Ilixa Ltd. ({@link http://ilixa.com})
- * @license Distributed under the terms of the GNU General Public License (GPL).
+ * @license Distributed under the terms of the MIT License
  */
 
 import { PsychObject } from '../util/PsychObject';

js/sound/TonePlayer.js

@@ -2,9 +2,9 @@
  * @file Tone Player.
  *
  * @author Alain Pitiot
- * @version 3.0.0b10
+ * @version 3.0.0b11
  * @copyright (c) 2018 Ilixa Ltd. ({@link http://ilixa.com})
- * @license Distributed under the terms of the GNU General Public License (GPL).
+ * @license Distributed under the terms of the MIT License
  */
 
 import { SoundPlayer } from './SoundPlayer';

js/sound/TrackPlayer.js

@@ -2,9 +2,9 @@
  * @file Track Player.
  *
  * @author Alain Pitiot
- * @version 3.0.0b10
+ * @version 3.0.0b11
  * @copyright (c) 2018 Ilixa Ltd. ({@link http://ilixa.com})
- * @license Distributed under the terms of the GNU General Public License (GPL).
+ * @license Distributed under the terms of the MIT License
  */
 
 import { SoundPlayer } from './SoundPlayer';