Commit Graph

2302 Commits

Author SHA1 Message Date
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
Florian Cargoët
06c3304d0d Fix the plugin extend function 2015-04-01 14:59:13 +02:00
JC Brand
4646944327 Add some auth tests. 2015-03-31 16:06:33 +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
JC Brand
90641a6145 Merge pull request #354 from pzia/master
contacts.add API to register contacts
2015-03-30 12:55:57 +02:00
pzia
6879405e85 Throw exception if no jid or invalid jid. (#354) 2015-03-30 12:02:28 +02:00
JC Brand
1545fe9c55 CSS fix. The spinner for chatroom info wasn't centered. 2015-03-29 21:58:45 +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
e0e0f1b7d7 Make release 0.9.1 2015-03-26 09:58:09 +01:00
c143
07fe029e41 Added a grey color for visitors
You don't see visitors without hovering the specific user. So you would have to check everyone by yourself. This highlights them grey. (You're also marked as visitor when you're muted)
2015-03-26 09:49:51 +01:00
JC Brand
8469bf0a0d More specific version pin for crypto-js-evenvosberg.
Fixes build and test errors due to files having been moved around.
Fixes #351
2015-03-25 11:40:35 +01:00
JC Brand
06803e2c90 Add Gemfile.lock to .gitignore 2015-03-25 11:21:03 +01:00
JC Brand
866c258c11 Created new builds. Updates #339. 2015-03-22 14:19:36 +01:00
JC Brand
b2b2b2bbc0 Enable automatic anonymous login. 2015-03-22 13:20:24 +01:00
JC Brand
9dae305c23 Fix the failing test. 2015-03-22 12:52:54 +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
JC Brand
0e535847c4 One more pixel. 2015-03-18 15:43:55 +01:00
JC Brand
abd8cf35bc Some CSS tweaks to make converse.js look better in a bootstrap site. 2015-03-18 15:39:37 +01:00
JC Brand
c1d48b6f2c Docs fix: converse.on should be converse.listen.on
fixes #341
2015-03-18 11:33:26 +01:00
JC Brand
9085ed668f Merge pull request #340 from pzia/master
Hide 'Server' Label when hiding server input
2015-03-17 22:28:22 +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
77137a538c Document that event listeners receive event as first arg. Fixes #336 2015-03-16 10:41:20 +01:00
JC Brand
5fb319fcae Documentation fix. 2015-03-11 12:47:09 +01:00
JC Brand
90e4d6cba6 Add new configuration setting "allow_contact_removal". 2015-03-09 19:47:24 +01:00
JC Brand
2888bc59ab Bump underscore version. 2015-03-09 19:47:24 +01:00
JC Brand
d61c52f053 Merge pull request #329 from camaran/patch-1
tipe email, more mobile firendly
2015-03-09 17:43:47 +01:00
camaran
c6c48e297f tipe email, more mobile firendly 2015-03-09 16:09:47 +01:00
JC Brand
fde70077cb Mention that converse.js runs in the browser :) 2015-03-08 16:54:32 +01:00
JC Brand
f1753be5a6 Expand the setup docs and re-add section "What you will need" 2015-03-08 14:17:21 +01:00
JC Brand
953ffc63bc Remove unused .gitmodules file. 2015-03-06 19:01:23 +01:00
JC Brand
7637a3f12b Bundler bugfix in Makefile. 2015-03-06 18:00:35 +00:00
JC Brand
4d6aed5d81 Merge branch 'master' of github.com:jcbrand/converse.js 2015-03-06 17:54:11 +00:00
JC Brand
17da00d5c1 Release version 0.9.0 2015-03-06 18:49:31 +01:00
JC Brand
9b0d2904b6 CSS Tweak for IE10. 2015-03-06 17:29:55 +01:00
JC Brand
f73b74a8e3 CSS tweaks. 2015-03-06 12:01:56 +01:00
JC Brand
7473f458eb Mention prebind_url in changes and update links to docs for older settings. 2015-03-05 23:20:46 +01:00