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

443 Commits

Author SHA1 Message Date
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
af87d59e96 Add analytics for the documentation. 2015-02-07 14:07:31 +01:00
JC Brand
ec51c3660a Add theming documentation and extend the docs on creating builds. 2015-02-05 15:58:51 +01:00
Guillermo Bonvehí
fc0a1d9dbd Added test case for #305 and updated CHANGES.rst 2015-01-23 12:06:10 -03:00
Guillermo Bonvehí
025d032e7a Added change to CHANGES.rst 2015-01-22 17:44:24 -03:00
Guillermo Bonvehi
972fe46bf0 Added build instructions for Windows environments. 
Add Makefile.win example
Add Chocolatey references + required packages
 2015-01-22 13:55:43 -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
ad0f8a336a Update translation docs. 
We now no longer need the step of pasting the json code into a standalong .js
file.
 2015-01-16 23:06:06 +01:00
JC Brand
5379c5f294 Mention polish translations in readme. 2015-01-16 22:57:48 +01:00
JC Brand
cea68e5af0 Merge branch 'chat_states' 
Conflicts:
	docs/CHANGES.rst
 2015-01-16 20:06:53 +01:00
JC Brand
7df30beae2 Merge branch 'add-allow-registration-doc' of https://github.com/gbonvehi/converse.js into gbonvehi-add-allow-registration-doc 
Conflicts:
	docs/CHANGES.rst
 2015-01-07 14:55:14 +01:00
Guillermo Bonvehi
a666ba467d added #295 document allow_registration to changes.rst 2015-01-06 00:29:00 -03:00
Guillermo Bonvehi
3bbdafcb9d Closes #295: allow_registration is now mentioned in configuration doc 2015-01-05 14:08:40 -03:00
Guillermo Bonvehi
f7566d0299 Add related issues solved #252 and #253 to CHANGES.rst 2015-01-05 12:40:01 -03: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
f738698525 Add dev.html specifically for development. Update CHANGES 
removes need to modify index.html all the time.
 2015-01-01 03:49:42 +01:00
JC Brand
3b65a029cf Update af translations. 2014-12-20 11:56:45 +01:00
JC Brand
8576d9487c Add Norwegian translations. 2014-12-20 11:18:44 +01:00
JC Brand
3e03df4745 Add headings to translations docs. 2014-12-20 10:59:39 +01:00
JC Brand
6ea9d1771e Change headings to make TOC clearer. 2014-12-18 14:39:03 +01:00
JC Brand
303a412b38 New release 0.8.6 2014-12-07 22:50:10 +01:00
JC Brand
5142f5637b Mention Gina Moerk's mailing list post. 2014-12-07 12:37:33 +01:00
JC Brand
3bf5eeb4a8 Bugfix. Could not render chat room configuration form. 2014-12-07 11:13:50 +01:00
JC Brand
9359c76c42 Small tweaks to site and doc css. 
Also, in Makefile, remove old HTML build first during "make html" step.
 2014-12-07 10:48:32 +01:00
JC Brand
bcf47d6c7c Add documentation on how to contribute to the docs. 2014-12-07 01:19:01 +01:00
JC Brand
84fd21b38b Configure docs theme. 2014-12-07 00:53:59 +01:00
JC Brand
1be0917a7b Enable chat for the documentation as well. 2014-12-07 00:53:41 +01:00
JC Brand
c8e4f02bf5 Split the documentation out into subfiles. 2014-12-07 00:53:17 +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
92ed46f844 New release 0.8.5 2014-12-01 20:53:08 +01:00
JC Brand
5f41d9779a Update readme and changes 2014-11-25 10:59:59 +01:00
JC Brand
e246335b03 Bugfix. JIDs not shown in chatrooms. fixes #282 2014-11-25 09:55:15 +01:00
JC Brand
9a84e44db4 updates #234 Cannot send/receive messages when JIDs have mixed case 2014-11-16 22:23:24 +01:00
JC Brand
c98e516e39 New release 0.8.4 2014-11-15 16:40:34 +01:00
JC Brand
3f01e94b9b Fixes #177 Setting status to 'offline' does nothing in other clients. 2014-11-15 16:09:36 +01:00
JC Brand
efa56ffb33 Fixes #232 Always get full name from model. 2014-11-15 15:44:33 +01:00
JC Brand
52c3df7cb4 Fixes #260 Sent message carbons are not displayed. 2014-11-15 15:38:15 +01:00
JC Brand
ef8082a31d Fixes #262 Contact requests not shown if page reloaded. 2014-11-15 14:42:56 +01:00
JC Brand
3d6d14c47d Fixes #274 Roster filtering results change with presence changes 2014-11-15 14:03:17 +01:00
JC Brand
d007339415 Fixes #275 Custom status message doesn't reset. 2014-11-15 13:28:11 +01:00
JC Brand
fdb80e3d2c Save the MUC domain to session storage. 
Fixes #237
Fixes #238
 2014-11-15 13:17:40 +01:00
