Commit Graph

3027 Commits

Author SHA1 Message Date
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
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
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
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
0bc40eed25 Start updating the templates with the new markup 2014-01-22 20:44:47 +02:00
JC Brand
823f93f006 Merge branch 'templates' into 0.8
Conflicts:
	converse.js
2014-01-22 19:29:47 +02:00
JC Brand
f2c354b7d9 Set a class 'minimized' instead of hardcoding style 2014-01-22 19:27:15 +02:00
JC Brand
b189e6dfcb Fix minimize which broke again after previous CSS changes 2014-01-22 17:45:16 +02:00
JC Brand
7600018ff1 Style the controlbox toggle. 2014-01-22 17:29:14 +02:00
JC Brand
cf22003a97 Regenerated Pot file. 2014-01-22 17:07:50 +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
46838fb2f9 Some refinements around chatroom css and dragresize 2014-01-22 15:34:26 +02:00
JC Brand
ea62e2f3e0 Remove the #controlbox-panes element. Not needed. 2014-01-22 15:16:00 +02:00
JC Brand
3eaeed4ce9 Two more css width fixes. 2014-01-20 16:16:41 +02:00
JC Brand
7991a0196a CSS tweaks to fix issues with variable height...
due to new ability to resize chat boxes.
2014-01-20 16:10:22 +02:00
JC Brand
e2e2a80a2d Add the dragresize code to the static mockup and tweak it a bit
Removed unused css and html files.
2014-01-19 13:37:26 +02:00
JC Brand
c46b5cc7cc Cleaned up via JSLint 2014-01-19 13:04:58 +02:00
JC Brand
296c6e605f Initial work on merging mockup markup into the dragresize mockup 2014-01-19 11:43:35 +02:00
JC Brand
c3a513a15c Merge branch 'dragresize' into minimize2
Conflicts:
	converse.css
	converse.js
	mockup.html
2014-01-19 11:33:15 +02:00
JC Brand
18cacdc94b More templates refactored into separate files. 2014-01-19 11:22:56 +02:00
JC Brand
4e9dc08b0b Clean up after running tests, by closing chatboxes. 2014-01-19 07:02:18 +02:00
JC Brand
feb81a02f3 Move more templates out into separate files. 2014-01-19 06:37:55 +02:00
JC Brand
46883344b6 Fix minimize for chatrooms 2014-01-17 17:20:55 +02:00