Commits · d1cc7b2cf0ef22f54d8e9dbf0a02428b1a0f96c0 · nexedi / converse.js

15 Sep, 2013 18 commits
- Mention OTR support · d1cc7b2c
  JC Brand authored Sep 15, 2013
  
  d1cc7b2c
- Updated js translation files (after OTR merge) · 40c9c397
  JC Brand authored Sep 15, 2013
  
  40c9c397
- Add make command po2json and run it · 5598dd03
  JC Brand authored Sep 15, 2013
  
  5598dd03
- Merge branch 'otr' · 6517b9bb
  JC Brand authored Sep 15, 2013
```
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
```
  6517b9bb
- Merge branch '0.6.x' · 04c71d5b
  JC Brand authored Sep 15, 2013
```
Conflicts:
	CHANGES.rst
```
  04c71d5b
- Use * for rst bullet rendering · 2c884c05
  JC Brand authored Sep 15, 2013
  
  2c884c05
- Regenerated docs (new version number). Add release checklist · 02978eca
  JC Brand authored Sep 15, 2013
  
  02978eca
- Regenerated docs (new version number). Add release checklist · 7432cd24
  JC Brand authored Sep 15, 2013
  
  7432cd24
- Bump versions and re-minified · 9c756833
  JC Brand authored Sep 15, 2013
  
  9c756833
- Update Makefile to auto-bump version number · bc317813
  JC Brand authored Sep 15, 2013
  
  bc317813
- Bump versions and re-minified · 67689248
  JC Brand authored Sep 15, 2013
  
  67689248
- Update Makefile to auto-bump version number · 7922f17a
  JC Brand authored Sep 15, 2013
  
  7922f17a
- Update DE and AF translations · 2be1b587
  JC Brand authored Sep 15, 2013
  
  2be1b587
- update json and js pt-BR translation files · a8fbfad0
  JC Brand authored Sep 15, 2013
  
  a8fbfad0
- Updating pt-br translations · 154df6c2
  Sergio Oliveira authored Sep 13, 2013
  
  154df6c2
- Update DE and AF translations · 6dd0160a
  JC Brand authored Sep 15, 2013
  
  6dd0160a
- update json and js pt-BR translation files · 40b8435a
  JC Brand authored Sep 15, 2013
  
  40b8435a
- Merge pull request #50 from TracyWebTech/master · ce9f63c9
  JC Brand authored Sep 15, 2013
```
Updating pt-br translations
```
  ce9f63c9
13 Sep, 2013 21 commits
- Updating pt-br translations · fc3e2d27
  Sergio Oliveira authored Sep 13, 2013
  
  fc3e2d27
- Update af translations · 2cab56b6
  JC Brand authored Sep 13, 2013
  
  2cab56b6
- Regenerated POT and PO files · 4610dfb2
  JC Brand authored Sep 13, 2013
  
  4610dfb2
- Update doc details on reverse-proxying the connection manager · 6b361160
  JC Brand authored Sep 13, 2013
  
  6b361160
- Update af translations · 359a19f7
  JC Brand authored Sep 13, 2013
  
  359a19f7
- Regenerated POT and PO files · 3bd6b4e1
  JC Brand authored Sep 13, 2013
  
  3bd6b4e1
- Update doc details on reverse-proxying the connection manager · b3cae1b1
  JC Brand authored Sep 13, 2013
  
  b3cae1b1
- Merge branch 'master' into 0.6.x · 373b235d
  JC Brand authored Sep 13, 2013
  
  373b235d
- Add a test for /clear functionality · be662847
  JC Brand authored Sep 13, 2013
  
  be662847
- Add a test for /clear functionality · 960861ad
  JC Brand authored Sep 13, 2013
  
  960861ad
- Update CHANGES.rst · 7a577124
  JC Brand authored Sep 13, 2013
  
  7a577124
- The xa chat state wasn't being handled properly · 367803d6
  JC Brand authored Sep 13, 2013
  
  367803d6
- The xa chat state wasn't being handled properly · cc37d6a1
  JC Brand authored Sep 13, 2013
  
  cc37d6a1
- The xa chat state wasn't being handled properly · 59fc3182
  JC Brand authored Sep 13, 2013
  
  59fc3182
- Update CHANGES.rst · f8cad74a
  JC Brand authored Sep 13, 2013
  
  f8cad74a
- Regenerated POT and PO files · e33b8d34
  JC Brand authored Sep 13, 2013
  
  e33b8d34
- We didn't have an icon for unavailable state. · b34a7061
  JC Brand authored Sep 13, 2013
```
Also, the status description was not translation aware
```
  b34a7061
- Regenerated PO and POT files · f6884d90
  JC Brand authored Sep 13, 2013
  
  f6884d90
- We didn't have an icon for unavailable state. · 8977505f
  JC Brand authored Sep 13, 2013
```
Also, the status description was not translation aware
```
  8977505f
- Remove messages from localStorage when calling /clear · f15eb5a7
  JC Brand authored Sep 13, 2013
  
  f15eb5a7
- Remove messages from localStorage when calling /clear · 0dd4b3e5
  JC Brand authored Sep 13, 2013
  
  0dd4b3e5
12 Sep, 2013 1 commit
- Merge branch 'master' into otr · d402ed8e
  JC Brand authored Sep 12, 2013
```
Conflicts:
	locale/af/LC_MESSAGES/converse.po
	locale/converse.pot
```
  d402ed8e