JC Brand
6cdd793758 Update docs due to recent pull requests. 2014-11-15 11:04:33 +01:00
JC Brand
25b56e3538 Rename "buddy" to "contact". Fixes #226 2014-11-09 18:07:06 +01:00
JC Brand
1bb7900bdd Update changelog 2014-11-09 13:11:05 +01:00
JC Brand
6100aaf114 Refactor the API. updates #46 
API methods now consist of simple accessors and mutators that are logically
grouped.
 2014-11-09 13:06:09 +01:00
JC Brand
7bdb7ae5aa Revert "Small change to remove need for jquery-private-external.js updates #269" 
This reverts commit d33faa53d0.

Conflicts:
	src/build-no-jquery.js
 2014-10-30 15:25:53 +01:00
JC Brand
d33faa53d0 Small change to remove need for jquery-private-external.js updates #269 2014-10-30 11:57:25 +01:00
JC Brand
147e62d000 Don't increment unread msgs counter for <paused> chat state. 
Also update release notes. updates #267
 2014-10-30 11:48:58 +01:00
JC Brand
96b6b55257 Update CHANGES 2014-10-28 18:19:24 +01:00
JC Brand
8dedef7002 Create new PO file for Polish. 
Also update documentation to mention msginit.
 2014-10-21 13:18:26 +02:00
JC Brand
4bcf26114c Add docs for the 2 new API methods. updates #46 2014-10-12 11:03:35 +02:00
JC Brand
48dd0cc674 Trying to organize doc chapters a bit more logically. 2014-10-12 11:03:25 +02:00
JC Brand
5b46e27c41 Add 2 new API methods. updates #46 
Added openChatBox and getChatBox.
 2014-10-12 10:34:33 +02:00
Sergey Fedoseev
adbcf01a98 index.rst: change duplicated allow_muc to allow_otr 2014-10-01 14:01:45 +06:00
Sergey Fedoseev
0c840aa8d4 index.rst: remove trailing spaces 2014-10-01 14:01:40 +06:00
JC Brand
5bad6b02b6 Clarify how one should use prebind and keepalive together. 2014-09-30 12:27:53 +02:00
JC Brand
64847bcb96 Add new event noResumeableSession 2014-09-26 17:20:52 +02:00
JC Brand
c71b03094d Move website specific code out of main.js and into index.html. updates #229 
Otherwise, we get errors "Cannot read property top of undefined".
 2014-09-26 11:33:47 +02:00
JC Brand
b803267555 Bugfix. Return after attaching with prebind data. 2014-09-24 10:57:07 +02:00
JC Brand
d8bf1961a7 Making a 0.8.3 release. 
The 0.8.2 release didn't include new builds due to an unnoticed build error.
 2014-09-22 18:17:40 +02:00
