Commit Graph

2892 Commits

Author SHA1 Message Date
JC Brand
34e2cfc191 Merge branch 'master' into roster_refactor 2015-04-15 21:52:14 +02:00
JC Brand
50f4d6b582 Use unminified strophe 2015-04-15 21:52:00 +02:00
JC Brand
1b6e67ae73 Don't call updateVCard if use_vcards is false. 2015-04-15 21:20:19 +02:00
JC Brand
324e3fee2a Merge pull request #369 from theoziran/master
Fixing when the path has space, it closes #368
2015-04-15 09:07:56 +02:00
Theoziran Lima
8edb454966 Fixing when the path has space, it closes #368 2015-04-14 17:23:32 -03:00
JC Brand
937e1d3d4f Remove all fuzzy entries in en po 2015-04-13 17:04:30 +02:00
JC Brand
3451fcf01e Only set contact status offline if there aren't any other resources available. 2015-04-13 17:02:14 +02:00
JC Brand
f399c5f681 Add more protocol tests.
* Unsubscribing
* Incoming subscription requests.

Noticed that it's not necessary to call "unauthorize" when setting
subscription="remove".
2015-04-10 16:30:04 +02:00
JC Brand
e6f5b95da7 Fix tests by allowing removeFromRoster to be spyable. 2015-04-10 13:04:00 +02:00
JC Brand
1ce328783c Also add tests for case where contact declines request.
Did a bit of renaming and fixed a bug in updateContact where a user wasn't
created when it should have been.
2015-04-10 13:01:31 +02:00
JC Brand
838ad13605 Merge branch 'master' into roster_refactor
Conflicts:
	converse.js
2015-04-10 01:30:02 +02:00
JC Brand
827efab093 Fix and expand broken tests after recent refactor 2015-04-10 01:23:33 +02:00
JC Brand
c195d9055d Use http URL for crypto.js to fix Travis fail 2015-04-10 01:12:33 +02:00
JC Brand
fde0e9c199 Fix RsT errors in docs. 2015-04-09 14:16:29 +02:00
JC Brand
3f884f0d03 Update the changelog after merge from 'anon_login' branch. 2015-04-09 14:13:21 +02:00
JC Brand
6ef2e50387 Merge branch 'anon_login' 2015-04-09 14:09:26 +02:00
JC Brand
960cf4a572 Looks like an older tag for crypto.js is not available anymore.
Fix this by pointing to the tag via a git URL
2015-04-09 10:36:38 +02:00
JC Brand
ade08104a2 Finish tests for the "happy path" of the add/subscribe protocol 2015-04-09 10:35:51 +02:00
JC Brand
2e11f99d82 Bugfix. Also make sure to remove previous from/to class 2015-04-09 10:35:12 +02:00
JC Brand
c05d17ca25 Expand the protocol tests.
* Fixed a bug in the process which prevented "to" contacts from being shown as
existing.
* Add "to" or "both" as classes on the contacts to indicate their
subscription status.
* Delete roster handlers in tearDown method to avoid them being registered
multiple times.
2015-04-08 19:51:33 +02:00
JC Brand
eb00dcd44a Bugfix. Paths to sound files should be absolute. 2015-04-08 17:22:49 +02:00
JC Brand
995c5fdb44 Make release 0.9.2 2015-04-08 13:41:31 +02:00
JC Brand
b177a6a7a0 Bugfix for incorrect roster height when allow_contact_requests=false.
Also update changelog and fix some linting errors.

