Commit Graph

1131 Commits

Author SHA1 Message Date
JC Brand
429d77e44f Force standards mode on IE 2013-11-16 12:02:45 +02:00
JC Brand
d1d896a3be HAS_CRYPTO was actually checking for the opposite 2013-11-16 11:52:45 +02:00
JC Brand
774f0119b2 Update changes and minify the JS 2013-11-16 11:31:30 +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
a3821fd0d3 Stylesheet tweak 2013-11-15 23:56:14 +02:00
JC Brand
08aad1fd97 Point download URL to all releases. 2013-11-15 23:50:00 +02:00
JC Brand
36c3a21036 Patch bigint.js so that it doesn't throw an error when a CSPRNG is not present
Instead, we'll check for it in converse.js and just disable OTR if it's not
there.
2013-11-15 23:33:54 +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
5da32a5956 Change bind address to one served under same domain 2013-11-15 21:13:35 +02:00
JC Brand
95de186de5 Point to original roundcube plugin again. 2013-11-15 18:03:32 +02:00
JC Brand
b9d60bc6e4 Add link to newest screencast. 2013-11-13 09:31:07 +02:00
JC Brand
2336f5ff56 Tweak changes entry 2013-11-13 09:01:09 +02:00
JC Brand
56aa3c2fe2 Fix dependencies in build.js and reminify 2013-11-13 08:45:30 +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
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
1757a3cc23 readme formatting 2013-11-06 10:14:58 +02:00
JC Brand
a2e918995e More descriptive changelog entry. Add litecoin address. 2013-11-06 10:12:08 +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
00e0782576 Add a test that checks for delayed messages. Fixes #76
Messages older than one day do indicate it.
2013-11-03 13:24:18 +02:00
JC Brand
d7d8948eba Refactor ChatRoom tests (move code to utils.js) 2013-11-03 12:02:25 +02:00
JC Brand
13babe4fae Refactored chatbox tests to be run independently 2013-11-03 11:38:48 +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
44fe406a34 Refactored tests.
Split MainSpec out into ChatBoxSpec and ControlBoxSpec.

Part of trying to have looser coupling between tests so that they can be run
independently.
2013-11-02 13:37:38 +02:00
JC Brand
b0f12d0f79 $.proxy can be used to pass in extra args, no need for fn.bind 2013-11-02 12:03:57 +02:00
JC Brand
ff345dcf51 Move mock.js to tests dir. Add utils.js
Both changes from tests-refactor branch
2013-11-02 11:32:52 +02:00
JC Brand
f9c096c061 Use new otr.js release 0.27 2013-11-02 10:15:26 +02:00
JC Brand
2bd27282ce Use newer simpler markup in tests.html 2013-10-27 22:33:07 +02:00
JC Brand
f030e2bafb Move contents of style.css into converse.css 2013-10-27 22:29:27 +02:00
JC Brand
f87900fbff Merge branch 'master' of github.com:jcbrand/converse.js
Conflicts:
	converse.js
	docs/source/index.rst
	index.html
2013-10-20 22:45:03 +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
c6f4943ea6 Simplify the boilerplate HTML require even more.
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:20:45 +02:00
JC Brand
90a5df87d0 Move licenses to docs dir 2013-10-20 21:48:36 +02:00
JC Brand
6855327eaf Updated changes. rm very old TODO list 2013-10-20 21:46:07 +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
fef89d658f Fix RST formatting in readme 2013-10-19 23:30:49 +02:00