Commit Graph

2176 Commits

Author SHA1 Message Date
JC Brand
eae706690f Renamed some methods and added docstrings, for clarity. 2015-07-04 10:24:00 +02:00
JC Brand
761fe9425b Merge pull request #436 from infernaler/patch-1
Update Makefile.win
2015-07-03 22:28:43 +02:00
infernaler
4f60d3f8bd Update Makefile.win
There are spaces instead of tabs and this is causing an error.
2015-07-03 14:25:50 +03:00
JC Brand
6736a5bce4 Test carbons of user's own sent messages.
Found and fixed a bug in the process.
2015-07-03 11:55:13 +02:00
JC Brand
0afa7ec188 Don't carbon copy OTR messages. 2015-07-03 11:41:14 +02:00
JC Brand
0fdf28625b Add a test for forwarded carbon messages. 2015-07-03 11:36:30 +02:00
JC Brand
c2ccb2c693 New test and fixes to the message handler. updates #431 2015-07-02 11:23:52 +02:00
JC Brand
7703b9b33c Bugfix. Check if CSI is enabeld before sending. 2015-07-02 11:23:19 +02:00
JC Brand
b310d8a143 Add more logging to try and debug 431 2015-07-02 10:41:11 +02:00
JC Brand
722c172fbe Ensure that node and domain parts of the user's JID are lower case.
updates #234
updates #431
2015-07-01 19:44:14 +02:00
JC Brand
734d5b65ba Bugfix. Didn't add "bind". 2015-07-01 19:44:14 +02:00
JC Brand
939c626370 Merge pull request #434 from thierrytiti/cleanup
Cleanup references to strophe.roster.js
2015-07-01 17:24:39 +02:00
thierrytiti
f514081a78 Cleanup references to strophe.roster.js 2015-07-01 16:56:36 +02:00
JC Brand
d8c29c7e3f Make sure text is logged instead of XML.
Otherwise the log output is truncated when people copy paste from the console
(for bug reports).

updates #431
2015-06-29 11:57:37 +02:00
JC Brand
114a25a172 Add initial text on writing a converse.js plugin. 2015-06-27 21:49:40 +02:00
JC Brand
b47069b4f6 Add, test and document an API method for setting the user's status.
fixes #367
2015-06-27 21:21:27 +02:00
JC Brand
f5c73cfeaa CSS changes.
- Try to harmonize the color scheme a bit.
- Visually distinguish the toolbar.
- Remove the map file from version control
2015-06-27 09:14:02 +02:00
JC Brand
2c21575719 Use bower to install bourbon and fix path issue. Fixes #417 2015-06-27 08:55:09 +02:00
JC Brand
f73f61e622 Expose is_chatroom attribute on chat boxes returned by the API 2015-06-27 08:44:14 +02:00
JC Brand
0426f47941 Send out less active/inactive chat state messages.
Don't send out 'active' and 'inactive' chat state messages on blur and focus of chat box.
These events happen too often, causing lots of unnecessary messages.
2015-06-27 07:35:11 +02:00
JC Brand
14c868f134 With keepalive, don't send out a presence stanza on each page load. 2015-06-27 07:33:16 +02:00
JC Brand
9f7174dedc Replace $.proxy calls with bind (which is polyfilled in strophe.js) 2015-06-27 06:36:25 +02:00
JC Brand
fc95622d72 Fix path to js file in non_amd.html 2015-06-22 22:28:31 +02:00
JC Brand
c745e1ebff Cherry-pick only those languages from Moment which we support in converse.js 2015-06-22 22:20:02 +02:00
JC Brand
98f6ea8a3f Merge pull request #428 from thierrytiti/chat-with-pending
Enhancement #394 Option to allow chatting with pending contacts
2015-06-22 21:30:24 +02:00
JC Brand
0c67d2117b Bugfix. Just return locale string id. 2015-06-22 20:31:51 +02:00
JC Brand
346a2552cb Provide links to @fpytloun's Django repo. 2015-06-22 20:04:08 +02:00
JC Brand
e999f2c6df Merge branch 'i18n-momentjs' of https://github.com/thierrytiti/converse.js into thierrytiti-i18n-momentjs
Conflicts:
	converse.js

