Commit Graph

587 Commits

Author SHA1 Message Date
JC Brand
d69a165b05 Use strict mode. Emit an event when the connection drops. 2014-04-24 09:51:21 +02:00
JC Brand
1c26e9016c Fixed chatbox positioning and better disabling of effects
* The animate config option now disables jQuery effects
* Make sure the controlbox is always to the right of all other chatboxes
* Make sure new chatboxes are always created immediately left of the controlbox
2014-04-24 07:58:35 +02:00
JC Brand
eca42fbb2f Add support for XEP-0280 Message Carbons. updates #132 2014-04-19 06:58:26 +02:00
JC Brand
968f8bb223 Add new configuration setting "forward_messages".
What was before default behavior is now optional and disabled by default.
2014-04-19 06:18:17 +02:00
JC Brand
14d90bc99c Upgrade dependencies to their latest versions 2014-04-19 05:12:24 +02:00
JC Brand
7d472eb26d Add new dependency moment.js
Use it to better compare dates when trying to determine whether a message falls
on a different day.

Also upgraded some dependencies' versions.
2014-04-19 01:30:48 +02:00
JC Brand
b88113c246 Fixed some failing tests.
Some of the tests were failing because they didn't expect the controlbox to be
returned from localStorage.
It's too long ago that I've looked at this branch for me to say whether this is
a legitimate bug or not.
Will have to investigate further.
2014-04-18 17:42:35 +02:00
JC Brand
3cfcb2ae34 2 controlbox bugfixes and spec typo.
* Save controlbox to containing collection
* Call refreshWebkit after closing controlbox
2014-03-15 05:52:00 +02:00
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
Pete Nicholls
fd918a5243 Support using OTR by default 2013-12-19 12:02:50 +13: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
7b2d16afbc Bugfix. The 'get' function complains when there's no callback 2013-12-17 18:51:47 +02:00
JC Brand
d1bf5b8466 Add event emitter tests for chatrooms. Updates #48 2013-12-16 19:19:25 +02:00
JC Brand
cdc350f592 Add more tests for events emitting. Updates #48 2013-12-16 15:27:07 +02:00
JC Brand
986c17884b Bugfix. 'this' doesn't refer to converse obj. 2013-12-16 14:37:30 +02:00
JC Brand
9a8975f5b0 Add two more emitted events. Updates #48 2013-12-15 18:04:51 +02:00
JC Brand
e729471bbf Event emitting code. Updates #48
Include the event emitting code in converse.js itself and start emitting events.

Still needs tests and to be thoroughly tested manually.
Still needs docs.
2013-12-15 16:58:46 +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
d1d896a3be HAS_CRYPTO was actually checking for the opposite 2013-11-16 11:52:45 +02:00
JC Brand
f73ab4e832 Allow otr and CryptoJS to not be defined.
Will allow builds without OTR functionality.
2013-11-16 11:24:22 +02:00
JC Brand
67c99f60fe Don't put define in try/catch. Breaks optimizer.
Add check HAS_CSPRNG instead of the previous check
2013-11-15 23:33:05 +02:00
JC Brand
518c0fca8a We can't not load the crypto libs, breaks r.js optimizer 2013-11-15 22:57:29 +02:00
JC Brand
4a1eac06cb Check if canvas is supported before trying to render the user avatar. 2013-11-15 22:27:24 +02:00
JC Brand
490d96fd26 Don't load the Crypto libraries if the browser doesn't have CSRNG 2013-11-15 22:16:18 +02:00
JC Brand
18ba56bcfc Remove duplicated crypto code and fixed crypto dependencies on non_amd.html page 2013-11-13 08:16:53 +02:00
JC Brand
f90fa641b8 Typeof returns a string 2013-11-12 08:17:40 +02:00
JC Brand
84e28a33b8 Bugfix. Handle case where pass_check is undefined. 2013-11-12 08:16:07 +02:00
JC Brand
0369f11dc5 Bugfix. Contact's name got replaced with JID. updates #58 2013-11-11 21:56:11 +02:00
JC Brand
e8af60e12b OTR Bugfix. Check the data parameter for confirmation. 2013-11-11 21:45:18 +02:00
JC Brand
c15bcf0a23 Bugfix. Menu slid up again after ending OTR session. 2013-11-11 21:03:41 +02:00
JC Brand
cd3540de55 Finally figured out the subscription='from' ask='subscribe' thing 2013-11-06 19:38:16 +02:00
JC Brand
5944ed99e6 Bugfix. Make sure to remove 'requesting' attr again. 2013-11-06 19:07:58 +02:00
JC Brand
7a5bc7fe65 'ask' attribute of 'subscribe' is only for 'pending out' requests.
Did more investigation with regards to subscription requests.

