Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
2,268 Commits 2 Branches 109 Tags 304 MiB
e3cb6f3fc7
Commit Graph

972 Commits

Author SHA1 Message Date
JC Brand
6afcc0fbe1 Bring lang detect code in line with coding style. 
Change html files so that we auto-detect the lang now.
 2015-05-20 19:31:59 +02:00
JC Brand
1d0ffe34ab Merge branch 'detect_lang' of https://github.com/thierrytiti/converse.js into thierrytiti-detect_lang 2015-05-20 19:20:17 +02:00
thierrytiti
a660f853c1 XEP-0352: Client State Indication 
XEP-0352 support added to Auto Away Mode
 2015-05-20 12:12:08 +02:00
JC Brand
6dcda4ad42 Ensure that roster contact's jids are bare 2015-05-18 11:42:29 +02:00
JC Brand
9db289df86 Bugfix. Automatic anonymous login didn't work if keepalive=false. 2015-05-16 16:28:23 +02:00
JC Brand
6260ba2864 Bugfix. Don't overwrite _super every time an override is made. 2015-05-16 16:27:51 +02:00
JC Brand
ea687d67f9 Merge branch 'master' into plugins-refactor 2015-05-15 14:48:12 +02:00
JC Brand
68bcc9d0eb Merge pull request #399 from thierrytiti/bugfixes 
Bugfix. fullname is null
 2015-05-15 14:41:18 +02:00
JC Brand
96df8dea97 Merge branch 'Placeholder-for-translation' of https://github.com/thierrytiti/converse.js into thierrytiti-Placeholder-for-translation 
Conflicts:
	src/templates/toolbar.html
 2015-05-15 14:39:02 +02:00
thierrytiti
7a359562ad Add placeholder for 'Insert a smiley' 2015-05-15 12:01:29 +02:00
JC Brand
3ea3ac52a3 Merge branch 'master' into plugins-refactor 2015-05-15 11:32:33 +02:00
thierrytiti
e64c19fc18 Bugfix. fullname is null 
wrong callback argument mapping in XmppStatus initialize: fullname is
null
 2015-05-15 11:05:26 +02:00
JC Brand
cd759a7174 Fixes around using bare jid for roster and chats. 
- Make sure the bare jid is used as roster contact id.
- Save the resource when creating a new roster contact
- In getWrappedChatBox, get roster item by bare jid
- In getWrappedChatBox, make sure the chat box is created from bare jid
 2015-05-15 00:33:23 +02:00
JC Brand
3fc0ef1e70 Remove snippet of code that's not being used. 2015-05-15 00:33:23 +02:00
thierrytiti
e35c5a4fa3 Indentation 2015-05-14 13:55:39 +02:00
thierrytiti
be102de031 Bugfix if auto_away=0 and auto_xa>0 
In this case, it will force changing presence even if the user
specificly set another status.
 2015-05-13 16:25:26 +02:00
thierrytiti
6034932523 Update converse.js 2015-05-13 13:57:22 +02:00
thierrytiti
d631af58a9 Automatic Away Mode 
Add functions for changing user presence to ``away`` or ``xa``
 2015-05-13 13:51:24 +02:00
thierrytiti
f521532f2f Language Detection 
Replace default en language to autodetection if no i18n setting is set.
 2015-05-11 17:36:12 +02:00
JC Brand
42437ffa91 Bind overridden methods to the plugin context 2015-05-10 17:15:15 +02:00
JC Brand
91638cabe1 Add support for "overrides" namespace convention in plugins. 2015-05-10 00:51:36 +02:00
Guillermo Bonvehí
70191eac00 Added login-panel placeholder and roster-item Name translations 
This will allow to translate 'user@server' and 'password' in the login
screen and also in the roster-item tooltip, there's 'Name:' which can
now be translated
 2015-05-08 14:08:09 -03:00
