Commit Graph

4701 Commits

Author SHA1 Message Date
JC Brand
44d094f56f Add a debug option (logs to browser console) 2013-08-15 19:34:40 +02:00
JC Brand
53359b7ddc Register presence and message handlers before getting the roster
Otherwise some presence notifications might be lost
2013-08-15 19:30:33 +02:00
JC Brand
9b9bf1ce89 Fix markup 2013-08-15 19:30:33 +02:00
JC Brand
ae0c561d88 Indentation 2013-08-15 18:32:07 +02:00
JC Brand
c32f4bb171 Replace fonticons. Tweaked offline and busy fonts 2013-08-15 18:30:12 +02:00
JC Brand
ae96dc1e64 Merge branch 'master' into mockup
Conflicts:
	docs/html/_static/stylesheet.css
	docs/html/searchindex.js
2013-08-15 18:01:26 +02:00
JC Brand
a5051f0061 Fix markup 2013-08-15 17:58:28 +02:00
JC Brand
d55c608552 Merge pull request #36 from HaNdTriX/patch-1
Update bower.json
2013-08-13 03:26:44 -07:00
HaNdTriX
fd6fdd748d Update bower.json
The version specified in the bower.json of package converse mismatches the tag (0.5.2 vs 0.5.0)
2013-08-13 12:06:58 +02:00
JC Brand
af1a08e9b6 Docs are more stable and featured now. 2013-08-13 11:29:56 +02:00
JC Brand
867d42fdfd Update .gitignore 2013-08-13 11:25:45 +02:00
JC Brand
5be5428ca7 Remove pickle, which causes many merge errors 2013-08-13 11:23:04 +02:00
JC Brand
30b61fb40a Add info on facebook integration 2013-08-13 11:19:40 +02:00
JC Brand
b79c12e8a1 Mockup tweaks 2013-08-12 22:10:01 +02:00
JC Brand
fadbb7757d Turns out sprite_download.png is being used 2013-08-12 22:04:16 +02:00
JC Brand
b03ee33a88 Remove unused images (replaced with fonticons) 2013-08-12 22:03:27 +02:00
JC Brand
84f4e47127 More tweaks and fixes 2013-08-12 21:32:00 +02:00
JC Brand
62534bf73d mockup: configure close and configure buttons 2013-08-12 21:07:35 +02:00
JC Brand
f23e480baf Remove more images with fonticons 2013-08-12 20:52:30 +02:00
JC Brand
9976085e3e Remove unused sprite files 2013-08-12 20:52:11 +02:00
JC Brand
4e606b3510 Mockup: add chatroom with error, fix box heights. 2013-08-12 20:10:12 +02:00
JC Brand
e2c11bf19f More mockup work.
- Added requesting contacts.
- Fix contact width on hover.
- Add tooltips for status icons
2013-08-12 19:22:43 +02:00
JC Brand
7f7bdbb5fc Extend docs with info on the HTML snippet converse expects. updates #31 2013-08-12 10:37:13 +02:00
JC Brand
3e16256a71 More work on the mockup. Add js to switch tabs 2013-08-11 14:38:40 +02:00
JC Brand
39665516a1 Darker font colors 2013-08-10 09:04:13 +02:00
JC Brand
e01dc0398d Give proper names and tweak font colors 2013-08-09 23:30:59 +02:00
JC Brand
cb5a75d310 Tweak contact status fonticon 2013-08-09 23:20:50 +02:00
JC Brand
396e54c0a7 fixed markup for 'add a contact' 2013-08-09 23:16:46 +02:00
JC Brand
b1f32df9b6 Add mockup.html 2013-08-09 20:26:30 +02:00
JC Brand
861887fd77 Initial markup, testing out font icons 2013-08-09 20:25:21 +02:00
JC Brand
e268681541 Add font icon set from IcoMoon 2013-08-09 19:23:08 +02:00
JC Brand
f7c579e7e6 Add OTR to bower.json and converse.js 2013-08-09 19:22:49 +02:00
JC Brand
b681c3e58e Tweak docs css 2013-08-09 09:25:30 +02:00
JC Brand
f0b01a958e Merge branch 'master' into gh-pages
Conflicts:
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
2013-08-09 09:23:32 +02:00
JC Brand
7010c15d35 Update development section of the docs 2013-08-09 09:21:20 +02:00
JC Brand
6a699dfcf2 Merge branch 'master' into gh-pages 2013-08-07 15:27:20 +02:00
JC Brand
5682311285 Travis tests time out for some reason and I don't have time to debug.
Tests pass locally though
2013-08-07 15:26:41 +02:00
JC Brand
39a0788d54 Fix node.js version. bower must be run after install 2013-08-05 10:34:46 +02:00
JC Brand
b97948733f Give full path to bower 2013-08-05 10:27:31 +02:00
JC Brand
032ebad032 Make sure bower is updated 2013-08-05 10:25:39 +02:00
JC Brand
944593de8a Merge branch 'master' into gh-pages 2013-08-05 09:39:43 +02:00
JC Brand
405d308ae0 Remove references to online tests URL.
Testing requires jasmine and require which are not bundled anymore but instead
installed via bower.
2013-08-05 09:38:34 +02:00
JC Brand
f688d96b68 Forgot to add release date to changes. 2013-08-05 09:29:51 +02:00
JC Brand
4b48e8ac69 Merge branch 'master' into gh-pages 2013-08-05 09:28:18 +02:00
JC Brand
2d4a14ac2d Don't expose the Strophe connection object globally.
Instead, expose only the initialize and onConnected functions.
Updated the tests to work with this.
2013-08-05 09:25:29 +02:00
JC Brand
c62a4ae575 Merge branch 'master' into gh-pages
Conflicts:
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
2013-08-04 18:51:33 +02:00
JC Brand
a13a69c493 Bump version to 0.5.1 2013-08-04 18:48:29 +02:00
JC Brand
1f772f4691 Merge branch 'master' into gh-pages
Conflicts:
	index.html
2013-08-04 18:46:51 +02:00
JC Brand
eb39faa732 Re-minified files (without version numbers). 2013-08-04 18:43:55 +02:00
JC Brand
457a11c54e Send messages from full JID. Fixes #13.
Messages sent between two Gtalk accounts weren't being received.
2013-08-04 18:31:45 +02:00