JC Brand
05d58f1d29 Wrong minor release num 2014-09-22 18:01:08 +02:00
JC Brand
56ec4cf7bc New release 0.8.2 2014-09-22 17:57:56 +02:00
JC Brand
072f9e8534 Add updated hebrew translations. 2014-09-22 17:06:22 +02:00
JC Brand
7cf8dc6bee Fixed Non-AMD example. fixes #220 2014-09-22 16:10:20 +02:00
JC Brand
6b4b94d45f RestructuredText markup error fixed. updates #187 2014-09-22 15:07:50 +02:00
JC Brand
82617918b1 Add API section to docs and regenerate. 2014-09-22 15:04:28 +02:00
JC Brand
481ea9e7d6 Generate HTML docs. 2014-09-17 22:10:12 +02:00
JC Brand
ba6b72011c Show groupchat messages where user is mentioned in bold. 2014-09-17 21:40:19 +02:00
JC Brand
3a30f30fb7 Bugfix concerning trimmed chats. 
Chats were being trimmed even though there was enough room.
 2014-09-15 20:08:13 +02:00
JC Brand
45875afd64 Add docs on keepalive setting. 2014-09-06 23:40:41 +02:00
JC Brand
07b7393088 Update translation docs to mention paths in main.js 2014-09-06 14:12:31 +02:00
JC Brand
a3e540fa67 Provide feedback if a chat room command didn't work. 2014-09-05 19:36:31 +02:00
JC Brand
82659e87d7 Add extra chat room commands: /nick, /mute and /voice. 
Also document the available chat room commands.
 2014-09-05 18:27:32 +02:00
JC Brand
78ac525e18 Add cuationary note against using localStorage (instead of sessionStorage) 2014-09-04 10:27:24 +02:00
JC Brand
ae90c7420e Update docs and rename option to use underscore instead of dash. 2014-09-03 20:15:46 +02:00
JC Brand
3aaa8df41a Notification sound now also plays when nickname is mentioned in chat room. 
updates #62
 2014-09-03 18:47:24 +02:00
JC Brand
cebf8c2451 See below... 
* Update docs on message carbons and stanza forwarding.
* Mention latest bug fix.
 2014-09-02 16:53:44 +02:00
JC Brand
bf0d0320c5 Emit an event after the user has sent out a chat room invitation. refs #215 2014-08-31 21:54:17 +02:00
JC Brand
ff32866f21 Mention live filter bugfix and add tests for it. updates #212 2014-08-31 21:20:28 +02:00
JC Brand
156d231c95 Converse.js now responds to XEP-0030 Service discovery requests. 2014-08-31 14:14:50 +02:00
JC Brand
53f87b566e Include the search_contacts templates. updates #216 2014-08-29 16:09:39 +02:00
JC Brand
c9958182ff Making 0.8.1 release 2014-08-23 11:15:56 +02:00
JC Brand
83c68696cd Update the docs and add section about sound notifications. updates #62 2014-08-23 11:04:33 +02:00
JC Brand
73528f4ced Improved the docs styling and regenerate 2014-08-23 10:00:14 +02:00
JC Brand
a864a7c4ff Regenerated docs 2014-08-23 09:43:47 +02:00
JC Brand
882bbcb02e Add support for sound notifications. updates #62 
(on incoming messages)
 2014-08-20 21:00:28 +02:00
JC Brand
1441f4ab64 Add text input to act as live filter. updates #212 2014-08-07 21:33:19 +02:00
JC Brand
e3dbbf2eae Merge zh translations and update CHANGES.rst for 0.8 release. 2014-08-04 23:24:41 +02:00
JC Brand
8c20388ba9 Merge branch 'groups-refactor' 
Conflicts:
	index.html
 2014-08-04 20:15:45 +02:00
JC Brand
0c7252f919 Mention new feature, roster groups. updates #83 2014-08-04 19:49:29 +02:00
JC Brand
3984aadb9f More work (with tests) on showing roster items under groups. 
updates #83
 2014-07-29 19:53:57 +02:00
JC Brand
6c30d331cd Update CHANGES.rst 2014-07-25 16:02:46 +02:00
JC Brand
1705aa8f48 Bugfix. Handle case where user accepts request. 
But other user is not online to quickly subscribe back.
 2014-07-23 19:11:29 +02:00
