Commit Graph

1041 Commits

Author SHA1 Message Date
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