Commits · ae96dc1e64ed4b167fc75bbbaeaafff026e58401 · nexedi / converse.js

15 Aug, 2013 2 commits
- Merge branch 'master' into mockup · ae96dc1e
  JC Brand authored Aug 15, 2013
```
Conflicts:
	docs/html/_static/stylesheet.css
	docs/html/searchindex.js
```
  ae96dc1e
- Fix markup · a5051f00
  JC Brand authored Aug 15, 2013
  
  a5051f00
13 Aug, 2013 4 commits
- Docs are more stable and featured now. · af1a08e9
  JC Brand authored Aug 13, 2013
  
  af1a08e9
- Update .gitignore · 867d42fd
  JC Brand authored Aug 13, 2013
  
  867d42fd
- Remove pickle, which causes many merge errors · 5be5428c
  JC Brand authored Aug 13, 2013
  
  5be5428c
- Add info on facebook integration · 30b61fb4
  JC Brand authored Aug 13, 2013
  
  30b61fb4
12 Aug, 2013 10 commits
- Mockup tweaks · b79c12e8
  JC Brand authored Aug 12, 2013
  
  b79c12e8
- Turns out sprite_download.png is being used · fadbb775
  JC Brand authored Aug 12, 2013
  
  fadbb775
- Remove unused images (replaced with fonticons) · b03ee33a
  JC Brand authored Aug 12, 2013
  
  b03ee33a
- More tweaks and fixes · 84f4e471
  JC Brand authored Aug 12, 2013
  
  84f4e471
- mockup: configure close and configure buttons · 62534bf7
  JC Brand authored Aug 12, 2013
  
  62534bf7
- Remove more images with fonticons · f23e480b
  JC Brand authored Aug 12, 2013
  
  f23e480b
- Remove unused sprite files · 9976085e
  JC Brand authored Aug 12, 2013
  
  9976085e
- Mockup: add chatroom with error, fix box heights. · 4e606b35
  JC Brand authored Aug 12, 2013
  
  4e606b35
- More mockup work. · e2c11bf1
  JC Brand authored Aug 12, 2013
```
- Added requesting contacts.
- Fix contact width on hover.
- Add tooltips for status icons
```
  e2c11bf1
- Extend docs with info on the HTML snippet converse expects. updates #31 · 7f7bdbb5
  JC Brand authored Aug 12, 2013
  
  7f7bdbb5
11 Aug, 2013 1 commit
- More work on the mockup. Add js to switch tabs · 3e16256a
  JC Brand authored Aug 11, 2013
  
  3e16256a
10 Aug, 2013 1 commit
- Darker font colors · 39665516
  JC Brand authored Aug 10, 2013
  
  39665516
09 Aug, 2013 9 commits
- Give proper names and tweak font colors · e01dc039
  JC Brand authored Aug 09, 2013
  
  e01dc039
- Tweak contact status fonticon · cb5a75d3
  JC Brand authored Aug 09, 2013
  
  cb5a75d3
- fixed markup for 'add a contact' · 396e54c0
  JC Brand authored Aug 09, 2013
  
  396e54c0
- Add mockup.html · b1f32df9
  JC Brand authored Aug 09, 2013
  
  b1f32df9
- Initial markup, testing out font icons · 861887fd
  JC Brand authored Aug 09, 2013
  
  861887fd
- Add font icon set from IcoMoon · e2686815
  JC Brand authored Aug 09, 2013
  
  e2686815
- Tweak docs css · b681c3e5
  JC Brand authored Aug 09, 2013
  
  b681c3e5
- Merge branch 'master' into gh-pages · f0b01a95
  JC Brand authored Aug 09, 2013
```
Conflicts:
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
```
  f0b01a95
- Update development section of the docs · 7010c15d
  JC Brand authored Aug 09, 2013
  
  7010c15d
07 Aug, 2013 2 commits
- Merge branch 'master' into gh-pages · 6a699dfc
  JC Brand authored Aug 07, 2013
  
  6a699dfc
- Travis tests time out for some reason and I don't have time to debug. · 56823112
  JC Brand authored Aug 07, 2013
```
Tests pass locally though
```
  56823112
05 Aug, 2013 8 commits
- Fix node.js version. bower must be run after install · 39a0788d
  JC Brand authored Aug 05, 2013
  
  39a0788d
- Give full path to bower · b9794873
  JC Brand authored Aug 05, 2013
  
  b9794873
- Make sure bower is updated · 032ebad0
  JC Brand authored Aug 05, 2013
  
  032ebad0
- Merge branch 'master' into gh-pages · 944593de
  JC Brand authored Aug 05, 2013
  
  944593de
- Remove references to online tests URL. · 405d308a
  JC Brand authored Aug 05, 2013
```
Testing requires jasmine and require which are not bundled anymore but instead
installed via bower.
```
  405d308a
- Forgot to add release date to changes. · f688d96b
  JC Brand authored Aug 05, 2013
  
  f688d96b
- Merge branch 'master' into gh-pages · 4b48e8ac
  JC Brand authored Aug 05, 2013
  
  4b48e8ac
- Don't expose the Strophe connection object globally. · 2d4a14ac
  JC Brand authored Aug 05, 2013
```
Instead, expose only the initialize and onConnected functions.
Updated the tests to work with this.
```
  2d4a14ac
04 Aug, 2013 3 commits
- Merge branch 'master' into gh-pages · c62a4ae5
  JC Brand authored Aug 04, 2013
```
Conflicts:
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
```
  c62a4ae5
- Bump version to 0.5.1 · a13a69c4
  JC Brand authored Aug 04, 2013
  
  a13a69c4
- Merge branch 'master' into gh-pages · 1f772f46
  JC Brand authored Aug 04, 2013
```
Conflicts:
	index.html
```
  1f772f46