JC Brand
848d502332 In docs: Mention alternative to using make 2014-07-23 13:18:09 +02:00
JC Brand
02083ba0a8 Update changelog 2014-07-21 11:28:01 +02:00
JC Brand
7c9a86293d Rename 'enable_message_carbons' to 'message_carbons' 2014-07-19 16:43:56 +02:00
JC Brand
df351d496d Fix vertical resizing of chat boxes. 
This fix breaks compatibility with IE8
 2014-07-17 19:19:32 +02:00
JC Brand
53f38dcc71 Two changes, see below: 
* Call refreshWebkit hack when opening a chat room
* New event emitted when a chat room is opened.
 2014-07-17 19:18:48 +02:00
JC Brand
ac6a3cb26c Mention windows. updates #187 2014-07-17 17:52:08 +02:00
JC Brand
3423f7bc74 Bugfix. fixes #180 2014-07-17 17:44:44 +02:00
JC Brand
66e45f91e9 Bugfix. First render before fetching msgs. Fixes #191 2014-07-17 17:29:05 +02:00
JC Brand
9846f89a2c If no resource exists, add one which mentions converse.js 
updates #123
 2014-07-15 07:57:28 +02:00
JC Brand
fe3e9f5294 Bugfix, xhr_user_search_url is not a global. Fixes #192 2014-07-11 16:12:56 +02:00
JC Brand
012cbfb61a Rename events. 
Remove the "on" prefix. Events are listened to via "on" method, so it's
redundant.
 2014-07-06 18:31:17 +02:00
JC Brand
ad90e74260 Simplified Chinese translations, courtesy of Lancelot 2014-07-06 17:56:42 +02:00
JC Brand
63ad3e135d Update readme 2014-06-30 18:59:19 +02:00
JC Brand
8aedc3fcf7 Integrate backbone.browserStorage. Fixes #176 
Data is now by default cached in sessionStorage and not localStorage.
Can be configured via the "storage" option.
 2014-06-30 18:53:58 +02:00
JC Brand
f0091c9c9c Control box toggle's class has been changed. 2014-06-21 11:32:05 +02:00
JC Brand
0c0a3f86b6 Remove the need for having an HTML snippet in the body. 2014-05-13 09:26:57 +02:00
JC Brand
b307d5170b Date handling is now done with moment.js 2014-04-25 23:44:10 +02:00
JC Brand
30fe6de7c3 Update CHANGES.rst 2014-04-24 19:24:19 +02:00
JC Brand
517e600114 Expand documentation on the new visible_toolbar_buttons config option 2014-04-24 18:10:47 +02:00
JC Brand
d69a165b05 Use strict mode. Emit an event when the connection drops. 2014-04-24 09:51:21 +02:00
JC Brand
f4856e062c Prefix all CSS styles with #conversejs. Updates #130 
Also fix some margins/padding that do wonky when the Github theme stylesheets
aren't available.
 2014-04-19 08:08:07 +02:00
JC Brand
1dff3ac002 Merge branch '0.8' 
Conflicts:
	CONTRIBUTING.rst
	Makefile
	README.rst
	bower.json
	docs/CHANGES.rst
	docs/doctrees/index.doctree
	docs/html/_sources/index.txt
	docs/html/index.html
	docs/html/searchindex.js
	docs/source/index.rst
 2014-04-19 07:05:00 +02:00
JC Brand
eca42fbb2f Add support for XEP-0280 Message Carbons. updates #132 2014-04-19 06:58:26 +02:00
JC Brand
968f8bb223 Add new configuration setting "forward_messages". 
What was before default behavior is now optional and disabled by default.
 2014-04-19 06:18:17 +02:00
JC Brand
14d90bc99c Upgrade dependencies to their latest versions 2014-04-19 05:12:24 +02:00
JC Brand
2a83d557d1 Order Makefile a bit more and bump release number 2014-04-18 17:47:47 +02:00
JC Brand
a9da15bb2f New BOSH service address 
Conflicts:
	docs/doctrees/index.doctree
	docs/html/_sources/index.txt
	docs/html/index.html
	docs/html/searchindex.js
 2014-04-09 17:24:37 +02:00
JC Brand
01d8047fc2 Mention that git is needed 
Conflicts:
	docs/source/index.rst
 2014-04-09 17:23:44 +02:00
