Commit Graph

739 Commits

Author SHA1 Message Date
JC Brand
2896ae2ce4 Regenerated sphinx docs 2013-08-16 16:17:27 +02:00
JC Brand
cf4cec1e29 Refactored sendMessage
Let the message only be sent when an event has been triggered.
This allows us to first (if necessary) let OTR process the image.
2013-08-16 16:05:24 +02:00
JC Brand
a2aeec8449 Add initial OTR code.
- /otr will generate a new private key (or fetch it from storage).
2013-08-16 15:48:23 +02:00
JC Brand
57fc8b9832 Merge branch 'master' into otr
Conflicts:
	docs/html/_static/stylesheet.css
	docs/html/searchindex.js
2013-08-16 11:28:34 +02:00
JC Brand
fc4bec1e9c Regenerated docs 2013-08-16 11:27:29 +02:00
JC Brand
cac9d9c55e Mention debug option in docs 2013-08-16 11:25:58 +02:00
JC Brand
cf161a729a Add contacts regardless of how getVCard failed 2013-08-15 20:47:19 +02:00
JC Brand
66b92fedcb Add debug option explicitly 2013-08-15 20:43:39 +02:00
JC Brand
7e0f538029 Bugfix. removeRoom doesn't exist anymore 2013-08-15 20:33:42 +02:00
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
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
7f7bdbb5fc Extend docs with info on the HTML snippet converse expects. updates #31 2013-08-12 10:37:13 +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
JC Brand
c5192f8ade Bugfix. Updates #32
Users without roster contacts didn't have XMPPStatus.initStatus called and
therefore had a default status of offline.

Fixed this by setting the status to online from the start. The fetch command
will get the true status from localStorage (if available).

Made sure that the rest of converse's onConnected code is called in the
callback from fetch (so that we know the user's status is correct).

Updated and fixed tests.
2013-08-04 15:39:46 +02:00
JC Brand
f0a2f25916 Fix download links 2013-08-02 23:26:14 +02:00
JC Brand
a01f954397 Fix download links 2013-08-02 23:25:41 +02:00
JC Brand
64c085196a Update changes 2013-08-02 12:39:17 +02:00
JC Brand
cb32f0fecb Merge branch 'master' of github.com:jcbrand/converse.js 2013-08-02 12:28:51 +02:00
JC Brand
72ca5158f3 Attach panels to the DOM upon initialize.
On Plone I've been having issues with event handlers being registered on
elements not yet added to the DOM not being called.

Also, get rid of the misnamed $parent attribute on the panels. Instead, pass in
the correct parent to initialize.
2013-08-02 12:26:16 +02:00
JC Brand
985da9c0ec Add converse.po for en (for Transifex) 2013-08-01 14:14:58 +02:00
JC Brand
7c0e7049f2 Pin version in index.html 2013-07-30 23:42:05 +02:00
JC Brand
163d8f60d9 Pin version in index.html 2013-07-30 23:41:28 +02:00
JC Brand
5f97f7ea28 Merge branch 'master' into gh-pages
Conflicts:
	build.js
	converse.min.css
	converse.min.js
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
	index.html
2013-07-30 23:40:59 +02:00
JC Brand
d8cf1b229e Bugfix in test grunt task 2013-07-30 23:39:24 +02:00
JC Brand
ce1dce629c Create new release, version 0.5.0 2013-07-30 23:17:13 +02:00