Guillermo Bonvehí
71ea60e44a Fixed an error that appears when unload event is triggered 
This happens when you load a page with converse and do not login to
the chat. It can be tested in converse.org preserving logs while
navigating to another page.
Inside clearSession there's a call to roster which is not initalized
and also another one to controlbox.save which is not set so it fails
with an url error during sync.
 2015-05-07 12:47:32 -03:00
JC Brand
c0bec459a0 Bugfix. See below. 
Manual login doesn't work when websocket_url is set and not bosh_service_url

It's already a while since we don't include an input for the bosh_service_url in the login panel.
 2015-05-06 16:46:37 +02:00
JC Brand
9f5f5da7ed Created method insertIntoPage 
Put the code that inserts a chat box into the page in it's own method,
so that it can be overridden from a plugin.
 2015-05-03 17:43:22 +02:00
JC Brand
d6a1dee2d2 Rename the placeholder for contact adding 
to make it clearer what a JID should look like.
 2015-05-02 00:21:11 +02:00
JC Brand
aa3de742c0 Merge branch 'master' into roster_refactor 2015-04-25 23:06:59 +02:00
JC Brand
d6038c7c7b Allow the URL to the sounds to be configurable. 
Made some modifications to the code contributed by @thierrytiti and documented
the change.

Fixes #344
 2015-04-25 22:41:29 +02:00
thierrytiti
310d2b77f3 typo 2015-04-25 22:26:10 +02:00
thierrytiti
7ec44d56d5 add sounds path 2015-04-25 22:25:59 +02:00
thierrytiti
addd2c2ac3 Bug in parsing search result 2015-04-25 22:20:15 +02:00
JC Brand
96e8a285b7 Merge branch 'master' into roster_refactor 2015-04-21 17:36:13 +02:00
JC Brand
6dc355a02a Show the domain when rendering a legacy registration form. 
Also updated the changelog with #377
 2015-04-21 17:21:26 +02:00
JC Brand
848c13eb62 Merge branch 'master' into roster_refactor 
Conflicts:
	dev.html
 2015-04-21 16:51:15 +02:00
Guillermo Bonvehí
8934043d79 Submit registration form as xform or legacy 
Support to send the registration form as legacy or xform, we
use the same variable form_type that was already being used when
calling render
Added submission tests
 2015-04-21 11:05:03 -03:00
Florian Cargoët
8b695be4d7 Fix group visibility on page load. 
Close #374
 2015-04-17 17:06:16 +02:00
Florian Cargoët
63e3794ba7 Fixes #372 2015-04-17 16:24:02 +02:00
JC Brand
292d4a1bc9 Ignore messages sent to a different resource 2015-04-16 09:37:46 +02:00
JC Brand
f7a077a911 Merge branch 'master' into roster_refactor 
Conflicts:
	converse.js
 2015-04-15 22:08:19 +02:00
JC Brand
36d9dbdea5 Use Strophe for managing namespaces. 2015-04-15 22:06:23 +02:00
JC Brand
34e2cfc191 Merge branch 'master' into roster_refactor 2015-04-15 21:52:14 +02:00
JC Brand
1b6e67ae73 Don't call updateVCard if use_vcards is false. 2015-04-15 21:20:19 +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
6ef2e50387 Merge branch 'anon_login' 2015-04-09 14:09:26 +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
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
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
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
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
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
Florian Cargoët
06c3304d0d Fix the plugin extend function 2015-04-01 14:59:13 +02:00
JC Brand
14c09c509e Add some consistency to how errors are thrown. 
Add tests for contacts.add API method and make it a bit more compact.
Add entry in changelog.

update #354
 2015-03-31 15:29:41 +02:00
