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

111 Commits

Author SHA1 Message Date
JC Brand
b8e096ffd1 Merge branch '0.6.x' 
Conflicts:
	converse.js
	index.html

Add config option ``allow_contact_requests`` to toggle user adding
 2013-10-03 14:25:39 +02:00
JC Brand
0d6e29f067 Add config option `allow_contact_requests` to toggle user adding 2013-10-03 14:22:33 +02:00
JC Brand
e4c9fcbc4e Merge branch '0.6.x' 
Conflicts:
	converse.css
	converse.js
	index.html

Add allow_muc config option
 2013-10-03 13:53:47 +02:00
JC Brand
feaff64aab Add setting to enable/disable MUC 2013-10-03 13:16:26 +02:00
JC Brand
32593b755f Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master 
Conflicts:
	locale/locales.js

Conflicts:
	index.html

Add Russian translation by bkocherov (actually made against master branch)
 2013-10-03 09:10:24 +02:00
JC Brand
b13ae5af69 Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master 
Conflicts:
	locale/locales.js
 2013-10-03 08:58:25 +02:00
Boris Kocherov
f21dffbc27 Add Russian translation. 2013-09-25 14:49:17 +04:00
JC Brand
d1cc7b2cf0 Mention OTR support 2013-09-15 22:28:01 +02:00
JC Brand
6517b9bb9d Merge branch 'otr' 
Conflicts:
	CHANGES.rst
	locale/af/LC_MESSAGES/af.js
	locale/af/LC_MESSAGES/converse.json
	locale/af/LC_MESSAGES/converse.po
	locale/converse.pot
	locale/de/LC_MESSAGES/converse.po
	locale/en/LC_MESSAGES/converse.po
	locale/es/LC_MESSAGES/converse.po
	locale/fr/LC_MESSAGES/converse.po
	locale/it/LC_MESSAGES/converse.po
	locale/pt_BR/LC_MESSAGES/converse.po
 2013-09-15 22:08:34 +02:00
JC Brand
9c75683354 Bump versions and re-minified 2013-09-15 21:35:03 +02:00
JC Brand
6768924884 Bump versions and re-minified 2013-09-15 21:29:02 +02:00
JC Brand
d402ed8e8e Merge branch 'master' into otr 
Conflicts:
	locale/af/LC_MESSAGES/converse.po
	locale/converse.pot
 2013-09-12 20:57:51 +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
00cb015d6a Merge branch 'master' into otr 
Conflicts:
	converse.js
 2013-09-10 23:33:30 +02:00
JC Brand
36c2a2ac45 Add option to hide the toolbar 2013-09-08 16:56:38 +02:00
JC Brand
ac3ac98c59 Allow chat statuses to be translated. 
Add conf setting for allowing OTR.
 2013-09-08 16:39:46 +02:00
JC Brand
58e6451ab9 Mention FR 2013-09-02 12:35:14 +02:00
JC Brand
fde8bb3500 New minified files. Bump version to 0.6.1 2013-08-30 00:00:34 +02:00
JC Brand
5cb74239c3 Update security info 2013-08-29 15:07:14 +02:00
JC Brand
202483130d Bump version number for release. 2013-08-28 00:47:35 +02:00
JC Brand
79be6ea693 Add section about integration into other frameworks 
Also expand on the security question.
 2013-08-28 00:26:52 +02:00
JC Brand
9628189382 Can't call i18n.translate directly if we bundle without i18n support 2013-08-26 16:21:32 +02:00
JC Brand
4ae20ee1b7 Set release date 2013-08-25 23:42:49 +02:00
JC Brand
0fefc55ae1 Update CHANGES.txt. 2013-08-25 23:34:35 +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
35d8f1d7e8 Use dev scripts with debug option 2013-08-24 02:16:26 +02:00
JC Brand
72d0f566fc Merge branch 'master' into mockup 2013-08-15 20:47:50 +02:00
JC Brand
66b92fedcb Add debug option explicitly 2013-08-15 20:43:39 +02:00
JC Brand
9b9bf1ce89 Fix markup 2013-08-15 19:30:33 +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
a5051f0061 Fix markup 2013-08-15 17:58:28 +02:00
JC Brand
af1a08e9b6 Docs are more stable and featured now. 2013-08-13 11:29:56 +02:00
JC Brand
861887fd77 Initial markup, testing out font icons 2013-08-09 20:25:21 +02:00
JC Brand
944593de8a Merge branch 'master' into gh-pages 2013-08-05 09:39:43 +02:00
JC Brand
405d308ae0 Remove references to online tests URL. 
Testing requires jasmine and require which are not bundled anymore but instead
installed via bower.
 2013-08-05 09:38:34 +02:00
JC Brand
4b48e8ac69 Merge branch 'master' into gh-pages 2013-08-05 09:28:18 +02:00
JC Brand
2d4a14ac2d Don't expose the Strophe connection object globally. 
Instead, expose only the initialize and onConnected functions.
Updated the tests to work with this.
 2013-08-05 09:25:29 +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
1f772f4691 Merge branch 'master' into gh-pages 
Conflicts:
	index.html
 2013-08-04 18:46:51 +02:00
JC Brand
eb39faa732 Re-minified files (without version numbers). 2013-08-04 18:43:55 +02:00
JC Brand
f0a2f25916 Fix download links 2013-08-02 23:26:14 +02:00
JC Brand
a01f954397 Fix download links 2013-08-02 23:25:41 +02:00
JC Brand
7c0e7049f2 Pin version in index.html 2013-07-30 23:42:05 +02:00
JC Brand
163d8f60d9 Pin version in index.html 2013-07-30 23:41:28 +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
ce1dce629c Create new release, version 0.5.0 2013-07-30 23:17:13 +02:00
JC Brand
868ae82bb0 Fixed paths to bower's components dir 2013-07-29 22:40:19 +02:00