New name: Kaiwa

README.md

@@ -1,34 +1,33 @@
-# Otalk
+# Kaiwa
 
+Kaiwa is a fork a otalk by &yet (http://andyet.com/)
 Note: See also https://github.com/otalk for more code
 
 ## What is it?
-Otalk is an open source chat client powered by [XMPP](http://xmpp.org), [stanza.io](https://github.com/legastero/stanza.io), and [WebRTC](http://webrtc.org). You can think of it as an open source alternative to Skype.
+Kaiwa is an open source chat client powered by [XMPP](http://xmpp.org) and [stanza.io](https://github.com/legastero/stanza.io). You can think of it as an open source alternative to Skype.
-
-While we have a version hosted at https://otalk.im, you can still run your own private instance.
 
 ## Installing
 
-    git clone https://github.com/andyet/otalk.git
+    git clone https://github.com/digicoop/kaiwa.git
-    cd otalk
+    cd kaiwa
     npm install
     node server
 
-You can also run your own [XMPP server](https://github.com/andyet/otalk-server).
+You can also run your own [XMPP server](https://github.com/digicoop/kaiwa-server).
 
-*Note:* If you're running your own XMPP server, and aren't using something like HAProxy to terminate SSL, then you might get errors in certain browsers trying to establish a WebSocket connection because the XMPP server is requesting an optional client certificate which makes the browser terminate the socket. To resolve that, visit the XMPP over Websocket URL directly (eg, example.com:5281/xmpp-websocket for Prosody) so that a client cert choice can be made. After that, the Otalk client should connect fine.
+*Note:* If you're running your own XMPP server, and aren't using something like HAProxy to terminate SSL, then you might get errors in certain browsers trying to establish a WebSocket connection because the XMPP server is requesting an optional client certificate which makes the browser terminate the socket. To resolve that, visit the XMPP over Websocket URL directly (eg, example.com:5281/xmpp-websocket for Prosody) so that a client cert choice can be made. After that, the Kaiwa client should connect fine.
 
 ## What's included?
 
-Otalk comes with support for:
+Kaiwa comes with support for:
 
 ### Message History Syncing
 
-Using Message Archive Management (MAM, [XEP-0313](http://xmpp.org/extension/xep-0313.html)), your conversations can be archived by your server and pulled down by the Otalk client on demand.
+Using Message Archive Management (MAM, [XEP-0313](http://xmpp.org/extension/xep-0313.html)), your conversations can be archived by your server and pulled down by the Kaiwa client on demand.
 
 ### Active Chat Syncing
 
-Ever used multiple IM clients at once, or swapped clients, and end up with disjointed conversations? Using Message Carbons [(XEP-0280)](http://xmpp.org/extensions/xep-0280.html) all of your active conversations will be synced to your Otalk client (and vice versa if you other clients support carbons too).
+Ever used multiple IM clients at once, or swapped clients, and end up with disjointed conversations? Using Message Carbons [(XEP-0280)](http://xmpp.org/extensions/xep-0280.html) all of your active conversations will be synced to your Kaiwa client (and vice versa if you other clients support carbons too).
 
 ### Reliable Connections
 
@@ -40,6 +39,4 @@ Made a typo in a message? Using Message Correction [XEP-0308](http://xmpp.org/ex
 
 ### Timezone Indications
 
-Working with someone in a different timezone? If the other person is using Otalk or another client that supports Entity Time ([XEP-0202](http://xmpp.org/extensions/xep-0202.html)) you'll see a reminder that they're 9 hours away where it's 4am and they're not likely to respond.
+Working with someone in a different timezone? If the other person is using Kaiwa or another client that supports Entity Time ([XEP-0202](http://xmpp.org/extensions/xep-0202.html)) you'll see a reminder that they're 9 hours away where it's 4am and they're not likely to respond.
-
-### Voice and Video

clientapp/models/me.js

@@ -68,7 +68,7 @@ module.exports = HumanModel.define({
         organization: {
             deps: ['orga'],
             fn: function () {
-                return app.serverConfig().name || 'Otalk';
+                return app.serverConfig().name || 'Kaiwa';
             }
         },
         soundEnabledClass: {

clientapp/models/state.js

@@ -53,7 +53,7 @@ module.exports = HumanModel.define({
         title: {
             deps: ['pageTitle', 'badge'],
             fn: function () {
-                var base = this.pageTitle ? 'Otalk - ' + this.pageTitle : 'Otalk';
+                var base = this.pageTitle ? 'Kaiwa - ' + this.pageTitle : 'Kaiwa';
                 if (this.badge) {
                     return this.badge + ' • ' + base;
                 }

dev_config.json

@@ -10,7 +10,7 @@
         "secret": "shhhhhh don't tell anyone ok?"
     },
     "server": {
-        "name": "Otalk",
+        "name": "Kaiwa",
         "domain": "example.com",
         "wss": "wss://example.com:5281/xmpp-websocket/",
         "muc": "chat.example.com",

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "otalk.im",
+  "name": "kaiwa.im",
-  "description": "Otalk: WebRTC Enabled XMPP Client, in the Browser",
+  "description": "Kaiwa: XMPP Client in the Browser",
-  "version": "0.0.50",
+  "version": "1.0.0",
   "browser": {
     "crypto": "crypto-browserify"
   },
@@ -45,6 +45,6 @@
   "private": true,
   "repository": {
     "type": "git",
-    "url": "git@github.com:andyet/otalk.git"
+    "url": "git@github.com:digicoop/kaiwa.git"
   }
 }

public/x-manifest.webapp

@@ -1,5 +1,5 @@
 {
-    "name": "Otalk",
+    "name": "Kaiwa",
     "description": "Modern XMPP client",
     "icons": {
         "128": "/images/icon_128x128.png"