As far as I can tell, roster updates will only show ask='request' for 'pending
out' requests.

For 'pending in' requests (what converse.js calls requesting contacts), roster
updates are not used and instead a presence stanza with type 'subscribe' is
used.

This makes sense. When sending a presence with type 'subscribe', we need a way
to keep track of our outgoing subscriptions. The XMPP server helps us do this by
adding a user to our roster with ask='request' and subscription='none'.

When our contact receives our presence with type 'subscribe', they have the
information they need. If they go offline and online again, the XMPP server
will resend the presence with type 'subscribe'. So a roster item is not needed.

In convere.js's internal representation of the roster (via the RosterItems backbone
object) we need to add roster items for 'pending in' contacts so that we can
render them and we need to know whether they are 'pending in' or 'pending out'.

We already know they're 'pending out' when ask='subscribe' and
subscription='none'. For 'pending in', since these roster items are only stored
locally and not on the XMPP server (because 'pending in' requests are handled
via <presence> stanzas and not the roster) we add a special attribute
'requesting'.
2013-11-06 09:54:58 +02:00
JC Brand
fb8e2cde72 Roster item 'ask' property is always 'subscribe' for subscription requests
* 'pending' state is denoted by subscription='none', ask='subscribe'
* 'requesting' state is denoted by subscription='from', ask='subscribe'

Reference: http://xmpp.org/rfcs/rfc3921.html#int

I'm not yet 100% sure with regards to the 'requesting' state, I can't find
anything about it in the above mentioned reference, but apparantly that's what
prosody's roster response looks like (e.g. <item jid='XYZ' ask='subscribe'
subscription='from'/> ).

With ejabberd I haven't yet received such a roster response and contact
requests are always handled via presence stanzas.

updates #81
2013-11-06 09:04:44 +02:00
JC Brand
4b9054066d Fall back to user's JID when fullname not found 2013-11-04 15:57:22 +02:00
JC Brand
fc3a08400e Add tests for the chat toolbar.
Including the emoticon menu and the OTR menu.
More tests needed for OTR in particular.
2013-11-03 22:28:44 +02:00
JC Brand
d7d8948eba Refactor ChatRoom tests (move code to utils.js) 2013-11-03 12:02:25 +02:00
JC Brand
d4fa43109f Don't use 'testing' attr override.
Can be used to get the unwrapper 'inner' converse object.

