Commits · f846e70c106cf7960d145349dc5d9ee36d0f3f04 · nexedi / converse.js

15 Aug, 2013 13 commits
- Merge branch 'master' into mockup · f846e70c
  JC Brand authored Aug 15, 2013
  
  f846e70c
- Bugfix. removeRoom doesn't exist anymore · 7e0f5380
  JC Brand authored Aug 15, 2013
  
  7e0f5380
- Start making the markup changes required for the font icons · 15ed5133
  JC Brand authored Aug 15, 2013
  
  15ed5133
- Put icon inside link · 1036fc12
  JC Brand authored Aug 15, 2013
  
  1036fc12
- Merge branch 'master' into mockup · 359dbc68
  JC Brand authored Aug 15, 2013
  
  359dbc68
- Rename icon classes to match chat states · a9c19788
  JC Brand authored Aug 15, 2013
  
  a9c19788
- Add a debug option (logs to browser console) · 44d094f5
  JC Brand authored Aug 15, 2013
  
  44d094f5
- Register presence and message handlers before getting the roster · 53359b7d
  JC Brand authored Aug 15, 2013
```
Otherwise some presence notifications might be lost
```
  53359b7d
- Fix markup · 9b9bf1ce
  JC Brand authored Aug 15, 2013
  
  9b9bf1ce
- Indentation · ae0c561d
  JC Brand authored Aug 15, 2013
  
  ae0c561d
- Replace fonticons. Tweaked offline and busy fonts · c32f4bb1
  JC Brand authored Aug 15, 2013
  
  c32f4bb1
- 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 6 commits
- Merge pull request #36 from HaNdTriX/patch-1 · d55c6085
  JC Brand authored Aug 13, 2013
```
Update bower.json
```
  d55c6085
- Update bower.json · fd6fdd74
  HaNdTriX authored Aug 13, 2013
```
The version specified in the bower.json of package converse mismatches the tag (0.5.2 vs 0.5.0)
```
  fd6fdd74
- 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