Commits · 04c71d5baefb3526142025cc71d00b94b8601bba · nexedi / converse.js

15 Sep, 2013 14 commits
- 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 15 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
- 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
- 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
- Remove messages from localStorage when calling /clear · f15eb5a7
  JC Brand authored Sep 13, 2013
  
  f15eb5a7
12 Sep, 2013 11 commits
- Correct version is 0.6.3 · 84915290
  JC Brand authored Sep 12, 2013
  
  84915290
- Merge branch 'master' of github.com:jcbrand/converse.js · 8b5287dc
  JC Brand authored Sep 12, 2013
  
  8b5287dc
- Bump version and minimize files. · 008bac4f
  JC Brand authored Sep 12, 2013
  
  008bac4f
- Bump version and minimize files. · d4375029
  JC Brand authored Sep 12, 2013
  
  d4375029
- Bump version everywhere and regenerate docs. · 68a99093
  JC Brand authored Sep 12, 2013
  
  68a99093
- For uniqueness, we need both JIDs for messages localStorage Fixes #49 · 37f3a95a
  JC Brand authored Sep 12, 2013
  
  37f3a95a
- Bugfix. Messages were stored against buddy JID and not own JID · 4ab6f281
  JC Brand authored Sep 12, 2013
  
  4ab6f281
- Merge new translations into the PO files · a33e370c
  JC Brand authored Sep 12, 2013
  
  a33e370c
- Regenerated docs · 6c84f1e9
  JC Brand authored Sep 12, 2013
  
  6c84f1e9
- Add new Makefile step "merge" and document it. · 0ef6a727
  JC Brand authored Sep 12, 2013
  
  0ef6a727
- The word 'me' wasn't translation aware. · 9734ccde
  JC Brand authored Sep 10, 2013
```
Conflicts:
	locale/converse.pot
```
  9734ccde