Commit Graph

8494 Commits

Author SHA1 Message Date
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
JC Brand
367803d6ef The xa chat state wasn't being handled properly 2013-09-13 10:58:00 +02:00
JC Brand
cc37d6a183 The xa chat state wasn't being handled properly 2013-09-13 10:57:53 +02:00
JC Brand
59fc3182b1 The xa chat state wasn't being handled properly 2013-09-13 10:57:28 +02:00
JC Brand
f8cad74a74 Update CHANGES.rst 2013-09-13 10:38:31 +02:00
JC Brand
e33b8d34e5 Regenerated POT and PO files 2013-09-13 10:35:51 +02:00
JC Brand
b34a706132 We didn't have an icon for unavailable state.
Also, the status description was not translation aware
2013-09-13 10:35:37 +02:00
JC Brand
f6884d90db Regenerated PO and POT files 2013-09-13 10:35:25 +02:00
JC Brand
8977505f11 We didn't have an icon for unavailable state.
Also, the status description was not translation aware
2013-09-13 10:35:00 +02:00
JC Brand
f15eb5a7d4 Remove messages from localStorage when calling /clear 2013-09-13 09:59:06 +02:00
JC Brand
0dd4b3e52c Remove messages from localStorage when calling /clear 2013-09-13 09:57:14 +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
8b5287dc05 Merge branch 'master' of github.com:jcbrand/converse.js 2013-09-12 15:53:09 +02:00
JC Brand
008bac4f21 Bump version and minimize files. 2013-09-12 15:51:30 +02:00
JC Brand
d4375029a7 Bump version and minimize files. 2013-09-12 15:49:44 +02:00
JC Brand
68a9909311 Bump version everywhere and regenerate docs. 2013-09-12 15:33:11 +02:00
JC Brand
37f3a95a20 For uniqueness, we need both JIDs for messages localStorage Fixes #49 2013-09-12 15:30:09 +02:00
JC Brand
4ab6f28181 Bugfix. Messages were stored against buddy JID and not own JID 2013-09-12 15:24:56 +02:00