Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
1,023 Commits 2 Branches 109 Tags 304 MiB
7fa6f5a021
Commit Graph

1023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
JC Brand
7da5ff4aef Add a page for testing the minified JS and CSS 2013-07-30 23:05:47 +02:00
JC Brand
7ee9b56d8f Add require, otherwise it's not included in the minified file 2013-07-30 23:02:18 +02:00
JC Brand
99ae726209 Specifically include strophe, 
otherwise the optimizer doesn't include it
 2013-07-30 22:28:54 +02:00
JC Brand
04e39fafb1 Simplified the grunt release task 2013-07-30 22:28:26 +02:00
JC Brand
ab02828fee 'build' grunt task was renamed to 'fetch'. Updated docs 2013-07-30 21:43:49 +02:00
JC Brand
f8183c134e Add copyright header 2013-07-30 21:42:42 +02:00
JC Brand
1ec3fef131 Add Grunt tasks to help with creating releases. 2013-07-30 21:41:55 +02:00
JC Brand
242ce06745 update changes 2013-07-30 00:18:04 +02:00
JC Brand
9f2e5d291f Bugfix. Get value from val() method, not attr. 2013-07-30 00:16:17 +02:00
JC Brand
fb9fc87952 Fixed paths in tests_main.js and tests.html 2013-07-30 00:16:04 +02:00
JC Brand
d49bb25333 Stupid issue. 
With jquery  > 1.8.3, $(window).trigger('focus') doesn't trigger the handler.
Manually focusing the window does however trigger the handler.
 2013-07-30 00:13:59 +02:00
JC Brand
acac662b04 Update docs with info on tests 2013-07-29 23:22:41 +02:00
JC Brand
4a3f38e570 Update docs with info on how to set up the dev env 2013-07-29 23:13:55 +02:00
JC Brand
716ecc1b86 Add the 'build' grunt task 
- it calls 'bower update' and then 'make normal' inside the strophe dir.
 2013-07-29 23:13:31 +02:00
JC Brand
868ae82bb0 Fixed paths to bower's components dir 2013-07-29 22:40:19 +02:00
JC Brand
7ed30139d6 Move path and shim configs from converse.js to main.js 
This should make it easier to create custom builds, e.g. with more or less
dependencies.
 2013-07-29 22:34:33 +02:00