Instead, check that the bosh service value of the connection corresponds to the
mock object used for jasmine tests.
The value tested for is not usable in production, so we're sure we're only
running tests.
2013-11-03 11:38:36 +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
81f4d19a64 Add option to set the XHR user search URL. Fixes #51 2013-10-20 18:36:07 +02:00
JC Brand
25dc4a27e2 Add smiley support for chatrooms as well 2013-10-20 18:13:34 +02:00
JC Brand
4ab3498285 Bugfix. Roster didn't appear in some cases.
Make sure the last roster item is still added (even if it's a zombie), so that
the roster will be shown (roster is only shown when last_item property is
true).
2013-10-20 12:16:14 +02:00
JC Brand
a5daeb017e Emoticons now supported for single-user chat. 2013-10-19 23:18:17 +02:00
JC Brand
546204bed6 Merge branch '0.6.x' 2013-10-19 18:28:31 +02:00
JC Brand
fd349b217f Don't unnecessarily create objects for roster items 2013-10-19 18:24:06 +02:00
JC Brand
3d84b3e7ae IE8 bugfix. Fixes #52 2013-10-19 17:10:56 +02:00
JC Brand
3c57892cbf Add smiley menu to the chat toolbar
Still to do is rendering smileys in the chat area and chatrooms.
2013-10-17 20:30:37 +02:00
JC Brand
b061f403b3 Remove superfluous element #collective-xmpp-chat-data 2013-10-16 22:29:13 +02:00
JC Brand
6e15986a87 Merge branch '0.6.x'
Conflicts:
	index.html
2013-10-15 19:16:11 +02:00
JC Brand
150846849d Bugfix. Don't reconnect while strophe is still disconnecting
Causes infinit loop of connects and disconnects
2013-10-15 19:03:10 +02:00
JC Brand
d53caf115a Make sure presence stanza is sent out after roster update
specifically also when localstorage is populated
2013-10-15 18:29:16 +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
f68712a58c Bugfix. Presence stanza sent out before roster initialized 2013-10-08 22:10:00 +02:00
JC Brand
8a2e4e83e7 Remove getItem.
It's a relic from a time before the class subclassed a Backbone.Collection
2013-10-08 08:45:17 +02:00
JC Brand
a3dc23bf3e Bugfix. When trying to reconnect: 'connection' is not defined.
Conflicts:
	converse.js
2013-10-07 21:36:50 +02:00
JC Brand
b943d4ca35 Bugfix. When trying to reconnect: 'connection' is not defined. 2013-10-07 21:35:52 +02:00
JC Brand
e883d137fc Bugfixes. RosterItemView didn't rebind events. Undefined vars in onConnect.
When using show_only_online_users, roster item DOM elements are removed from
the DOM if their status changed from 'online' to something else.

When their status changed to 'online' again, they were re-added.

Their views (RosterItemView) instances however didn't listen to events anymore.

Calling delegateEvents on the view after calling $.remove() fixed this.
2013-10-07 09:16:26 +02:00
JC Brand
4f44be9e29 Merge branch '0.6.x'
Conflicts:
	converse.js
	index.html
2013-10-07 09:16:02 +02:00
JC Brand
18091308be Bugfixes. RosterItemView didn't rebind events. Undefined vars in onConnect.
When using show_only_online_users, roster item DOM elements are removed from
the DOM if their status changed from 'online' to something else.

When their status changed to 'online' again, they were re-added.

Their views (RosterItemView) instances however didn't listen to events anymore.

Calling delegateEvents on the view after calling $.remove() fixed this.
2013-10-07 09:13:16 +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
JC Brand
b111e60c1d Merge branch '0.6.x'
Conflicts:
	converse.js
2013-10-05 22:38:14 +02:00
JC Brand
fcc1f5adf4 A bit of reordering.
Move all module-level functions/variables and Backbone Modules/Views together.
Add headings to indicate logical sections.
Make statuses variable module-level and indicate that it's a constant (all caps)
2013-10-05 22:34:47 +02:00
JC Brand
ef1c834090 Don't check for allow_contact_requests in RosterItemView render method
This method shouldn't be called when contact requests aren't allowed because
roster items are then not created for contact requests.
2013-10-05 22:16:09 +02:00
JC Brand
0752a0e2ed Merge branch '0.6.x'
Conflicts:
	converse.min.css
	converse.min.js
2013-10-05 16:50:26 +02:00
JC Brand
feda94178c Refactor incoming subscription handling code into its own method 2013-10-05 16:46:57 +02:00
JC Brand
3a1bd7c4e6 Remove duplicate allow_muc and sort 2013-10-03 19:01:58 +02:00
JC Brand
646fcb36c7 Merge branch '0.6.x' 2013-10-03 18:52:39 +02:00
JC Brand
a5b5e7538f 2 Bugfixes.
- Register handlers that depend on the roster inside initRoster and the
  message handler inside chatboxes.onConnected. This solves problem of presence
  stanzas being received before handlers are initialized. Updates #65

- Check if MUC is allowed during feature discovery
2013-10-03 18:43:49 +02:00
JC Brand
cf137c607b Merge branch '0.6.x'
Conflicts:
	converse.js
	index.html
2013-10-03 16:05:21 +02:00
JC Brand
7f371b883e Add config option `allow_contact_requests` to toggle user adding 2013-10-03 15:58:09 +02:00
JC Brand
b8e096ffd1 Merge branch '0.6.x'
Conflicts:
	converse.js
	index.html

Add config option ``allow_contact_requests`` to toggle user adding
2013-10-03 14:25:39 +02:00
JC Brand
a57d0e9818 Sort default values 2013-10-03 14:24:23 +02:00
JC Brand
0d6e29f067 Add config option `allow_contact_requests` to toggle user adding 2013-10-03 14:22:33 +02:00
JC Brand
e4c9fcbc4e Merge branch '0.6.x'
Conflicts:
	converse.css
	converse.js
	index.html

Add allow_muc config option
2013-10-03 13:53:47 +02:00
JC Brand
7f4bdb4098 Don't use id for controlbox panes 2013-10-03 13:45:50 +02:00
JC Brand
feaff64aab Add setting to enable/disable MUC 2013-10-03 13:16:26 +02:00
JC Brand
8f14c32b48 Use newest (unreleased) otr.js so that we can specify paths ourselves 2013-10-03 10:18:07 +02:00
JC Brand
e4a1ccf1c0 Remove old classes before adding new ones. Updates #38 2013-09-26 21:48:45 +02:00
JC Brand
122cb937fe Fetch vCard once a roster contact is added. Updates #38
This will happen in the background and in the meantime roster contacts will
appear under their JIDs.
2013-09-26 21:48:44 +02:00
JC Brand
3dfcd3c04a Remove old classes before adding new ones. Updates #38 2013-09-26 21:46:10 +02:00
JC Brand
b36e6bbce1 Fetch vCard once a roster contact is added. Updates #38
This will happen in the background and in the meantime roster contacts will
appear under their JIDs.
2013-09-26 11:53:47 +02:00
JC Brand
1d14a2b950 Use const for enter key 2013-09-18 09:25:40 +02:00
JC Brand
367803d6ef The xa chat state wasn't being handled properly 2013-09-13 10:58:00 +02:00
JC Brand
59fc3182b1 The xa chat state wasn't being handled properly 2013-09-13 10:57:28 +02:00
JC Brand
b34a706132 We didn't have an icon for unavailable state.
Also, the status description was not translation aware
2013-09-13 10:35:37 +02:00
JC Brand
8977505f11 We didn't have an icon for unavailable state.
Also, the status description was not translation aware
2013-09-13 10:35:00 +02:00
JC Brand
f15eb5a7d4 Remove messages from localStorage when calling /clear 2013-09-13 09:59:06 +02:00
JC Brand
0dd4b3e52c Remove messages from localStorage when calling /clear 2013-09-13 09:57:14 +02:00
JC Brand
d402ed8e8e Merge branch 'master' into otr
Conflicts:
	locale/af/LC_MESSAGES/converse.po
	locale/converse.pot
2013-09-12 20:57:51 +02:00
JC Brand
37f3a95a20 For uniqueness, we need both JIDs for messages localStorage Fixes #49 2013-09-12 15:30:09 +02:00
JC Brand
4ab6f28181 Bugfix. Messages were stored against buddy JID and not own JID 2013-09-12 15:24:56 +02:00
JC Brand
9734ccdeff The word 'me' wasn't translation aware.
Conflicts:
	locale/converse.pot
2013-09-12 08:37:41 +02:00
JC Brand
00cb015d6a Merge branch 'master' into otr
Conflicts:
	converse.js
2013-09-10 23:33:30 +02:00
JC Brand
778b8a7c2e The word 'me' wasn't translation aware. 2013-09-10 23:31:29 +02:00
JC Brand
4bb22b5c97 Translated strings may not be broken up. Regenerated POT file 2013-09-10 22:52:15 +02:00
JC Brand
1574acb37b Save the private key and instance tag in session storage. 2013-09-10 22:37:12 +02:00
JC Brand
9967b955c8 Show an alert before generating private key
To make it clear to the user that the browser might freeze up while generating
the key.
2013-09-08 18:13:49 +02:00