Commit df599238 authored by JC Brand's avatar JC Brand

Update contributors text, readme and add new license (MPL)

parent aef2db82
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
Contributing to Converse.js Contributing to Converse.js
=========================== ===========================
Thanks for contributing to Converse.js_. Thanks for contributing to `Converse.js <http://conversejs.org>`_.
Please follow the usual github workflow. Create your own local fork of this repository, Please follow the usual github workflow. Create your own local fork of this
make your changes and then submit a pull request. repository, make your changes and then submit a pull request.
Before submitting a pull request Before submitting a pull request
================================ ================================
...@@ -16,28 +16,18 @@ Add tests for your bugfix or feature ...@@ -16,28 +16,18 @@ Add tests for your bugfix or feature
Add a test for any bug fixed or feature added. We use Jasmine Add a test for any bug fixed or feature added. We use Jasmine
for testing. for testing.
Take a look at ``tests.html`` and ``spec/MainSpec.js`` to see how Take a look at `tests.html <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
the tests are implemented. and the `spec files <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
to see how tests are implemented.
If you are unsure how to write tests, please `contact me`_ and I'll be happy to
help.
Check that the tests pass Check that the tests pass
------------------------- -------------------------
Check that the Jasmine tests complete sucessfully. Open tests.html in your Check that the Jasmine tests complete sucessfully. Open
browser, and the tests will run automatically. `tests.html <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
in your browser, and the tests will run automatically.
On the command line you can run ``grunt test`` (if you have before run ``npm
install``).
Check your code for errors or bad habits by running JSHint Check your code for errors or bad habits by running JSHint
---------------------------------------------------------- ----------------------------------------------------------
If you haven't yet done so, run ``npm install`` to install all development Run ``grunt jshint`` and check the output.
dependencies.
Then run ``grunt jshint`` and check the output.
.. _Converse.js: http://conversejs.org
.. _`contact me`: http://opkode.com/contact.html
...@@ -52,6 +52,8 @@ Integration into other frameworks ...@@ -52,6 +52,8 @@ Integration into other frameworks
`roundcube-converse.js-xmpp-plugin <https://github.com/priyadi/roundcube-converse.js-xmpp-plugin>`_ is a plugin for Roundcube Webmail. `roundcube-converse.js-xmpp-plugin <https://github.com/priyadi/roundcube-converse.js-xmpp-plugin>`_ is a plugin for Roundcube Webmail.
* `Wordpress <http://wordpress.org>`_: * `Wordpress <http://wordpress.org>`_:
`ConverseJS <http://wordpress.org/plugins/conversejs>`_ `ConverseJS <http://wordpress.org/plugins/conversejs>`_
* `Patternslib <http://patternslib.com>`_:
`patterns.converse`_: `patterns.converse <https://github.com/jcbrand/patterns.converse>`_ provides a Patternslib pattern for Converse.js
---- ----
Demo Demo
...@@ -64,7 +66,9 @@ Tests ...@@ -64,7 +66,9 @@ Tests
----- -----
We use behavior-driven tests written with `jasmine.js <http://pivotal.github.io/jasmine>`_. We use behavior-driven tests written with `jasmine.js <http://pivotal.github.io/jasmine>`_.
They can run in your browser or in the command line via `phantom.js <http://phantomjs.org>`_.
Open `tests.html <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
in your browser, and the tests will run automatically.
------------- -------------
Documentation Documentation
...@@ -76,8 +80,7 @@ The developer/integrator documentation can be found at `<https://conversejs.org/ ...@@ -76,8 +80,7 @@ The developer/integrator documentation can be found at `<https://conversejs.org/
Licence Licence
------- -------
``Converse.js`` is released under both the `MIT <http://opensource.org/licenses/mit-license.php>`_ ``Converse.js`` is released under the `Mozilla Public License (MPL) <https://www.mozilla.org/MPL/2.0/index.txt>`_.
and `GPL <http://opensource.org/licenses/gpl-license.php>`_ licenses.
------- -------
Support Support
......
This diff is collapsed.
Converse.js
A web-based XMPP instant messaging client.
Copyright (C) 2012 Jan-Carel Brand.
http://opkode.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Converse.js
A web-based XMPP instant messaging client.
Copyright (C) 2012 Jan-Carel Brand.
http://opkode.com
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.
...@@ -149,8 +149,7 @@ ...@@ -149,8 +149,7 @@
</ul> </ul>
<h2>Licence</h2> <h2>Licence</h2>
<p><strong>Converse.js</strong> is released under both the <a href="http://opensource.org/licenses/mit-license.php" target="_blank">MIT</a> <p><strong>Converse.js</strong> is released under the <a href="https://www.mozilla.org/MPL/2.0/index.txt" target="_blank">Mozilla Public License (MPL)</a>.
and <a href="http://opensource.org/licenses/GPL-2.0" target="_blank">GPL</a> licenses.</p>
<h2>Tips</h2> <h2>Tips</h2>
<p><strong>Bitcoin address:</strong> 16FsPqE9DhFTryxrUenpsGX4LJ1TPu8GqS</p> <p><strong>Bitcoin address:</strong> 16FsPqE9DhFTryxrUenpsGX4LJ1TPu8GqS</p>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment