Commit Graph

1294 Commits

Author SHA1 Message Date
JC Brand
ff345dcf51 Move mock.js to tests dir. Add utils.js
Both changes from tests-refactor branch
2013-11-02 11:32:52 +02:00
JC Brand
f9c096c061 Use new otr.js release 0.27 2013-11-02 10:15:26 +02:00
JC Brand
2bd27282ce Use newer simpler markup in tests.html 2013-10-27 22:33:07 +02:00
JC Brand
f030e2bafb Move contents of style.css into converse.css 2013-10-27 22:29:27 +02:00
JC Brand
f87900fbff Merge branch 'master' of github.com:jcbrand/converse.js
Conflicts:
	converse.js
	docs/source/index.rst
	index.html
2013-10-20 22:45:03 +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
c6f4943ea6 Simplify the boilerplate HTML require even more.
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:20:45 +02:00
JC Brand
90a5df87d0 Move licenses to docs dir 2013-10-20 21:48:36 +02:00
JC Brand
6855327eaf Updated changes. rm very old TODO list 2013-10-20 21:46:07 +02:00
JC Brand
81f4d19a64 Add option to set the XHR user search URL. Fixes #51 2013-10-20 18:36:07 +02:00
JC Brand
25dc4a27e2 Add smiley support for chatrooms as well 2013-10-20 18:13:34 +02:00
JC Brand
4ab3498285 Bugfix. Roster didn't appear in some cases.
Make sure the last roster item is still added (even if it's a zombie), so that
the roster will be shown (roster is only shown when last_item property is
true).
2013-10-20 12:16:14 +02:00
JC Brand
fef89d658f Fix RST formatting in readme 2013-10-19 23:30:49 +02:00
JC Brand
c69246dd50 Update README with mention of add-ons 2013-10-19 23:25:27 +02:00
JC Brand
a5daeb017e Emoticons now supported for single-user chat. 2013-10-19 23:18:17 +02:00
JC Brand
546204bed6 Merge branch '0.6.x' 2013-10-19 18:28:31 +02:00
JC Brand
61c7174238 Bugfix. Wrong global variable set 2013-10-19 18:24:28 +02:00
JC Brand
fd349b217f Don't unnecessarily create objects for roster items 2013-10-19 18:24:06 +02:00
JC Brand
3d84b3e7ae IE8 bugfix. Fixes #52 2013-10-19 17:10:56 +02:00
JC Brand
7fa6f5a021 Simplify initial markup required 2013-10-17 21:36:32 +02:00
JC Brand
3c57892cbf Add smiley menu to the chat toolbar
Still to do is rendering smileys in the chat area and chatrooms.
2013-10-17 20:30:37 +02:00
JC Brand
0204bdec1b Some minor CSS tweaks and pixel pushing 2013-10-17 20:30:07 +02:00
JC Brand
b061f403b3 Remove superfluous element #collective-xmpp-chat-data 2013-10-16 22:29:13 +02:00
JC Brand
bb1f9955c9 Add smileys and minimize buttons to the mockup 2013-10-16 22:27:53 +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
7a3f0e92f4 Add bitcoin address for donations 2013-10-16 11:49:05 +02:00
JC Brand
29fc658c05 New release, 0.6.6 2013-10-16 11:26:22 +02:00
JC Brand
8713e2cc7a Merge branch '0.6.x' 2013-10-15 21:05:28 +02:00
JC Brand
0deb8be9e7 Fix tests. sendPresence is now sent out at a different place 2013-10-15 21:05:07 +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
150846849d Bugfix. Don't reconnect while strophe is still disconnecting
Causes infinit loop of connects and disconnects
2013-10-15 19:03:10 +02:00
JC Brand
d53caf115a Make sure presence stanza is sent out after roster update
specifically also when localstorage is populated
2013-10-15 18:29:16 +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
f68712a58c Bugfix. Presence stanza sent out before roster initialized 2013-10-08 22:10:00 +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
a01d510249 Proper truncating (with ellipsis) of chatroom names 2013-10-08 09:09:17 +02:00
JC Brand
8a2e4e83e7 Remove getItem.
It's a relic from a time before the class subclassed a Backbone.Collection
2013-10-08 08:45:17 +02:00
JC Brand
a3dc23bf3e Bugfix. When trying to reconnect: 'connection' is not defined.
Conflicts:
	converse.js
2013-10-07 21:36:50 +02:00
JC Brand
b943d4ca35 Bugfix. When trying to reconnect: 'connection' is not defined. 2013-10-07 21:35:52 +02:00
JC Brand
c214000eec Merge branch '0.6.x'
Conflicts:
	converse.min.js
2013-10-07 09:22:17 +02:00
JC Brand
86eef5b1c2 Re-minify JS 2013-10-07 09:21:15 +02:00
JC Brand
e883d137fc Bugfixes. RosterItemView didn't rebind events. Undefined vars in onConnect.
When using show_only_online_users, roster item DOM elements are removed from
the DOM if their status changed from 'online' to something else.

When their status changed to 'online' again, they were re-added.

Their views (RosterItemView) instances however didn't listen to events anymore.

Calling delegateEvents on the view after calling $.remove() fixed this.
2013-10-07 09:16:26 +02:00
JC Brand
4f44be9e29 Merge branch '0.6.x'
Conflicts:
	converse.js
	index.html
2013-10-07 09:16:02 +02:00
JC Brand
18091308be Bugfixes. RosterItemView didn't rebind events. Undefined vars in onConnect.
When using show_only_online_users, roster item DOM elements are removed from
the DOM if their status changed from 'online' to something else.

When their status changed to 'online' again, they were re-added.

Their views (RosterItemView) instances however didn't listen to events anymore.

Calling delegateEvents on the view after calling $.remove() fixed this.
2013-10-07 09:13:16 +02:00
JC Brand
86521d0076 Merge branch '0.6.x'
Conflicts:
	Gruntfile.js
	converse.min.js
2013-10-05 23:21:08 +02:00
JC Brand
1b1bac22ef Reminify JS 2013-10-05 23:18:57 +02:00