Fixes #360
2015-04-08 13:12:29 +02:00
JC Brand
abae9ad6c0 Merge pull request #362 from pzia/master
Adding 'rooms' API
2015-04-08 12:24:49 +02:00
JC Brand
f3101a347f Use the ::-moz-selection because Firefox doesn't know ::selection
fixes #364
2015-04-08 12:20:50 +02:00
JC Brand
c7bf1713d8 Add new spec protocol for testing the XMPP protocol.
Already testing the first 3 sections of RFC-3921 section 8.2 "User subscribes to contact".
2015-04-08 10:35:14 +02:00
JC Brand
7aba5b2af5 Fix test after refactoring. 2015-04-08 10:34:14 +02:00
JC Brand
ef7605d363 More fixes after live testing of roster subscriptions.
Also, added code to acknowledge a subscription being accepted.
See https://xmpp.org/rfcs/rfc3921.html#substates-ack
2015-04-07 20:04:27 +02:00
JC Brand
96396fdc6e A few fixes after some "real world" tests. 2015-04-07 18:23:45 +02:00
JC Brand
330b1434bd Completely remove strophe.roster as a dependency. 2015-04-06 20:55:38 +02:00
JC Brand
a4475a5459 Stop using strophe.roster in unsubscribe method. 2015-04-06 13:52:58 +02:00
JC Brand
7f8da77133 See below.
Refactor out the code for sending an IQ to add a roster contact.
And then call that from acceptRequest.
2015-04-06 13:43:27 +02:00
JC Brand
5b0a88ccdb Some more refactoring so that we can remove strophe.roster.
Some changes to presenceHandler and handleIncomingSubscriptions to avoid using
strophe.roster as well as to remove duplicate code.
2015-04-06 13:41:48 +02:00
JC Brand
1ea770c79a Add the ability to reject presence subscriptions.
Still part of the refactoring of strophe.roster.
2015-04-06 12:26:08 +02:00
JC Brand
f380e11851 Initial refactoring of roster and presence subscriptions.
The goal being to be able to remove strophe.roster completely.
2015-04-06 11:10:05 +02:00
JC Brand
18fd854dc4 Remove unnecessary return statement and expression. 2015-04-05 17:09:14 +02:00
pzia
fb8c71b4c7 API documentation for jcbrand/converse.js#355 2015-04-05 08:36:26 +02:00
pzia
4df2058cd1 Adding 'rooms' API (see jcbrand/converse.js#355 ) 2015-04-05 08:22:10 +02:00
JC Brand
df0c55ed4d Merge branch 'master' into anon_login 2015-04-04 11:32:22 +02:00
JC Brand
5a488333ec Add a test and changelog entry for #359
updates #359
2015-04-04 11:25:50 +02:00
JC Brand
b7933449cc Merge pull request #359 from floriancargoet/fix/chat_state_timeout
Fix a timeout bug in chat state notifications
2015-04-04 11:14:10 +02:00
Florian Cargoët
a9a4935ed9 Fix a timeout bug in chat state notifications 2015-04-03 09:47:31 +02:00
JC Brand
a2be2567d2 Allow auto_login also with a provided jid and password.
* Update the docs to mention the new ``authentication`` option.
* Update failing tests due to ``prebind`` being replaced with ``authentication``.
* Rename 'manual' value for authentication to 'login' since it's used in both manual and auto cases.
2015-04-02 13:07:59 +02:00
JC Brand
a2d27ee971 Merge branch 'master' into anon_login
Conflicts:
	converse.js
2015-04-02 12:23:13 +02:00
JC Brand
5ec7c67b50 Don't automatically show a chat box when creating it. updates #357
This caused a bug whereby a chat box would open only on chat state
notifications.

Also refactored the chats.open and chats.get methods so that they now reuse the
same map function and so that chats.get can now return any chat box and not
just already open ones.

Updated the tests to properly test this and updated the docs.
2015-04-02 02:01:53 +02:00
JC Brand
a902ba2d8a Merge pull request #357 from floriancargoet/fix/state-notifications-reopen-box
Fix the known bug where a state notification reopens a chat box
2015-04-02 01:46:26 +02:00
JC Brand
a68e3bdeea Merge pull request #358 from floriancargoet/fix/shared-occupants-list
Fix the ChatRoomOccupants storage id
2015-04-01 23:22:52 +02:00
JC Brand
aa0e6846a1 Merge pull request #356 from floriancargoet/fix/plugins
Fix the plugin extend function
2015-04-01 17:20:55 +02:00
Florian Cargoët
400cfa38a7 Fix the ChatRoomOccupants storage id 2015-04-01 15:20:46 +02:00
Florian Cargoët
b1272a697b Fix the known bug where a state notification reopens a chat box 2015-04-01 15:11:24 +02:00