JC Brand
e6cff4e807 New BOSH service address 2014-04-09 17:03:04 +02:00
JC Brand
ee6a30b495 Mention that git is needed 2014-04-04 09:01:40 +02:00
JC Brand
df599238f8 Update contributors text, readme and add new license (MPL) 2014-03-22 02:11:34 +02:00
JC Brand
d5a41e1739 Clean up readme 2014-03-21 23:20:55 +02:00
JC Brand
b552b885f0 Add MakeFile target for setting up dev env. 2014-03-14 21:01:39 +02:00
JC Brand
9849daacf9 Merge branch 'master' into 0.8 
Conflicts:
	bower.json
	converse.js
	docs/CHANGES.rst
	spec/chatbox.js
	tests/utils.js
	tests_main.js
 2014-03-09 08:18:00 +02:00
JC Brand
77e6c0a490 Two more typos 2014-03-05 09:02:56 +02:00
JC Brand
5e8b61858c Fix release version typo 2014-03-05 08:51:24 +02:00
JC Brand
9b3af57d13 Release version 0.7.4 2014-03-05 08:44:01 +02:00
JC Brand
74779afd66 Ensure that URLs in messages are properly escaped 2014-03-05 08:03:52 +02:00
JC Brand
25cc229019 Refactor message handling 
- use the same method for both normal and OTR messages
- fix /me actions for OTR messages
- rename messaging methods to minimize ambiguity

Conflicts:
	converse.js
	tests/utils.js
 2014-03-05 01:46:19 +02:00
JC Brand
c38e4f1c81 Properly define the crypto dependencies. Fixes #125 2014-03-05 00:38:47 +02:00
JC Brand
ec39e6e802 Emit new event onChatBoxToggled 2014-03-04 20:16:03 +02:00
JC Brand
1ce7620b88 Merge remote-tracking branch 'origin' into 0.8 
Conflicts:
	converse.js
	docs/CHANGES.rst
	index.html
 2014-02-23 02:54:35 +02:00
JC Brand
0cffd78ff1 Get ready to release 0.7.3 of converse.js 2014-02-23 01:11:35 +02:00
JC Brand
f6e5b07729 Added a section to the documentation concerning OTR 2014-02-12 19:32:25 +02:00
JC Brand
fb1ed29c8f Bump release to version 0.7.3 2014-02-12 14:41:56 +02:00
JC Brand
4190727c6e Mention mailing list in README and update HTML docs. 2014-02-12 13:03:44 +02:00
JC Brand
94c135a6d8 Merge branch 'otr-by-default' of git://github.com/Aupajo/converse.js into Apajo-otr-by-default 
Conflicts:
	converse.js

Fixes #102
 2014-02-12 12:52:57 +02:00