pzia
6879405e85 Throw exception if no jid or invalid jid. (#354) 2015-03-30 12:02:28 +02:00
pzia
66751540da contacts.add API to register contacts 
- Basic test if the given jid contains @
- use jid as name if undefined
 2015-03-29 18:12:23 +02:00
JC Brand
896b147a40 Prevent converse.connection.attach from being called twice 
when using prebind and keepalive together.
 2015-03-26 15:24:05 +01:00
JC Brand
b2b2b2bbc0 Enable automatic anonymous login. 2015-03-22 13:20:24 +01:00
JC Brand
4d3b4380dd Add support for anonymous login. 2015-03-22 12:14:45 +01:00
JC Brand
7cd27a71b3 Enable automatic reconnecting when `prebind and prebind_url` are 
specified.

fixes #330
updates #333
 2015-03-21 23:41:39 +01:00
JC Brand
8d818fd5fd updates #339. 
* The JID is only required when using keepalive with prebind.
* Provide a logout API method.
 2015-03-21 21:50:48 +01:00
JC Brand
1a670e1d47 Require that a "JID" be specified with keepalive. updates #339 2015-03-21 21:32:04 +01:00
pzia
a629e0cc61 Hide 'Server' Label when hiding server input 2015-03-17 11:27:43 +01:00
JC Brand
d0b8a3870b Add a test to check that notifications are properly sent in chat rooms. 2015-03-16 17:27:26 +01:00
JC Brand
90e4d6cba6 Add new configuration setting "allow_contact_removal". 2015-03-09 19:47:24 +01:00
JC Brand
9dd3440f86 Add new config option prebind_url 2015-03-05 22:24:26 +01:00
JC Brand
2e3eaa5d41 Bugfix. The stanza wasn't being passed into the handlers. 2015-03-05 20:18:25 +01:00
JC Brand
6c10d2b7b2 Remove strophe.muc.js completely. closes #307 2015-03-04 23:22:19 +01:00
JC Brand
df724788fc Two chat room bugfixes. updates #307 
* Prevent "join" being called twice by having more finegrained connection
  status for a chat room.
* The directInvite method used the wrong JID.
* Rename getRoomJID to getRoomJIDAndNick to avoid confusion.
 2015-03-04 23:02:47 +01:00
JC Brand
db44a297cb Remove the last calls to connection.muc. updates #307 2015-03-04 22:27:11 +01:00
JC Brand
3daf6d6c1a Refactor to no longer user muc.saveConfiguration. updates #307 2015-03-01 23:57:49 +01:00
JC Brand
c893a51ac5 Rewrite the MUC commands to not use strophe.muc. updates #307 
Also added 3 new commands, /member, /revoke, /admin
 2015-03-01 20:00:11 +01:00
JC Brand
acd3463abd Remove usage of muc.groupchat. updates #307 2015-03-01 19:22:34 +01:00
JC Brand
762e2bac04 Write a test for rooms listing. 2015-03-01 19:09:10 +01:00
JC Brand
c7d5b8b13f Refactor to no longer call muc.listRooms. updates #307 2015-03-01 13:32:53 +01:00
JC Brand
6c31f76406 Refactor other tests. All tests pass now again. updates #307 2015-03-01 11:58:07 +01:00
JC Brand
405351058a Rename the nick changed tests. updates #307 
Test from a lower level (stanza request received by strophe) and also test the
case where the server automatically changed the nick.
 2015-03-01 11:22:37 +01:00
JC Brand
551a8842ce Drop dependence on muc.leave. updates #307 2015-03-01 01:23:53 +01:00
JC Brand
4a5eb7c38a Initial work on refactoring MUC chat rooms. updates #307 
In the process of removing the strophe.muc plugin completely.
Already implemented join function and handler delegation in converse.js.
 2015-03-01 00:55:22 +01:00
JC Brand
bd0d7ace04 Remove old, deprecated API methods. updates #46 2015-02-27 21:19:16 +01:00
JC Brand
387bb6f3a4 Bugfix. Custom status message form does not submit/disappear. 2015-02-27 18:32:23 +01:00
JC Brand
c70561b898 Some API changes: 
* Let contacts.get() return all roster contacts.
* Also, add "open" method for the chats API.
* chats.get will now only return a chat box if it's already open.
 2015-02-25 18:31:09 +01:00
JC Brand
04912c5c5a Merge branch 'master' into amd-strophe 
Conflicts:
	docs/CHANGES.rst
 2015-02-22 12:53:18 +01:00
JC Brand
b31261f6fd Expand the API to allow configuration settings to... 
be set on the fly.
 2015-02-11 15:08:10 +01:00
JC Brand
5839e38fc0 Performance fix. updates #151 
_.pluck was being called inside the form loop.
 2015-02-08 20:58:37 +01:00
JC Brand
0407826057 Two websocket related changes. updates #204 
* Handle case where no websocket url is specified.
* Update the documentation w.r.t. websockets
 2015-02-08 20:02:53 +01:00
JC Brand
3e9994e01c Websocket support. closes #204 2015-02-07 16:54:58 +01:00
JC Brand
95bc55c1c3 Merge branch 'master' into amd-strophe 2015-02-07 14:10:32 +01:00
JC Brand
e5e8539f2b Fix the non-AMD usecase. 2015-02-03 22:39:03 +01:00
JC Brand
f283f6bce5 Fix failing tests after introducing AMD version of Strophe 2015-02-01 16:15:34 +01:00
JC Brand
8eabf93cec Fix typo 2015-01-30 15:54:59 +01:00
JC Brand
b7643eaba0 Initial work on letting converse.js use the AMD version of strophe.js 2015-01-27 15:10:58 +01:00
Guillermo Bonvehí
fe03940f53 Fix issue #305, show=online presence sent 
setStatusMessage was modified to send the presence using
sendPresence method which skips show tag when type is 'online'
Added getStatus helper method
 2015-01-23 11:16:16 -03:00
Guillermo Bonvehí
5cd28ff71b Strophe.log and .error now calls converse.log, this honors converse.debug flag 2015-01-22 17:38:36 -03:00
JC Brand
c646e93a9b Don't set out message carbons IQ stanza on each page load. 2015-01-17 13:24:05 +01:00
JC Brand
8478b432c3 Lazily call parseJSON on translation data. 
Also, moved locales.js to ./src folder.
Add it as dependency to utils.js and remove it from the deps scripts
 2015-01-16 22:33:18 +01:00
JC Brand
31cb3d4b6e Fix the non-AMD case. 2015-01-16 22:07:27 +01:00
JC Brand
607c2a81c9 Instead of GONE, set chat_state to INACTIVE when a box is closed. 
Also, fixed all broken tests.
 2015-01-09 10:48:36 +01:00
JC Brand
b4d53aaa94 Some refactoring of chat states work. updates #292 
- Don't add a timeout for the GONE state.
- Change state to GONE when the user closes the chat box.
- Change the state to inactive when the user minimizes the chat box.
- Change the state to active when the users maximizes the chat box.
- Add more tests for chat states.
 2015-01-09 09:09:49 +01:00
JC Brand
bb468ae0a3 Add better support for XEP-0085. closes #292 
Converse.js will now send chat state notifications of <paused>, <inactive> and
<gone> when the user has stopped typing for 30 seconds, 2 minutes and 10 minutes
respectively.
 2015-01-01 22:59:10 +01:00
JC Brand
3175bddc46 Initial work on adding support for sending <paused> and <gone> chat states. 2015-01-01 05:52:10 +01:00
JC Brand
1c3b61274c Bugfix. Don't trim the newly opened (and only current) chat. 2014-12-31 17:07:02 +01:00
JC Brand
516def29cb Styling for the minimized chats list. 2014-12-31 16:58:15 +01:00
JC Brand
96d904f38e Merge branch 'master' into skeleton 2014-12-31 11:34:34 +01:00
JC Brand
35a542da83 Bugfix. Translate method called before it was defined. 2014-12-31 11:28:52 +01:00
JC Brand
640a344ee2 Make sure placeholder is also translateable 2014-12-20 11:57:03 +01:00
JC Brand
fadbf2d159 JSHint bitching about wrapped or statements 2014-12-20 10:17:20 +01:00
JC Brand
970fed4d29 Rename button to clarify 2014-12-13 00:14:35 +01:00
JC Brand
cbfd8d8e90 Merge pull request #288 from arsh-co/master 
Set immediate to true when calling _.debounce
 2014-12-12 15:37:21 +01:00
Mohammad Javad Naderi
5424e301ff Set immediate to true when calling _.debounce 
When clicking on restore button for a minimized chat, the page's hash will change to `#`. It may cause problems for web apps that listen to changes in page's hash.

When `immediate` argument of `debounce` function is not set, `ev` is null and ev.preventDefault() will not be called.
 2014-12-11 15:22:51 +03:30
Guillermo Bonvehí
00af792899 Unified pending/requesting checking 2014-12-10 22:42:09 -03:00
Guillermo Bonvehí
2354a27832 Always show pending/requesting users in roster 
Even if show_only_online_users or hide_offline_users
are set, show users that are pending or requesting
 2014-12-10 21:32:59 -03:00
JC Brand
e71cad8583 Add default avatar for users. 2014-12-07 13:44:27 +01:00
JC Brand
9f94d0f4ea Nicer styling for the chat room configuration form. 2014-12-07 12:23:53 +01:00
JC Brand
3bf5eeb4a8 Bugfix. Could not render chat room configuration form. 2014-12-07 11:13:50 +01:00
JC Brand
f893e94312 rid, jid and sid weren't being set. fixes #285 2014-12-06 19:05:50 +01:00
JC Brand
20e15b5623 Sphinx changes. 
* Add buildout config for Sphinx
* Add new Sphinx theme
* Remove the built html theme files
 2014-12-06 18:58:58 +01:00
JC Brand
e4307f7ab8 See below 
* Fix login panel rendering bug
* Make registration form i18n aware.
* Make providers link configurable.
 2014-12-06 18:58:14 +01:00
JC Brand
03ec659b50 Add another test and another template. refs #117 2014-12-01 20:31:01 +01:00
JC Brand
831faf7096 Show domain name in username field of the registration form. updates #117 2014-11-26 21:26:28 +01:00
JC Brand
329746d839 Merge branch 'register' 2014-11-25 10:51:06 +01:00
JC Brand
d690704f93 Fix tests and added a workaround... 
so that we can use require config in main.js also in the tests.
 2014-11-25 10:50:30 +01:00
JC Brand
e246335b03 Bugfix. JIDs not shown in chatrooms. fixes #282 2014-11-25 09:55:15 +01:00
JC Brand
a4dd5a2a46 Bugfixes around connection handling. 
Properly disconnect after auth fail, so that we can log in again.
Don't reset the connection when logging out (not necessary).
 2014-11-24 22:40:10 +01:00
JC Brand
7125bd1d67 Render form captcha. updates #117 2014-11-24 20:35:00 +01:00
JC Brand
89fa218c59 Some css tweaks. Center the controlpanel form elements 2014-11-24 18:57:28 +01:00
JC Brand
03c92b4487 Remove toLowerCase. JID resources are case sensitive. updates #234 
We should perhaps still make the node part lower case, but I'd like to double
check first.
 2014-11-24 18:37:03 +01:00
JC Brand
923056925f Show hardcoded urls. Some css width tweaks. updates #117 2014-11-23 22:26:38 +01:00
JC Brand
3dbcdd6171 More work on XEP-0077. updates #117 
* On the registration form, show the xmpp.net badge for XMPP provider.
* More CSS and form improvements.
* New template registration_form.html
 2014-11-20 11:51:12 +01:00