Commit Graph

479 Commits

Author SHA1 Message Date
JC Brand
fae9b84577 Bugfix: undefined template and a typo 2014-03-15 05:49:11 +02:00
JC Brand
bb0f49cf4d Add a counter to show unread msgs when chat is minimized 2014-03-09 13:31:01 +02:00
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
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
317ab95cd8 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
2014-03-05 01:23:45 +02:00
JC Brand
ec39e6e802 Emit new event onChatBoxToggled 2014-03-04 20:16:03 +02:00
JC Brand
b14538b441 Rename ChatBoxesView to ChatBoxViews 2014-03-04 15:54:36 +02:00
JC Brand
1567b212c3 Add closure get/set methods for rosteritem views 2014-03-04 15:49:02 +02:00
JC Brand
d20ca10638 Add closured get/set methods for views from chatboxesview 2014-03-04 15:09:16 +02:00
JC Brand
ac0042fdf9 Extend the "close chat" test with a normal chatbox usecase 2014-03-04 13:22:49 +02:00
JC Brand
c030494ef0 Fix tests and simplify code for showing controlbox 2014-03-01 08:21:36 +02:00
JC Brand
4f2125c20e Simplified by setting height via template, not JS
Also dropped the minimum height restriction
2014-03-01 01:57:20 +02:00
JC Brand
7d58d856b8 Save chat box's toggle state between page loads. 2014-03-01 01:57:20 +02:00
JC Brand
8294162f9d Store and maintain a chatbox's custom size. 2014-03-01 01:57:20 +02:00
JC Brand
11b59b31d3 Fix tests after all the refactoring... 2014-03-01 01:57:20 +02:00
JC Brand
8feeb73320 Fix webkit bug that prevents boxes from reordering when one is closed 2014-02-23 05:49:30 +02:00
JC Brand
0414fa02c2 Add some resistance around chatbox's original height when resizing 2014-02-23 03:38:26 +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
319a955f65 Add code that allows resize by click+drag.
Removed dragresize.js and instead wrote new much smaller and simpler code
in converse.js.
2014-02-22 23:20:36 +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
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
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
d7c31d5b73 Minor correction of OTR/SMP explanation. Fixes #113 2014-01-28 03:50:51 +02:00
JC Brand
12fc286ca6 Various changes, see below:
- disable drag resizing when chatboxes are minimized.
- refactored chat box and chat room markup so that they are more similar.
- don't make the chat box title clickable if no vcard URL is available
- make only the title text clickable, not the whitespace
- fixed toggling of resized chats
2014-01-27 02:26:55 +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
680548612c Make controlbox appear in a smoother fashion in webkit
when clicking the controlbox toggle
2014-01-23 00:33:55 +02:00
JC Brand
d0af974206 Chat boxes can now be minimized. Updates #71 2014-01-22 23:51:15 +02:00
JC Brand
d2358a6a93 Controlbox and its toggle are now mutually exclusive.
When the one is visible, the other is hidden and vice versa.
2014-01-22 23:19:45 +02:00
JC Brand
823f93f006 Merge branch 'templates' into 0.8
Conflicts:
	converse.js
2014-01-22 19:29:47 +02:00
JC Brand
ee6c6102fb CSS changes, see below:
- Rename some classes to make clearer.
- Fixed resizing of chat rooms.
- Changed controlbox so that only contacts are scrollable
2014-01-22 16:01:49 +02:00
JC Brand
18cacdc94b More templates refactored into separate files. 2014-01-19 11:22:56 +02:00
JC Brand
feb81a02f3 Move more templates out into separate files. 2014-01-19 06:37:55 +02:00
JC Brand
55b9a4e568 Initial support for external HTMl templates. Updates #77 2013-12-31 01:07:11 +02:00
Pete Nicholls
1d3aa9f450 Add model to onCallButtonClicked event payload 2013-12-26 14:48:48 +13:00
Pete Nicholls
6002e0fdf9 Use converse.emit to dispatch call button event 2013-12-19 12:26:11 +13:00
Pete Nicholls
db60894834 Add optional call button to chat box toolbar 2013-12-19 12:26:07 +13:00
Pete Nicholls
201004f815 Order options alphabetically 2013-12-19 12:02:57 +13:00