Commit Graph

114 Commits

Author SHA1 Message Date
JC Brand
9849daacf9 Merge branch 'master' into 0.8
Conflicts:
	bower.json
	converse.js
	docs/CHANGES.rst
	spec/chatbox.js
	tests/utils.js
	tests_main.js
2014-03-09 08:18:00 +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
ec39e6e802 Emit new event onChatBoxToggled 2014-03-04 20:16:03 +02:00
JC Brand
1ce7620b88 Merge remote-tracking branch 'origin' into 0.8
Conflicts:
	converse.js
	docs/CHANGES.rst
	index.html
2014-02-23 02:54:35 +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
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
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
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
ee07226e8f Fix RST typo 2014-01-28 03:48:43 +02:00
JC Brand
62f6997a25 Chat boxes and rooms can now be resized vertically
The new size is not stored/persisted.
2014-01-23 00:55:52 +02:00
JC Brand
7f8c85f10a Integrate Japanese translations 2014-01-08 15:44:13 +02:00
Pete Nicholls
0b4fe330d6 Document show_call_button option 2013-12-26 15:02:28 +13:00
JC Brand
e3e8bf6c69 New release 0.7.2 2013-12-18 17:07:11 +02:00
JC Brand
478653aebd Bugfix. Wrong number of online contacts shown. Fixes #97 2013-12-18 16:48:02 +02:00
JC Brand
4186bf3ca3 Throw event onRosterViewUpdated whenever the roster HTML changes. Fixes #101 2013-12-18 16:30:19 +02:00
JC Brand
8633d23738 Sanitize text messages to disable Javascript injection attacks.
Thanks to hejsan.
2013-12-18 13:51:59 +02:00
JC Brand
cbde2a1d49 Make the fetching of VCards optional. Updates #100 2013-12-17 19:24:36 +02:00
JC Brand
603087c34b Refined events emitting docs. 2013-12-16 15:27:33 +02:00
JC Brand
4877a5adb6 Update changes 2013-12-15 18:28:22 +02:00
JC Brand
9a8975f5b0 Add two more emitted events. Updates #48 2013-12-15 18:04:51 +02:00
JC Brand
d95610cbd4 Add documentation for events emitted. Updates #48 2013-12-15 17:06:27 +02:00
JC Brand
762ba21c7d Update text on prebinding. 2013-12-14 11:58:47 +02:00
JC Brand
1020e6b3b5 Document the API methods we'll need. Updates #46, Updates #87 2013-11-24 16:23:37 +02:00
JC Brand
526f10d79e Add Troubleshooting section to docs and regenerate HTML. Updates #86 2013-11-24 16:18:04 +02:00
JC Brand
dc708e70c9 Update docs.
- Add link to Movim's page on BOSH servers
- Update the text around prebinding a bit.
2013-11-19 22:56:48 +02:00
JC Brand
8cd05206cb Bump release to 0.7.1 2013-11-17 17:15:07 +02:00
JC Brand
512a463750 Create 3 different builds.
* converse.min.js
* converse-no-otr.min.js (Without OTR encryption)
* converse-no-locales-no-otr.min.js (Without OTR encryption or any translations)
2013-11-17 16:55:38 +02:00
JC Brand
b140596b50 Bump version to 0.7 and minify css and js 2013-11-13 08:19:14 +02:00
JC Brand
cd3540de55 Finally figured out the subscription='from' ask='subscribe' thing 2013-11-06 19:38:16 +02:00
JC Brand
38c26013d0 Simplify the boilerplate HTML require even more.
Use id 'conversejs' instead of 'chatpanel'.

The controlbox toggle is now generated via a backbone view, you don't need to
manually include it in your markup.
2013-10-20 22:42:34 +02:00
JC Brand
90a5df87d0 Move licenses to docs dir 2013-10-20 21:48:36 +02:00
JC Brand
81f4d19a64 Add option to set the XHR user search URL. Fixes #51 2013-10-20 18:36:07 +02:00
JC Brand
1fa47c6633 Merge branch '0.6.x'
Conflicts:
	converse.min.js
	docs/html/searchindex.js
2013-10-16 11:50:55 +02:00
JC Brand
29fc658c05 New release, 0.6.6 2013-10-16 11:26:22 +02:00
JC Brand
b6a6562de9 Merge branch '0.6.x'
Conflicts:
	Makefile
	converse.css
	converse.min.css
	converse.min.js
	docs/doctrees/index.doctree
	docs/html/index.html
	docs/html/searchindex.js
2013-10-08 22:12:12 +02:00
JC Brand
90be11aee8 New release: 0.6.5.
Bumped version
Updated release date in CHANGES.rst
Minified CSS and JS
Generate HTML docs
2013-10-08 09:11:04 +02:00
JC Brand
37f2f8ca0c Merge branch '0.6.x'
Conflicts:
	converse.js
2013-10-05 23:11:17 +02:00
JC Brand
3bf27e8b5f New config option `show_only_online_users`
If true, only users with a status of 'online' will be shown in the contacts
roster.
2013-10-05 23:07:42 +02:00