Commit Graph

6106 Commits

Author SHA1 Message Date
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
JC Brand
62c314ff66 Remove the Libraries dir and fix paths in converse.js 2013-07-29 22:22:12 +02:00
JC Brand
883c64cc16 Add bower as npm dependency
- Also added bower.json with all 3rd party dependencies specified
- And .bowerrc to specify components dir
2013-07-29 22:20:52 +02:00
JC Brand
b1363c9b98 Fix image. Fix typo and add link to docs 2013-07-28 23:47:12 +02:00
JC Brand
8c80191a96 Update the readme with link to demo and info on tests 2013-07-28 23:39:11 +02:00
JC Brand
bacc288bea Add .travis.yml 2013-07-28 23:24:04 +02:00
JC Brand
4eec2251e7 Better mention of translations 2013-07-28 23:15:49 +02:00
JC Brand
45bd56753d Bugfix in translation files. Make sure Jed is defined. 2013-07-28 23:12:21 +02:00
JC Brand
63a4a57b3b Remove (empty) hungarian translation files.
I added them for someone who promised hu translations, but they are now just
taking up space.
2013-07-28 23:11:08 +02:00
JC Brand
c2b8cd3f00 Remove unused dir (was from gh-pages) 2013-07-28 23:02:29 +02:00
JC Brand
38060c38e5 Mention JSHint in CONTRIBUTING.rst 2013-07-28 22:59:01 +02:00
JC Brand
8e04ea51c3 Add grunt task to run the tests.
- Removed phantom-jasmine, not used.
- Updated CONTRIBUTING.rst
2013-07-28 22:51:25 +02:00
JC Brand
c85c9f043a Separate update intervals for browser and phantomjs 2013-07-28 22:21:56 +02:00
JC Brand
143875bf32 Add jasmine and jasmine-html as require deps. Also add Console reporter 2013-07-28 21:20:36 +02:00
JC Brand
8f8ecbd78c Add missing semi-colon (jshint) 2013-07-27 10:53:22 +02:00
JC Brand
a9a3724766 Initial works towards having headless tests with PhantomJS 2013-07-27 10:51:55 +02:00
JC Brand
d64d5b7e8d Fix build.js and reminify files 2013-07-27 02:11:37 +02:00
JC Brand
300b5f7873 Fix build.js and reminify files 2013-07-27 02:11:04 +02:00