Commit Graph

75 Commits

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