Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
1,171 Commits 2 Branches 109 Tags 304 MiB
f4ab194c21
Commit Graph

1171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JC Brand
f4ab194c21 Merge branch 'master' of github.com:jcbrand/converse.js 
Conflicts:
	CONTRIBUTING.rst
 2014-04-04 04:57:09 +02:00
JC Brand
597cf6625a Formatting 2014-04-04 04:56:07 +02:00
JC Brand
e9d31ce62a Update contribution guidelines to mention mailing list 2014-04-04 04:52:25 +02:00
JC Brand
7dfdd085a0 Merge branch 'master' of github.com:jcbrand/converse.js 2014-03-21 23:21:33 +02:00
JC Brand
d5a41e1739 Clean up readme 2014-03-21 23:20:55 +02:00
JC Brand
8e12e230a0 Clean up readme 2014-03-18 03:12:25 +02:00
JC Brand
5e853d5d30 Use fork of strophe.js which includes already built file. 
Instead of having to build it manually in a Grunt/Makefile step.
Clean up the Makefile a bit as well.

Conflicts:
	Makefile
 2014-03-17 22:40:29 +02:00
JC Brand
5282ae25fe Delete icon must appear on same line as pending contact 2014-03-09 17:02:03 +02:00
JC Brand
8001444a1c Add another URL test with double quotes. 2014-03-09 05:51:21 +02:00
JC Brand
77e6c0a490 Two more typos 2014-03-05 09:02:56 +02:00
JC Brand
5e8b61858c Fix release version typo 2014-03-05 08:51:24 +02:00
JC Brand
9b3af57d13 Release version 0.7.4 2014-03-05 08:44:01 +02:00
JC Brand
74779afd66 Ensure that URLs in messages are properly escaped 2014-03-05 08:03:52 +02:00
JC Brand
25cc229019 Refactor message handling 
- use the same method for both normal and OTR messages
- fix /me actions for OTR messages
- rename messaging methods to minimize ambiguity

Conflicts:
	converse.js
	tests/utils.js
 2014-03-05 01:46:19 +02:00
JC Brand
c38e4f1c81 Properly define the crypto dependencies. Fixes #125 2014-03-05 00:38:47 +02:00
JC Brand
085234f9e8 use new CryptoJS repo since the old one was removed. 2014-02-28 04:08:09 +02:00
JC Brand
839dd0bd7e Fix BOSH url 2014-02-23 01:15:05 +02:00
JC Brand
0cffd78ff1 Get ready to release 0.7.3 of converse.js 2014-02-23 01:11:35 +02:00
JC Brand
8a628f48ca Update Hebrew translations with changes from PO file. Fixes #124 2014-02-23 01:01:11 +02:00
JC Brand
7de769fd78 Merge pull request #124 from GreenLunar/patch-1 
Hebrew translation update
 2014-02-24 05:52:50 +02:00
GreenLunar
8b166d0f06 Hebrew translation update 
Fix minor typing errors
 2014-02-21 06:11:33 +02:00
JC Brand
f6e5b07729 Added a section to the documentation concerning OTR 2014-02-12 19:32:25 +02:00
JC Brand
fb1ed29c8f Bump release to version 0.7.3 2014-02-12 14:41:56 +02:00
JC Brand
4190727c6e Mention mailing list in README and update HTML docs. 2014-02-12 13:03:44 +02:00
JC Brand
94c135a6d8 Merge branch 'otr-by-default' of git://github.com/Aupajo/converse.js into Apajo-otr-by-default 
Conflicts:
	converse.js

Fixes #102
 2014-02-12 12:52:57 +02:00
JC Brand
18d6a91881 Add API method to retrieve the SID. Fixes #93 2014-02-12 12:37:39 +02:00
JC Brand
30f3114c7c Add method to get the latest RID. Updates #93 2014-02-12 12:19:12 +02:00
JC Brand
1a4044dd2a Slight refactor of generatePrivateKey... 
to avoid having to give pass it a callback method
 2014-02-12 11:30:05 +02:00
JC Brand
3a5741cd36 Update contact section 2014-02-12 08:22:52 +02:00
JC Brand
62d59ff3e4 Refactor some OTR code into a Backbone model and adapt tests. 2014-02-12 07:12:00 +02:00
JC Brand
398142c7de Add a test for the passphrase storage. Updates #111 2014-02-12 02:02:45 +02:00
JC Brand
e3b8a8f9dd Move event emitter tests out into their own spec 2014-02-12 02:02:25 +02:00
JC Brand
d0f1a6cfb9 Simplify spinner css 2014-02-12 01:41:24 +02:00
JC Brand
ca9c215cac Use a random passphrase to encrypt the private key. Updates #111 2014-02-12 00:45:25 +02:00
JC Brand
2026305791 Remove code for re-attaching a prebinded session. 
I couldn't get it to work. Suspect that a new session needs to be
created/authenticated instead of attaching to the existing connection.
 2014-02-11 23:48:38 +02:00
JC Brand
dc858cc38b Register connection addHandlers when reconnecting 2014-02-11 15:52:12 +02:00
JC Brand
c3b98fd2fd Refactor and improve the reconnecting code and make it configurable 
There is still the apparent problem that after reconnecting, event listeners
hvae to bre reregistered (which doesn't happen currently).

So messages can be sent but not received...
 2014-02-11 13:14:36 +02:00
JC Brand
d0f023dbb1 Allow the OTR private key to be cached. Updates #111 2014-01-31 18:07:44 +02:00
JC Brand
5406df1bc7 Add an animated spinner when generating a private key. 2014-01-31 13:40:33 +02:00
JC Brand
8232cdaff2 Bugfix. Updates #111 
When using OTR with prebind, the user password isn't defined.
=============================================================

When not using prebind, the user password is used to encrypt the private key
for the OTR session before it's saved in session storage.

When using prebind, we ideally want to use the same OTR private key across page
loads, so that we don't have to spend the time generating a new one together
with AKE on every page load. To do this, we need to store it somewhere, like
the browser's session storage.

However, I have yet to find a secure way to store the OTR private key that does
not expose it to maliciously injected javascript.

For now, I've updated the code to generate a new private key and do the AKE
with every page reload.

I'm considering adding code to store the private key in Session Storage and
letting the user explicitly enable this (while making them aware of the risks
involved).
 2014-01-31 05:50:38 +02:00
JC Brand
9bce25109c Allow non-amd usage of converse.js without requiring OTR modules. 2014-01-30 09:35:35 +02:00
JC Brand
42b28b8425 Update docs to provide examples of server-side prebind code. Updates #116 2014-01-30 05:01:10 +02:00
JC Brand
cd144a98ca Add Hebrew translations 2014-01-28 09:41:52 +02:00
JC Brand
24b205536a Fix syntax err in Indonesian translations and update CHANGES 2014-01-28 09:32:21 +02:00
JC Brand
8f40b0e88f Merge pull request #114 from GreenLunar/master 
add Hebrew po
 2014-01-28 16:43:38 -08:00
JC Brand
3800023c8d Merge pull request #115 from priyadi/master 
Added Indonesian translations
 2014-01-28 16:34:20 -08:00
JC Brand
d7c31d5b73 Minor correction of OTR/SMP explanation. Fixes #113 2014-01-28 03:50:51 +02:00
JC Brand
ee07226e8f Fix RST typo 2014-01-28 03:48:43 +02:00
Priyadi Iman Nurcahyo
0ae80be244 Added Indonesian translations 2014-01-25 14:51:51 +00:00
GreenLunar
777f03bbf3 add Hebrew po 2014-01-24 16:01:13 +02:00