Commit Graph

2447 Commits

Author SHA1 Message Date
JC Brand
6cd9fb5500 Merge branch 'master' into mam 2015-07-14 10:43:35 +02:00
JC Brand
7fd475e2a3 Avoid adding a falsey value as resource. fixes #440 2015-07-14 10:27:40 +02:00
JC Brand
087718d7f0 Expand a test case to also check for received archived messages.
updates #306
2015-07-13 23:16:21 +02:00
JC Brand
1a9771c717 Test code which receives archived messages and calls callback
updates #306
2015-07-12 23:58:07 +02:00
JC Brand
27afd32aeb Test that archive.query takes a Strophe.RSM object.
updates #306
2015-07-12 22:00:32 +02:00
JC Brand
69de033cea Write documentation for the archive API. Also add another test.
update #306
2015-07-12 21:27:22 +02:00
JC Brand
dca0472e80 For archive.query, call callback once after receiving all messages.
updates #306
2015-07-12 16:29:04 +02:00
JC Brand
9abbd1e8f0 Allow a Strophe.RSM object to be passed in to archive.query.
updates #306
2015-07-11 14:55:02 +02:00
JC Brand
ae58e3d1be Merge branch 'master' into mam 2015-07-11 13:53:28 +02:00
JC Brand
1766aa75f2 Bugfix: keepalive and autologin aren't mutually exclusive.
fixes #439
2015-07-11 13:51:44 +02:00
JC Brand
a0d344c7c4 Add better support for the results from a MAM query.
updates #306
2015-07-11 13:40:02 +02:00
JC Brand
7437cf2b42 Bugfix. Closured converse is not defined in utils. 2015-07-11 13:39:52 +02:00
JC Brand
1261a2525d Use Strophe.RSM for result set management. 2015-07-11 12:03:20 +02:00
JC Brand
b77d76b364 Started adding the API for querying archived messages. 2015-07-11 06:36:44 +02:00
JC Brand
eeeaddbe04 Add the ability to read and set MAM preferences. 2015-07-10 15:24:13 +02:00
JC Brand
2442eb74f4 Use Strophe.NS and only advertise enabled features. 2015-07-10 15:07:32 +02:00
JC Brand
5a5d3757ea Move the addEmoticons jQuery plugin to utils.js 2015-07-10 15:02:48 +02:00
JC Brand
3d7f5eda8e Some explanatory comments 2015-07-10 10:35:33 +02:00
JC Brand
4f87fa3c4f Depend on the latest strophe.js 2015-07-05 15:00:14 +02:00
JC Brand
14c64151ab New release: 0.9.4 2015-07-04 17:21:21 +02:00
JC Brand
38434c1d57 Remove two more builds to prevent repo bloat.
These bulids can can still be generated by running `make build`
2015-07-04 17:20:00 +02:00
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