JC Brand
d4281c6134
Remove some redundant intialization settings.
2014-09-22 17:23:21 +02:00
JC Brand
21d965564f
fix markup syntax err and enable minified js
2014-09-21 19:05:19 +02:00
JC Brand
b241f8c64e
Add new font set with an icon for converse.js
...
and one for logging out. Also added a favicon.
2014-09-21 18:58:36 +02:00
JC Brand
aa046654bf
Provide single-session support.
2014-09-06 23:34:39 +02:00
JC Brand
0a1614741b
Make sure main.js is loaded before calling require.
...
When calling require from within HTML, then don't use data-main, but instead
load main.js via a require call.
See here: http://requirejs.org/docs/api.html#data-main
2014-09-06 16:58:20 +02:00
JC Brand
f1555774f0
Add typeahead.js as dependency and integrate. updates #215 .
2014-08-26 19:59:48 +02:00
JC Brand
b039b1d80d
Mention Alfresco integration
2014-08-25 18:08:35 +02:00
JC Brand
c9958182ff
Making 0.8.1 release
2014-08-23 11:15:56 +02:00
JC Brand
83c68696cd
Update the docs and add section about sound notifications. updates #62
2014-08-23 11:04:33 +02:00
JC Brand
eb7749e6ca
Rebuild.
2014-08-20 21:03:05 +02:00
JC Brand
882bbcb02e
Add support for sound notifications. updates #62
...
(on incoming messages)
2014-08-20 21:00:28 +02:00
JC Brand
3bbcf237ee
Make new build and use it in index.html
2014-08-11 22:19:43 +02:00
JC Brand
bf837a921e
Merge branch 'live-filter'
...
Conflicts:
builds/converse-no-locales-no-otr.min.js
builds/converse-no-otr.min.js
builds/converse.min.js
builds/converse.website-no-otr.min.js
builds/converse.website.min.js
2014-08-11 21:57:23 +02:00
JC Brand
03cf27af67
Update mockup with group/user filter toggle
2014-08-11 21:47:28 +02:00
JC Brand
33aac2cf8a
Don't use auto_reconnect and rebuild JS
2014-08-08 11:14:32 +02:00
JC Brand
ed1a4d8f70
Mention open source
2014-08-06 10:40:33 +02:00
JC Brand
931fdf0b98
Simpler intro text
2014-08-05 18:50:09 +02:00
JC Brand
d247cb2286
Tweak homepage.
2014-08-05 18:48:54 +02:00
JC Brand
26e7e82f5b
Build a non-OTR version for the website on IE < 9.
2014-08-05 17:44:53 +02:00
JC Brand
bb705825a2
Distinguish between IE < 9 and the rest
2014-08-05 17:38:02 +02:00
JC Brand
7257432f54
Had to rebuild
2014-08-05 17:06:49 +02:00
JC Brand
ce75bc4737
Override otr.js so that we can fallback gracefully on IE
2014-08-05 16:59:38 +02:00
JC Brand
3fea9a09a8
Add a new build without OTR to be used on IE.
2014-08-05 16:11:20 +02:00
JC Brand
5ed84dd666
New builds for 0.8 release
2014-08-04 23:04:39 +02:00
JC Brand
c5f2c88f84
Revert "Use the bigint shipped with newest otr.js"
...
This reverts commit a7247a7c6d
.
2014-08-04 23:00:01 +02:00
JC Brand
a7247a7c6d
Use the bigint shipped with newest otr.js
2014-08-04 22:37:55 +02:00
JC Brand
b7f88c965c
Generate new builds
2014-08-04 22:09:40 +02:00
JC Brand
ca21fc00f8
Enable roster_groups
2014-08-04 19:25:47 +02:00
JC Brand
0640dd5ae5
Clean up the initialize method of RosterView
...
by moving event handers out
2014-07-25 08:59:38 +02:00
JC Brand
0868db3c8a
Manage fontawesome via bower
2014-07-20 00:20:28 +02:00
JC Brand
29c822a6b5
Possible fix for issue #175 .
...
Make sure contact's chat_status attr is saved.
Updates #175
2014-07-20 00:16:22 +02:00
JC Brand
9bf4eba33b
New fonticons from icomoon
2014-07-19 13:50:31 +02:00
JC Brand
6bded11304
Add connection feedback on the controlbox.
...
Now that the toggle is hidden when the controlbox is visible.
2014-07-14 20:41:26 +02:00
JC Brand
eeaeb3e66e
Set lang back to english
2014-07-06 18:34:29 +02:00
JC Brand
ad90e74260
Simplified Chinese translations, courtesy of Lancelot
2014-07-06 17:56:42 +02:00
JC Brand
c5ae10d962
Make an extra build specifically for including the website deps
2014-07-06 16:10:27 +02:00
JC Brand
9d84ede2f9
Two website deps (jquery-easing & bootstrap) now managed by bower
2014-07-06 15:56:44 +02:00
JC Brand
166b3bd003
Increase the clickable area for restoring a minimized chat
2014-07-06 12:40:50 +02:00
JC Brand
8aedc3fcf7
Integrate backbone.browserStorage. Fixes #176
...
Data is now by default cached in sessionStorage and not localStorage.
Can be configured via the "storage" option.
2014-06-30 18:53:58 +02:00
JC Brand
bf4dfea1af
Use builds and public connection manager
2014-06-30 14:55:52 +02:00
JC Brand
7e95d3d01d
Work on getting a working build for 0.8
2014-06-29 20:49:22 +02:00
JC Brand
0c0a3f86b6
Remove the need for having an HTML snippet in the body.
2014-05-13 09:26:57 +02:00
JC Brand
0b710b807d
Update mockup with new theme and fix css
2014-05-11 20:15:50 +02:00
JC Brand
a956e66284
Add link to mailing list
2014-05-08 11:47:45 +02:00
JC Brand
5acd6baad7
Start managing converse.css via less
2014-05-07 22:36:45 +02:00
JC Brand
b41bc87668
Make feature icons clickable. Update copy.
2014-05-07 08:04:32 +02:00
JC Brand
c38c5e4ae3
Add different backgrounds for other 2 colorful sections
2014-05-06 22:30:37 +02:00
JC Brand
3d2137a677
Add a new theme for the website based on bootstrap.
...
https://github.com/IronSummitMedia/startbootstrap/tree/master/templates/grayscale
2014-05-06 22:10:12 +02:00
JC Brand
737e9e0de2
Add new theme. http://html5up.net/tessellate
2014-05-06 15:25:31 +02:00
JC Brand
4937fafea4
Add tests for new "clear" button.
2014-04-24 19:21:38 +02:00
JC Brand
9b3601314e
Add a new toolbar button to clear chat messages
...
Configuration options have changed a bit.
show_emoticons and show_call_button are now removed. Instead the toolbar is
configured via a new config option: "visible_toolbar_buttons".
2014-04-24 18:10:04 +02:00
JC Brand
1c26e9016c
Fixed chatbox positioning and better disabling of effects
...
* The animate config option now disables jQuery effects
* Make sure the controlbox is always to the right of all other chatboxes
* Make sure new chatboxes are always created immediately left of the controlbox
2014-04-24 07:58:35 +02:00
JC Brand
b384be28a0
Padding fix. Updates #130
2014-04-24 07:08:21 +02:00
JC Brand
a9da15bb2f
New BOSH service address
...
Conflicts:
docs/doctrees/index.doctree
docs/html/_sources/index.txt
docs/html/index.html
docs/html/searchindex.js
2014-04-09 17:24:37 +02:00
JC Brand
df599238f8
Update contributors text, readme and add new license (MPL)
2014-03-22 02:11:34 +02:00
JC Brand
9849daacf9
Merge branch 'master' into 0.8
...
Conflicts:
bower.json
converse.js
docs/CHANGES.rst
spec/chatbox.js
tests/utils.js
tests_main.js
2014-03-09 08:18:00 +02:00
JC Brand
9b3af57d13
Release version 0.7.4
2014-03-05 08:44:01 +02:00
JC Brand
11b59b31d3
Fix tests after all the refactoring...
2014-03-01 01:57:20 +02:00
JC Brand
839dd0bd7e
Fix BOSH url
2014-02-23 01:15:05 +02:00
JC Brand
0cffd78ff1
Get ready to release 0.7.3 of converse.js
2014-02-23 01:11:35 +02:00
JC Brand
3a5741cd36
Update contact section
2014-02-12 08:22:52 +02:00
JC Brand
cd144a98ca
Add Hebrew translations
2014-01-28 09:41:52 +02:00
JC Brand
ae10412841
Update text since we don't serve via Github anymore
2014-01-15 02:19:54 +02:00
JC Brand
8161ad9b54
Add references to the Wordpress plugin by @thomascamaran
2014-01-15 02:03:14 +02:00
JC Brand
e729471bbf
Event emitting code. Updates #48
...
Include the event emitting code in converse.js itself and start emitting events.
Still needs tests and to be thoroughly tested manually.
Still needs docs.
2013-12-15 16:58:46 +02:00
JC Brand
6a9c2e75bb
Update XMPP contact info
2013-11-20 10:42:11 +02:00
JC Brand
512a463750
Create 3 different builds.
...
* converse.min.js
* converse-no-otr.min.js (Without OTR encryption)
* converse-no-locales-no-otr.min.js (Without OTR encryption or any translations)
2013-11-17 16:55:38 +02:00
JC Brand
429d77e44f
Force standards mode on IE
2013-11-16 12:02:45 +02:00
JC Brand
08aad1fd97
Point download URL to all releases.
2013-11-15 23:50:00 +02:00
JC Brand
518c0fca8a
We can't not load the crypto libs, breaks r.js optimizer
2013-11-15 22:57:29 +02:00
JC Brand
5da32a5956
Change bind address to one served under same domain
2013-11-15 21:13:35 +02:00
JC Brand
95de186de5
Point to original roundcube plugin again.
2013-11-15 18:03:32 +02:00
JC Brand
b9d60bc6e4
Add link to newest screencast.
2013-11-13 09:31:07 +02:00
JC Brand
b140596b50
Bump version to 0.7 and minify css and js
2013-11-13 08:19:14 +02:00
JC Brand
38c26013d0
Simplify the boilerplate HTML require even more.
...
Use id 'conversejs' instead of 'chatpanel'.
The controlbox toggle is now generated via a backbone view, you don't need to
manually include it in your markup.
2013-10-20 22:42:34 +02:00
JC Brand
7fa6f5a021
Simplify initial markup required
2013-10-17 21:36:32 +02:00
JC Brand
b061f403b3
Remove superfluous element #collective-xmpp-chat-data
2013-10-16 22:29:13 +02:00
JC Brand
a466ebe38d
Merge branch '0.6.x'
2013-10-16 12:04:03 +02:00
JC Brand
3260c7d2b0
Use @thomascube's roundcube add-on fork.
2013-10-16 12:03:24 +02:00
JC Brand
66d4a16799
Also add address to index.html
2013-10-16 11:53:45 +02:00
JC Brand
1fa47c6633
Merge branch '0.6.x'
...
Conflicts:
converse.min.js
docs/html/searchindex.js
2013-10-16 11:50:55 +02:00
JC Brand
29fc658c05
New release, 0.6.6
2013-10-16 11:26:22 +02:00
JC Brand
6e15986a87
Merge branch '0.6.x'
...
Conflicts:
index.html
2013-10-15 19:16:11 +02:00
JC Brand
f1a1d36cc4
Add Dutch translation, provided by @maartenkling
2013-10-15 19:15:06 +02:00
JC Brand
b6a6562de9
Merge branch '0.6.x'
...
Conflicts:
Makefile
converse.css
converse.min.css
converse.min.js
docs/doctrees/index.doctree
docs/html/index.html
docs/html/searchindex.js
2013-10-08 22:12:12 +02:00
JC Brand
90be11aee8
New release: 0.6.5.
...
Bumped version
Updated release date in CHANGES.rst
Minified CSS and JS
Generate HTML docs
2013-10-08 09:11:04 +02:00
JC Brand
7f371b883e
Add config option `allow_contact_requests
` to toggle user adding
2013-10-03 15:58:09 +02:00
JC Brand
b8e096ffd1
Merge branch '0.6.x'
...
Conflicts:
converse.js
index.html
Add config option ``allow_contact_requests`` to toggle user adding
2013-10-03 14:25:39 +02:00
JC Brand
0d6e29f067
Add config option `allow_contact_requests
` to toggle user adding
2013-10-03 14:22:33 +02:00
JC Brand
e4c9fcbc4e
Merge branch '0.6.x'
...
Conflicts:
converse.css
converse.js
index.html
Add allow_muc config option
2013-10-03 13:53:47 +02:00
JC Brand
feaff64aab
Add setting to enable/disable MUC
2013-10-03 13:16:26 +02:00
JC Brand
32593b755f
Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master
...
Conflicts:
locale/locales.js
Conflicts:
index.html
Add Russian translation by bkocherov (actually made against master branch)
2013-10-03 09:10:24 +02:00
JC Brand
b13ae5af69
Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master
...
Conflicts:
locale/locales.js
2013-10-03 08:58:25 +02:00
Boris Kocherov
f21dffbc27
Add Russian translation.
2013-09-25 14:49:17 +04:00
JC Brand
d1cc7b2cf0
Mention OTR support
2013-09-15 22:28:01 +02:00
JC Brand
6517b9bb9d
Merge branch 'otr'
...
Conflicts:
CHANGES.rst
locale/af/LC_MESSAGES/af.js
locale/af/LC_MESSAGES/converse.json
locale/af/LC_MESSAGES/converse.po
locale/converse.pot
locale/de/LC_MESSAGES/converse.po
locale/en/LC_MESSAGES/converse.po
locale/es/LC_MESSAGES/converse.po
locale/fr/LC_MESSAGES/converse.po
locale/it/LC_MESSAGES/converse.po
locale/pt_BR/LC_MESSAGES/converse.po
2013-09-15 22:08:34 +02:00
JC Brand
9c75683354
Bump versions and re-minified
2013-09-15 21:35:03 +02:00
JC Brand
6768924884
Bump versions and re-minified
2013-09-15 21:29:02 +02:00
JC Brand
d402ed8e8e
Merge branch 'master' into otr
...
Conflicts:
locale/af/LC_MESSAGES/converse.po
locale/converse.pot
2013-09-12 20:57:51 +02:00
JC Brand
84915290b2
Correct version is 0.6.3
2013-09-12 16:00:31 +02:00
JC Brand
008bac4f21
Bump version and minimize files.
2013-09-12 15:51:30 +02:00
JC Brand
68a9909311
Bump version everywhere and regenerate docs.
2013-09-12 15:33:11 +02:00
JC Brand
00cb015d6a
Merge branch 'master' into otr
...
Conflicts:
converse.js
2013-09-10 23:33:30 +02:00
JC Brand
36c2a2ac45
Add option to hide the toolbar
2013-09-08 16:56:38 +02:00
JC Brand
ac3ac98c59
Allow chat statuses to be translated.
...
Add conf setting for allowing OTR.
2013-09-08 16:39:46 +02:00
JC Brand
58e6451ab9
Mention FR
2013-09-02 12:35:14 +02:00
JC Brand
fde8bb3500
New minified files. Bump version to 0.6.1
2013-08-30 00:00:34 +02:00
JC Brand
5cb74239c3
Update security info
2013-08-29 15:07:14 +02:00
JC Brand
202483130d
Bump version number for release.
2013-08-28 00:47:35 +02:00
JC Brand
79be6ea693
Add section about integration into other frameworks
...
Also expand on the security question.
2013-08-28 00:26:52 +02:00
JC Brand
9628189382
Can't call i18n.translate directly if we bundle without i18n support
2013-08-26 16:21:32 +02:00
JC Brand
4ae20ee1b7
Set release date
2013-08-25 23:42:49 +02:00
JC Brand
0fefc55ae1
Update CHANGES.txt.
2013-08-25 23:34:35 +02:00
JC Brand
810f5dec95
Merge branch 'sane-mockup'
...
Conflicts:
docs/html/searchindex.js
index.html
2013-08-24 15:44:58 +02:00
JC Brand
35d8f1d7e8
Use dev scripts with debug option
2013-08-24 02:16:26 +02:00
JC Brand
72d0f566fc
Merge branch 'master' into mockup
2013-08-15 20:47:50 +02:00
JC Brand
66b92fedcb
Add debug option explicitly
2013-08-15 20:43:39 +02:00
JC Brand
9b9bf1ce89
Fix markup
2013-08-15 19:30:33 +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
af1a08e9b6
Docs are more stable and featured now.
2013-08-13 11:29:56 +02:00
JC Brand
861887fd77
Initial markup, testing out font icons
2013-08-09 20:25:21 +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
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
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
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
ce1dce629c
Create new release, version 0.5.0
2013-07-30 23:17:13 +02:00
JC Brand
868ae82bb0
Fixed paths to bower's components dir
2013-07-29 22:40:19 +02:00
JC Brand
4eec2251e7
Better mention of translations
2013-07-28 23:15:49 +02:00
JC Brand
f96515b989
Merge pull request #28 from matheus-morfi/languageptbr
...
Adding pt_BR translations
2013-07-26 16:54:08 -07:00
JC Brand
1281b86e23
Set lang to en
2013-07-27 01:35:28 +02:00
JC Brand
e940b53d6a
Set lang to en
2013-07-27 01:35:04 +02:00
JC Brand
e2ed7757ff
Merge branch 'master' into gh-pages
...
Conflicts:
CHANGES.rst
docs/doctrees/environment.pickle
index.html
2013-07-27 01:23:27 +02:00
JC Brand
7cbeff0d01
Wrap initialize with require so that we know converse is defined
2013-07-27 01:19:32 +02:00
Matheus Figueiredo
6c5a9efe0c
Using dict format to allow standard lang codes
...
Allowing standard language code makes easier to backends to send it to
converse.js keeping coherence.
2013-07-25 17:26:48 -03:00
JC Brand
05c2c95b5f
Merge branch 'master' into gh-pages
...
Conflicts:
CHANGES.rst
converse.min.js
2013-07-25 00:19:13 +02:00
JC Brand
9e05ed8d76
Moved call to initialize to HTML markup
...
- This is more user-friendly and we want it to be outside of the files bundled
and minimized by require.js
2013-07-24 23:58:04 +02:00
JC Brand
e3d0ae6d21
Fix contact form
2013-07-24 12:23:21 +02:00
JC Brand
a2b819b9f9
Fix contact form
2013-07-24 12:21:36 +02:00
JC Brand
084423d2e8
Add twitter and identica links
2013-06-05 08:42:34 +02:00
JC Brand
53a80d5e86
Merge branch 'master' into gh-pages
2013-06-03 22:59:59 +02:00
JC Brand
11d3da1e61
Update download link to version 0.4
2013-06-03 22:59:18 +02:00
JC Brand
cb2e2d77e3
Use minified resources
2013-06-02 22:34:49 +02:00
JC Brand
3ff38ff326
Updated docs
2013-06-02 22:33:29 +02:00
JC Brand
0b1900ecb1
Don't use minified resources in master branch
2013-06-02 21:44:48 +02:00
JC Brand
ab1b43110a
Use minified resources
2013-06-02 21:41:06 +02:00
JC Brand
9b5c9138fb
Add a config option to by default show the controlbox
2013-06-02 21:40:05 +02:00
JC Brand
2e28b820d1
Merge branch 'master' into gh-pages
...
Conflicts:
locale/hu/LC_MESSAGES/converse.po
2013-06-02 20:02:10 +02:00
JC Brand
6464acff5c
Merge branch 'master' into gh-pages
2013-06-02 00:53:38 +02:00
JC Brand
71d6585a31
Update CHANGES and index.html
2013-06-02 00:42:22 +02:00
JC Brand
4f03f43efa
Merge branch 'master' into gh-pages
2013-05-31 12:04:58 +02:00
JC Brand
cd72a0a16e
Add contact details
2013-05-31 12:04:31 +02:00
JC Brand
e4266e1015
Use minified css
2013-05-31 11:57:27 +02:00
JC Brand
1ae5aaed37
Use minified JS
2013-05-28 21:04:43 +02:00
JC Brand
cf7d9b2e5b
I don't think minified JS and CSS should be default
...
To aid with dev
2013-05-28 20:21:44 +02:00
JC Brand
6ea339ca31
Reminified css and js and don't use 0.3 tag anymore
2013-05-26 19:09:33 +02:00
JC Brand
1bac792420
Add minified files and use them in index.html
2013-05-22 19:29:37 +02:00
JC Brand
614f1c7753
Update download links to 0.3 release
2013-05-21 17:05:20 +02:00
JC Brand
d1a743e6b5
Update index.html and give link to docs
2013-05-17 12:48:32 +02:00
JC Brand
008ae5ee8c
Add image credits
2013-05-09 22:29:36 +02:00
JC Brand
4caabf5013
Merge branch 'master' into gh-pages
...
Conflicts:
index.html
2013-04-26 14:33:08 +02:00
JC Brand
e389913444
Better service discovery support
...
Features are saved to localStorage so that service discovery doesn't have to
happen during every request.
2013-04-26 14:30:14 +02:00
JC Brand
bf5c5e36dc
Add security info and disclaimer
2013-04-25 01:06:37 +02:00
JC Brand
7850b3a54e
Add security info and disclaimer
2013-04-25 01:05:34 +02:00
JC Brand
b199690442
Update index.html and CHANGES.rst
2013-04-25 00:23:59 +02:00
JC Brand
93d31f260f
Update README and index.html
...
Now that standalone contact adding works
2013-04-21 00:06:18 +02:00
JC Brand
7066e70b68
Initialize converse inside main.js
2013-04-20 11:37:53 +02:00
JC Brand
58241cbb74
Make converse.js more modular
...
- Removed the $(document).ready handler. Instead, converse.initialize must be
called manually together with settings data.
- As a result the Plone specific event listeners are now also gone.
- Update tests and index.html to deal wit these changes
2013-04-20 11:32:54 +02:00
JC Brand
76676dc31d
Flatten header. Update text on index.html
2013-04-19 22:20:59 +02:00
JC Brand
fdd369eddd
Make the heading clickable (returns to home)
2013-04-19 22:11:25 +02:00
JC Brand
c1bb3ca773
Fix URLs
2013-04-19 17:12:35 +02:00
JC Brand
d646d859b3
Add section on tests
2013-04-19 00:40:02 +02:00
JC Brand
d394ad7ff2
Update index.html with Demo section
2013-04-19 00:09:04 +02:00
JC Brand
cedb6524ce
fix formatting
2013-04-18 23:06:51 +02:00
JC Brand
29c275bb93
Update description
2013-04-14 00:03:43 +02:00
JC Brand
8351977787
Merge branch 'gh-pages' of github.com:jcbrand/converse.js
...
Conflicts:
index.html
2013-04-12 15:59:08 +02:00
JC Brand
7001262419
Merge branches 'gh-pages' and 'master' of github.com:jcbrand/converse.js
2013-04-12 15:54:51 +02:00
JC Brand
ab14915954
Update info on XHR calls
2013-04-11 14:15:27 +02:00
JC Brand
6ca7eb0cbe
Add details of the 2nd screencast
2013-04-11 13:53:21 +02:00
JC Brand
30ad32cd7a
Update index.html again with custom changes
2013-04-02 00:16:58 +02:00
JC Brand
b0d73fc7e1
Trying to get analytics to work
2013-04-02 00:12:13 +02:00
JC Brand
9360da4310
Restore customizations
2013-04-01 23:57:58 +02:00
JC Brand
ce2c9d8547
Create gh-pages branch via GitHub
2013-04-01 14:53:33 -07:00
JC Brand
3fc91f72cd
Google-analytics
2013-04-01 23:44:49 +02:00
JC Brand
aa09ea58cd
Give more detailed feedback when connecting
2013-04-01 19:48:37 +02:00
JC Brand
7066ec9964
Include converse.css
2013-04-01 18:41:46 +02:00
JC Brand
d550ca13c7
Update text on index.html
2013-03-28 18:52:07 +02:00
JC Brand
fce181f150
Tweak styles
2013-03-28 18:46:54 +02:00
JC Brand
c0415996fc
Create gh-pages branch via GitHub
2013-03-28 08:42:49 -07:00