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

1462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JC Brand
e85eb66771 Merge branch '0.6.x' 
Conflicts:
	index.html
 2013-10-03 09:11:48 +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
JC Brand
22395999ca Merge branch '0.6.x' 
Conflicts:
	converse.css

I didn't merge converse.css or converse.min.css, instead fell back to master versions.
 2013-10-03 08:41:14 +02:00
JC Brand
3417e8fc08 Update CHANGES.rst 2013-10-03 08:36:57 +02:00
JC Brand
e9102a9621 Merge branch '0.6.x' of git://github.com/w3host/converse.js into w3host-0.6.x 2013-10-03 08:16:26 +02:00
Boris Kocherov
51d0f7d8a3 Merge branch 'master' of https://github.com/jcbrand/converse.js 2013-09-29 17:32:40 +04:00
Boris Kocherov
155b8e6a40 Russian translation: continue translation. 2013-09-29 17:30:38 +04:00
JC Brand
e4a1ccf1c0 Remove old classes before adding new ones. Updates #38 2013-09-26 21:48:45 +02:00
JC Brand
122cb937fe Fetch vCard once a roster contact is added. Updates #38 
This will happen in the background and in the meantime roster contacts will
appear under their JIDs.
 2013-09-26 21:48:44 +02:00
JC Brand
3dfcd3c04a Remove old classes before adding new ones. Updates #38 2013-09-26 21:46:10 +02:00
w3host
d0e9618efa Hungarian translation 2013-09-26 15:19:14 +02:00
JC Brand
b36e6bbce1 Fetch vCard once a roster contact is added. Updates #38 
This will happen in the background and in the meantime roster contacts will
appear under their JIDs.
 2013-09-26 11:53:47 +02:00
Boris Kocherov
f21dffbc27 Add Russian translation. 2013-09-25 14:49:17 +04:00
JC Brand
aad8de02d0 Merge pull request #54 from TracyWebTech/css-clash 
Avoiding clash with bootstrap
 2013-09-20 00:03:33 -07:00
Sergio Oliveira
0bf807fd94 Avoiding clash with bootstrap 
Using #chatpanel in front of every css class to avoid css name clashing
with bootstrap and other css frameworks
 2013-09-19 13:05:29 -03:00
JC Brand
1d14a2b950 Use const for enter key 2013-09-18 09:25:40 +02:00
JC Brand
f80fd2a64c Mention case where grunt is not installed globally 2013-09-17 12:10:59 +02:00
JC Brand
46fe0ac511 Mention case where grunt is not installed globally 2013-09-17 12:07:42 +02:00
JC Brand
3785737820 Mention OTR support 2013-09-17 09:43:59 +02:00
JC Brand
054093682d Browser tests work but phantomJS tests fail 
will have to debug later
 2013-09-15 23:18:54 +02:00
JC Brand
d1cc7b2cf0 Mention OTR support 2013-09-15 22:28:01 +02:00
JC Brand
40c9c397de Updated js translation files (after OTR merge) 2013-09-15 22:20:32 +02:00
JC Brand
5598dd0379 Add make command po2json and run it 2013-09-15 22:16:33 +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
04c71d5bae Merge branch '0.6.x' 
Conflicts:
	CHANGES.rst
 2013-09-15 21:45:41 +02:00
JC Brand
2c884c05a3 Use * for rst bullet rendering 2013-09-15 21:44:55 +02:00
JC Brand
02978eca5a Regenerated docs (new version number). Add release checklist 2013-09-15 21:39:58 +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
bc31781309 Update Makefile to auto-bump version number 2013-09-15 21:35:02 +02:00
JC Brand
6768924884 Bump versions and re-minified 2013-09-15 21:29:02 +02:00
JC Brand
7922f17a79 Update Makefile to auto-bump version number 2013-09-15 21:09:42 +02:00
JC Brand
2be1b58721 Update DE and AF translations 2013-09-15 11:48:43 +02:00
JC Brand
a8fbfad073 update json and js pt-BR translation files 2013-09-15 11:48:43 +02:00
Sergio Oliveira
154df6c2d5 Updating pt-br translations 2013-09-15 11:48:43 +02:00
JC Brand
6dd0160a5b Update DE and AF translations 2013-09-15 11:46:41 +02:00
JC Brand
40b8435a19 update json and js pt-BR translation files 2013-09-15 11:25:40 +02:00
JC Brand
ce9f63c95f Merge pull request #50 from TracyWebTech/master 
Updating pt-br translations
 2013-09-15 02:22:31 -07:00
Sergio Oliveira
fc3e2d2714 Updating pt-br translations 2013-09-13 16:59:47 -03:00
JC Brand
2cab56b66c Update af translations 2013-09-13 16:10:37 +02:00
JC Brand
4610dfb24c Regenerated POT and PO files 2013-09-13 16:10:37 +02:00
JC Brand
6b3611606b Update doc details on reverse-proxying the connection manager 2013-09-13 16:10:37 +02:00
JC Brand
359a19f7d5 Update af translations 2013-09-13 16:09:30 +02:00
JC Brand
3bd6b4e1cc Regenerated POT and PO files 2013-09-13 16:02:33 +02:00
JC Brand
b3cae1b1f5 Update doc details on reverse-proxying the connection manager 2013-09-13 12:44:16 +02:00
JC Brand
373b235d30 Merge branch 'master' into 0.6.x 2013-09-13 12:18:55 +02:00
JC Brand
be66284748 Add a test for /clear functionality 2013-09-13 12:18:49 +02:00
JC Brand
960861ad78 Add a test for /clear functionality 2013-09-13 12:18:27 +02:00
JC Brand
7a57712434 Update CHANGES.rst 2013-09-13 10:58:39 +02:00