Commits · e4c9fcbc4e79588e08347094036004dd724ced34 · nexedi / converse.js

03 Oct, 2013 13 commits
- Merge branch '0.6.x' · e4c9fcbc
  JC Brand authored Oct 03, 2013
```
Conflicts:
	converse.css
	converse.js
	index.html

Add allow_muc config option
```
  e4c9fcbc
- Fix tests that were broken after vCard changes · 6d026f01
  JC Brand authored Oct 03, 2013
```
Conflicts:
	tests_main.js
```
  6d026f01
- Don't use id for controlbox panes · 7f4bdb40
  JC Brand authored Oct 03, 2013
  
  7f4bdb40
- Add setting to enable/disable MUC · feaff64a
  JC Brand authored Oct 03, 2013
  
  feaff64a
- Tests now work under phantomjs again · e62ee883
  JC Brand authored Oct 03, 2013
  
  e62ee883
- Fix tests that were broken after vCard changes · 041ff88c
  JC Brand authored Oct 03, 2013
  
  041ff88c
- Use newest (unreleased) otr.js so that we can specify paths ourselves · 8f14c32b
  JC Brand authored Oct 03, 2013
  
  8f14c32b
- Merge branch '0.6.x' · e85eb667
  JC Brand authored Oct 03, 2013
```
Conflicts:
	index.html
```
  e85eb667
- Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master · 32593b75
  JC Brand authored Oct 03, 2013
```
Conflicts:
	locale/locales.js

Conflicts:
	index.html

Add Russian translation by bkocherov (actually made against master branch)
```
  32593b75
- Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master · b13ae5af
  JC Brand authored Oct 03, 2013
```
Conflicts:
	locale/locales.js
```
  b13ae5af
- Merge branch '0.6.x' · 22395999
  JC Brand authored Oct 03, 2013
```
Conflicts:
	converse.css

I didn't merge converse.css or converse.min.css, instead fell back to master versions.
```
  22395999
- Update CHANGES.rst · 3417e8fc
  JC Brand authored Oct 03, 2013
  
  3417e8fc
- Merge branch '0.6.x' of git://github.com/w3host/converse.js into w3host-0.6.x · e9102a96
  JC Brand authored Oct 03, 2013
  
  e9102a96
29 Sep, 2013 2 commits
- Merge branch 'master' of https://github.com/jcbrand/converse.js · 51d0f7d8
  Boris Kocherov authored Sep 29, 2013
  
  51d0f7d8
- Russian translation: continue translation. · 155b8e6a
  Boris Kocherov authored Sep 29, 2013
  
  155b8e6a
26 Sep, 2013 5 commits
- Remove old classes before adding new ones. Updates #38 · e4a1ccf1
  JC Brand authored Sep 26, 2013
  
  e4a1ccf1
- Fetch vCard once a roster contact is added. Updates #38 · 122cb937
  JC Brand authored Sep 26, 2013
```
This will happen in the background and in the meantime roster contacts will
appear under their JIDs.
```
  122cb937
- Remove old classes before adding new ones. Updates #38 · 3dfcd3c0
  JC Brand authored Sep 26, 2013
  
  3dfcd3c0
- Hungarian translation · d0e9618e
  w3host authored Sep 26, 2013
  
  d0e9618e
- Fetch vCard once a roster contact is added. Updates #38 · b36e6bbc
  JC Brand authored Sep 26, 2013
```
This will happen in the background and in the meantime roster contacts will
appear under their JIDs.
```
  b36e6bbc
25 Sep, 2013 1 commit
- Add Russian translation. · f21dffbc
  Boris Kocherov authored Sep 25, 2013
  
  f21dffbc
20 Sep, 2013 1 commit
- Merge pull request #54 from TracyWebTech/css-clash · aad8de02
  JC Brand authored Sep 20, 2013
```
Avoiding clash with bootstrap
```
  aad8de02
19 Sep, 2013 1 commit

Avoiding clash with bootstrap · 0bf807fd

Sergio Oliveira authored Sep 19, 2013

Using #chatpanel in front of every css class to avoid css name clashing
with bootstrap and other css frameworks

0bf807fd

18 Sep, 2013 1 commit
- Use const for enter key · 1d14a2b9
  JC Brand authored Sep 18, 2013
  
  1d14a2b9
17 Sep, 2013 3 commits
- Mention case where grunt is not installed globally · f80fd2a6
  JC Brand authored Sep 17, 2013
  
  f80fd2a6
- Mention case where grunt is not installed globally · 46fe0ac5
  JC Brand authored Sep 17, 2013
  
  46fe0ac5
- Mention OTR support · 37857378
  JC Brand authored Sep 17, 2013
  
  37857378
15 Sep, 2013 13 commits
- Browser tests work but phantomJS tests fail · 05409368
  JC Brand authored Sep 15, 2013
```
will have to debug later
```
  05409368
- 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