Also refactored the code to adhere to the style guide.
2015-06-22 19:54:51 +02:00
JC Brand
56cd540f5d Update changelog after merge. 2015-06-22 18:55:02 +02:00
JC Brand
ed3be3730c Merge branch 'master' of github.com:emmanuel-florent/converse.js into emmflorent 2015-06-22 18:51:12 +02:00
JC Brand
21a3b44050 Don't send CSI or auto_away/xa stanzas when not auth'd
This is to deal with reconnects. Originally @thierrytiti checked for
`connection.connected` but I think that might still pose a problem when
reconnecting is in process and the user is not yet authenticated again.

This makes pull request #426 unnecessary.
2015-06-22 18:39:12 +02:00
JC Brand
952b5098cd Small improvements to quickstart text. 2015-06-22 14:47:53 +02:00
JC Brand
868435173f Decouple automatic away and XEP-0352 support.
- Add new config option csi_waiting_time for CSI support.
- The auto_away and auto_xa options won't send out CSI stanzas if csi_waiting_time is 0
- Update docs and add tests for both features.
2015-06-22 00:01:31 +02:00
JC Brand
7551c629bd Rely on Strophe's keepalive function instead of our own.
I recently added keepalive functionality to Strophe, similar to what was
already in converse.js. It's stable enough now that we can rely on it
instead.
2015-06-19 18:01:42 +02:00
JC Brand
66386d5b25 Rely on "pagehide" first if it's available.
This is because "pagehide" is fired in more situations and because unload
is not supported on mobile Safari.
2015-06-19 18:00:22 +02:00
JC Brand
c47c8bd7eb Use "strict" mode again and fix styling.
We "use strict" outside of the function that gives issues on Safari.
2015-06-19 17:58:28 +02:00
JC Brand
19065e62b6 Update the style guide. 2015-06-19 17:54:49 +02:00
thierrytiti
479bab2ce4 Enhancement #394 Option to allow chatting with pending contacts 2015-06-18 16:31:30 +02:00
eflorent
fdfd98ac82 Fix simple type on variable name closes #427
At some point an improbable condition reached a typographic error.
2015-06-16 21:03:57 +00:00
JC Brand
785244f15e Add a styleguide to the documentation.
Also update the contributor guidelines to mention the styleguide.
2015-06-16 00:20:28 +02:00
JC Brand
36120cd7b2 Document clean command 2015-06-16 00:20:28 +02:00
JC Brand
90492df100 Merge pull request #425 from 1st8/master
Hide server label in room panel when input is hidden
2015-06-11 16:25:37 +02:00
Christoph
8f7f3e323c Hide server label in room panel when input is hidden by hide_muc_server=true config 2015-06-11 15:06:11 +02:00
JC Brand
ae272611fb Merge pull request #424 from 1st8/master
Small german locale improvements
2015-06-11 10:09:02 +02:00
Christoph
09241fc7ec Translations from po but missing in json 2015-06-11 09:40:54 +02:00
Christoph
f57a24487e Fix unused placeholders in german 'is typing' translation 2015-06-11 09:40:19 +02:00
JC Brand
9a2ed106c7 Bugfix. Don't reconnect when disconnect was due to auth err. 2015-06-07 18:29:36 +02:00
JC Brand
94514dfe1e Attempt to reconnect only after 5 seconds. 2015-06-07 18:26:32 +02:00
JC Brand
d6bb3f8502 Small changes to connection status handler.
* Rename onConnStatusChanged to onConnectStatusChanged
* Provide human readable debug feedback on onConnectStatusChanged
2015-06-07 18:23:29 +02:00
JC Brand
f86ef934e8 Refactor the session resumption code and fix a bug after recent merge.
Split the code into two new methods for the prebind and non-prebind
usecase.
2015-06-05 14:48:16 +02:00