JC Brand
18d6a91881 Add API method to retrieve the SID. Fixes #93 2014-02-12 12:37:39 +02:00
JC Brand
c3b98fd2fd Refactor and improve the reconnecting code and make it configurable 
There is still the apparent problem that after reconnecting, event listeners
hvae to bre reregistered (which doesn't happen currently).

So messages can be sent but not received...
 2014-02-11 13:14:36 +02:00
JC Brand
d0f023dbb1 Allow the OTR private key to be cached. Updates #111 2014-01-31 18:07:44 +02:00
JC Brand
42b28b8425 Update docs to provide examples of server-side prebind code. Updates #116 2014-01-30 05:01:10 +02:00
JC Brand
cd144a98ca Add Hebrew translations 2014-01-28 09:41:52 +02:00
JC Brand
24b205536a Fix syntax err in Indonesian translations and update CHANGES 2014-01-28 09:32:21 +02:00
JC Brand
ee07226e8f Fix RST typo 2014-01-28 03:48:43 +02:00
JC Brand
62f6997a25 Chat boxes and rooms can now be resized vertically 
The new size is not stored/persisted.
 2014-01-23 00:55:52 +02:00
JC Brand
7f8c85f10a Integrate Japanese translations 2014-01-08 15:44:13 +02:00
Pete Nicholls
0b4fe330d6 Document show_call_button option 2013-12-26 15:02:28 +13:00
JC Brand
e3e8bf6c69 New release 0.7.2 2013-12-18 17:07:11 +02:00
JC Brand
478653aebd Bugfix. Wrong number of online contacts shown. Fixes #97 2013-12-18 16:48:02 +02:00
JC Brand
4186bf3ca3 Throw event onRosterViewUpdated whenever the roster HTML changes. Fixes #101 2013-12-18 16:30:19 +02:00
JC Brand
8633d23738 Sanitize text messages to disable Javascript injection attacks. 
Thanks to hejsan.
 2013-12-18 13:51:59 +02:00
JC Brand
cbde2a1d49 Make the fetching of VCards optional. Updates #100 2013-12-17 19:24:36 +02:00
JC Brand
603087c34b Refined events emitting docs. 2013-12-16 15:27:33 +02:00
JC Brand
4877a5adb6 Update changes 2013-12-15 18:28:22 +02:00
JC Brand
9a8975f5b0 Add two more emitted events. Updates #48 2013-12-15 18:04:51 +02:00
JC Brand
d95610cbd4 Add documentation for events emitted. Updates #48 2013-12-15 17:06:27 +02:00
JC Brand
762ba21c7d Update text on prebinding. 2013-12-14 11:58:47 +02:00
JC Brand
1020e6b3b5 Document the API methods we'll need. Updates #46, Updates #87 2013-11-24 16:23:37 +02:00
JC Brand
526f10d79e Add Troubleshooting section to docs and regenerate HTML. Updates #86 2013-11-24 16:18:04 +02:00
JC Brand
dc708e70c9 Update docs. 
- Add link to Movim's page on BOSH servers
- Update the text around prebinding a bit.
 2013-11-19 22:56:48 +02:00
JC Brand
8cd05206cb Bump release to 0.7.1 2013-11-17 17:15:07 +02:00
JC Brand
512a463750 Create 3 different builds. 
* converse.min.js
* converse-no-otr.min.js (Without OTR encryption)
* converse-no-locales-no-otr.min.js (Without OTR encryption or any translations)
 2013-11-17 16:55:38 +02:00
JC Brand
b140596b50 Bump version to 0.7 and minify css and js 2013-11-13 08:19:14 +02:00
JC Brand
cd3540de55 Finally figured out the subscription='from' ask='subscribe' thing 2013-11-06 19:38:16 +02:00
JC Brand
38c26013d0 Simplify the boilerplate HTML require even more. 
Use id 'conversejs' instead of 'chatpanel'.

The controlbox toggle is now generated via a backbone view, you don't need to
manually include it in your markup.
 2013-10-20 22:42:34 +02:00
JC Brand
90a5df87d0 Move licenses to docs dir 2013-10-20 21:48:36 +02:00
JC Brand
81f4d19a64 Add option to set the XHR user search URL. Fixes #51 2013-10-20 18:36:07 +02:00
JC Brand
1fa47c6633 Merge branch '0.6.x' 
Conflicts:
	converse.min.js
	docs/html/searchindex.js
 2013-10-16 11:50:55 +02:00
JC Brand
29fc658c05 New release, 0.6.6 2013-10-16 11:26:22 +02:00
JC Brand
b6a6562de9 Merge branch '0.6.x' 
Conflicts:
	Makefile
	converse.css
	converse.min.css
	converse.min.js
	docs/doctrees/index.doctree
	docs/html/index.html
	docs/html/searchindex.js
 2013-10-08 22:12:12 +02:00
JC Brand
90be11aee8 New release: 0.6.5. 
Bumped version
Updated release date in CHANGES.rst
Minified CSS and JS
Generate HTML docs
 2013-10-08 09:11:04 +02:00
JC Brand
37f2f8ca0c Merge branch '0.6.x' 
Conflicts:
	converse.js
 2013-10-05 23:11:17 +02:00
JC Brand
3bf27e8b5f New config option `show_only_online_users` 
If true, only users with a status of 'online' will be shown in the contacts
roster.
 2013-10-05 23:07:42 +02:00
JC Brand
fe7c297acc Update docs and regenerate 2013-10-05 08:48:25 +02:00
JC Brand
b6324a24ff Generate docs 2013-10-03 16:31:18 +02:00
JC Brand
7f371b883e Add config option `allow_contact_requests` to toggle user adding 2013-10-03 15:58:09 +02:00
JC Brand
feaff64aab Add setting to enable/disable MUC 2013-10-03 13:16:26 +02:00
JC Brand
f80fd2a64c Mention case where grunt is not installed globally 2013-09-17 12:10:59 +02:00
JC Brand
7432cd2406 Regenerated docs (new version number). Add release checklist 2013-09-15 21:37:56 +02:00
JC Brand
9c75683354 Bump versions and re-minified 2013-09-15 21:35:03 +02:00
JC Brand
6b3611606b Update doc details on reverse-proxying the connection manager 2013-09-13 16:10:37 +02:00
JC Brand
84915290b2 Correct version is 0.6.3 2013-09-12 16:00:31 +02:00
JC Brand
008bac4f21 Bump version and minimize files. 2013-09-12 15:51:30 +02:00
JC Brand
68a9909311 Bump version everywhere and regenerate docs. 2013-09-12 15:33:11 +02:00
JC Brand
6c84f1e94c Regenerated docs 2013-09-12 11:14:58 +02:00
JC Brand
0ef6a727eb Add new Makefile step "merge" and document it. 2013-09-12 11:14:45 +02:00
JC Brand
bc971ed853 Small update in translations section. Regenerated docs. 2013-09-03 12:38:54 +02:00
JC Brand
fde8bb3500 New minified files. Bump version to 0.6.1 2013-08-30 00:00:34 +02:00
JC Brand
202483130d Bump version number for release. 2013-08-28 00:47:35 +02:00
JC Brand
464d42cf62 Updated docs with info on almond build. 2013-08-25 23:41:04 +02:00
JC Brand
f4eeb50438 Update CHANGES.rst and newest version number 2013-08-25 12:58:07 +02:00
JC Brand
c7029d8771 Regenerated docs 2013-08-24 16:11:36 +02:00
JC Brand
810f5dec95 Merge branch 'sane-mockup' 
Conflicts:
	docs/html/searchindex.js
	index.html
 2013-08-24 15:44:58 +02:00
JC Brand
bde8913510 Mention i18n/locales setting 2013-08-24 03:09:57 +02:00
JC Brand
5551ff0127 When prebinding, attach automatically. Fixes #41 
This requires that valid jid, rid, sid and bosh_service_url values be given (or
a valid connection object that was already attached).

Updated the docs to reflect these changes.
 2013-08-23 00:51:32 +02:00
JC Brand
b7ecf39982 Update docs to mention new way to minify. Fixes #39 2013-08-20 22:53:19 +02:00
JC Brand
fc4bec1e9c Regenerated docs 2013-08-16 11:27:29 +02:00
JC Brand
cac9d9c55e Mention debug option in docs 2013-08-16 11:25:58 +02:00
JC Brand
ae96dc1e64 Merge branch 'master' into mockup 
Conflicts:
	docs/html/_static/stylesheet.css
	docs/html/searchindex.js
 2013-08-15 18:01:26 +02:00
JC Brand
5be5428ca7 Remove pickle, which causes many merge errors 2013-08-13 11:23:04 +02:00
JC Brand
30b61fb40a Add info on facebook integration 2013-08-13 11:19:40 +02:00
JC Brand
7f7bdbb5fc Extend docs with info on the HTML snippet converse expects. updates #31 2013-08-12 10:37:13 +02:00
JC Brand
b681c3e58e Tweak docs css 2013-08-09 09:25:30 +02:00
JC Brand
f0b01a958e Merge branch 'master' into gh-pages 
Conflicts:
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
 2013-08-09 09:23:32 +02:00
JC Brand
7010c15d35 Update development section of the docs 2013-08-09 09:21:20 +02:00
JC Brand
c62a4ae575 Merge branch 'master' into gh-pages 
Conflicts:
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
 2013-08-04 18:51:33 +02:00
JC Brand
a13a69c493 Bump version to 0.5.1 2013-08-04 18:48:29 +02:00
JC Brand
5f97f7ea28 Merge branch 'master' into gh-pages 
Conflicts:
	build.js
	converse.min.css
	converse.min.js
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
	index.html
 2013-07-30 23:40:59 +02:00
JC Brand
ab02828fee 'build' grunt task was renamed to 'fetch'. Updated docs 2013-07-30 21:43:49 +02:00
JC Brand
acac662b04 Update docs with info on tests 2013-07-29 23:22:41 +02:00
JC Brand
4a3f38e570 Update docs with info on how to set up the dev env 2013-07-29 23:13:55 +02:00
JC Brand
3746d332a3 Merge branch 'master' into gh-pages 
Conflicts:
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
	index.html
 2013-07-27 02:07:33 +02:00
JC Brand
07e87d7b50 docs w.r.t using development files with(out) require.js. Updates #9 2013-07-27 01:48:40 +02:00
JC Brand
e2ed7757ff Merge branch 'master' into gh-pages 
Conflicts:
	CHANGES.rst
	docs/doctrees/environment.pickle
	index.html
 2013-07-27 01:23:27 +02:00
JC Brand
5c5564b120 Remove no-locales file, it wasn't built properly 
Update docs to not mention it

Conflicts:
	docs/doctrees/environment.pickle
 2013-07-25 00:22:57 +02:00
JC Brand
01fb643378 Remove no-locales file, it wasn't built properly 
Update docs to not mention it
 2013-07-25 00:21:42 +02:00
JC Brand
05c2c95b5f Merge branch 'master' into gh-pages 
Conflicts:
	CHANGES.rst
	converse.min.js
 2013-07-25 00:19:13 +02:00
JC Brand
edc578b8b7 Update documentation 2013-07-25 00:09:09 +02:00
JC Brand
5900798cbd Add note to prebind section 2013-06-03 22:51:03 +02:00
JC Brand
5cf056eced Add note to prebind section 2013-06-03 22:48:34 +02:00
JC Brand
7d3eaaa1c1 Add more info on prebinding/session support 2013-06-03 22:42:34 +02:00
JC Brand
9b5c9138fb Add a config option to by default show the controlbox 2013-06-02 21:40:05 +02:00
JC Brand
08d69b3a3e Add a note to docs about locales.js 2013-06-02 19:50:18 +02:00
JC Brand
4b4f50c2d6 Updated documents. 2013-06-02 00:23:24 +02:00
JC Brand
c2b338db24 Small updates to the documentation. 2013-05-28 21:02:11 +02:00
JC Brand
23219d0c41 Expand the docs 
Try to add more information on the goals around Converse.js and on how to get
started.
 2013-05-22 19:29:46 +02:00
JC Brand
1311ae0652 Make config options alphabetical. Add hide_muc_server 2013-05-21 16:48:19 +02:00
JC Brand
93c0095f33 Update the docs with info on connection managers etc. 2013-05-17 12:48:05 +02:00
JC Brand
df7f1ccf2c Use feature discovery on chatrooms 2013-05-09 15:39:27 +02:00
JC Brand
eabdce2521 Trying to figure out why github pages don't render _static 2013-04-26 22:09:29 +02:00
JC Brand
ce10bc4253 Add doctrees dir. 2013-04-26 22:09:00 +02:00
JC Brand
2708d976db typo and comment 2013-04-26 21:52:26 +02:00
JC Brand
63508ae4cd Add a custom sphinx theme 
Makes the docs look similar to the main site
 2013-04-26 21:49:26 +02:00
JC Brand
2442e1ea71 Add initial documentation 2013-04-26 21:01:39 +02:00
JC Brand
9d4d651d1a Update docs regarding bosh_service_url setting 2013-04-25 00:16:16 +02:00
JC Brand
f6a6456f59 Notes formatting 2013-04-20 11:47:29 +02:00
JC Brand
4c3b2b8d30 Add docs directory 
And a file with some preliminary notes
 2013-04-20 11:30:18 +02:00