Commit Graph

3578 Commits

Author SHA1 Message Date
JC Brand
70ce73a655 base.css is no longer needed 2013-04-01 18:41:17 +02:00
JC Brand
e93ddb59db Merge branch 'gh-pages'
Conflicts:
	index.html
2013-04-01 18:28:30 +02:00
JC Brand
156b56602a Fix height for panels 2013-03-28 20:50:28 +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
125e3b73a8 Merge branch 'vcard' of github.com:jcbrand/converse.js
Conflicts:
	CHANGES.rst
	converse.js
2013-03-28 18:36:53 +02:00
JC Brand
f8056be8b4 Update changes 2013-03-28 18:21:07 +02:00
JC Brand
de4de3880d Add cname 2013-03-28 18:11:42 +02:00
JC Brand
c0415996fc Create gh-pages branch via GitHub 2013-03-28 08:42:49 -07:00
JC Brand
b1a80ac5ea css tweaks and added background image 2013-03-28 11:46:43 +02:00
JC Brand
2b78460e82 Bugfix, don't call create if we don't yet have a connection 2013-03-28 11:38:16 +02:00
JC Brand
5255457630 Update index.html with info on the project 2013-03-28 11:37:30 +02:00
JC Brand
ee583a84ab Add #chatpanel 2013-03-28 10:18:52 +02:00
JC Brand
ac5e618687 Update todo 2013-03-28 08:50:29 +02:00
JC Brand
9533f4635f Bugfix. Set up the RosterView after the Controlbox
Also, don't save subscription requesting contacts to cache.
2013-03-28 08:48:00 +02:00
JC Brand
6f5ff13055 Don't check the cache in getVCard since we don't call it so often anymore 2013-03-28 07:35:38 +02:00
JC Brand
fe8ed1282c Better handling of user avatar. Don't create canvas el if there's no avatar.
Also, don't fetch vCards in rosterHandler. This could be very expensive for
large rosters, instead we'll fetch them when a user comes online.
2013-03-28 07:17:05 +02:00
JC Brand
49b4633c3f Send nick along with subscription request.
Additionally:
It's not feasible to get the current user's fullname from a vCard all the time,
so we still get it from the DOM for now.
2013-03-28 07:03:16 +02:00
JC Brand
3a4dfb69b8 Add support for sending nick along with subscription request 2013-03-28 07:02:05 +02:00
JC Brand
cd5615f79f initStatus is still usefull when we have undefined initial status.
Also set bare_jid, domain and muc_domain on the xmppchat obj and not the
connection obj.
2013-03-28 06:23:08 +02:00
JC Brand
e41fddee0f Refactored XMPPStatus a bit to remove initStatus and to always show status_message 2013-03-27 20:41:19 +02:00
JC Brand
0f1739ca3d Update TODO 2013-03-27 20:18:20 +02:00
JC Brand
9631c9405c Remove burry.js 2013-03-27 20:18:12 +02:00
JC Brand
2500d98ebe Use backbone.localStorage for XMPPStatus model.
This was the last thing still using burry.js, so we now have one less
dependency :)
2013-03-27 20:18:00 +02:00
JC Brand
f6e299cc82 Bugfix. getVCard called errback by mistake. 2013-03-27 19:50:35 +02:00
JC Brand
8863eb8a86 Bugfix, set width to max-width 2013-03-27 19:50:13 +02:00
JC Brand
102218b019 Compatibility changes for backbone 1.0 2013-03-27 19:33:53 +02:00
JC Brand
f9e4d16cf5 Upgrade backbone to 1.0 2013-03-27 19:33:35 +02:00
JC Brand
50ee481d2e Bump underscore.js to 1.4.4 2013-03-27 17:22:32 +02:00
JC Brand
07a65f5b6a Also show different days on chatrooms.
- Use a template to show the day's date.
- Use time element for the date and datetime attr
2013-03-27 17:07:24 +02:00
JC Brand
acbcf3fd2a Indicate on the chatbox when messages span different days. 2013-03-27 14:13:42 +02:00
JC Brand
43434043ab Store time as iso8601 strings on messages 2013-03-27 13:55:18 +02:00
JC Brand
c0aba8445e Update CHANGES.txt 2013-03-25 13:16:28 +02:00
JC Brand
cdcbe41d59 Refactored rosterChanged method.
Roster changes are listened to on the rosterview and the applicable chatbox is
updated.

Custom status messages are now remembered upon page load.
2013-03-25 13:08:27 +02:00
JC Brand
7046656370 Bugfix. Controlbox showed automatically upon page load 2013-03-25 12:00:24 +02:00
JC Brand
1c3a5a94cc Don't store chatroom messages, the XMPP server (ejabberd) does this already. 2013-03-25 10:44:13 +02:00
JC Brand
e964e97285 Properly clear message counter upon page reload 2013-03-24 21:45:55 +02:00
JC Brand
744c575a6a Bugfix. Message counter was not replacing previous count 2013-03-24 21:31:56 +02:00
JC Brand
a4b69ded7d Save to localStorage messages sent in chatroom.
Also removed the need for the appendMessage method.
2013-03-24 21:26:21 +02:00
JC Brand
b49f21558c Remove closeChatRoom and reuse closeChat on ChatBoxView 2013-03-24 17:54:29 +02:00
JC Brand
2d08916ce7 Remove the keyPressed method from ChatRoomView and reuse the one on ChatBoxView 2013-03-24 17:49:42 +02:00
JC Brand
337a3c2bdb Remove ChatRoom model and instead re-use normal ChatBox model. 2013-03-24 17:44:47 +02:00
JC Brand
eaf39165ae Use scrollDown and make sure newly created chatboxes are scrolled down 2013-03-24 17:23:13 +02:00
JC Brand
d27c69d7b9 Set up the roster earlier
and do the fetching and sorting when the view is initialized
2013-03-24 17:09:49 +02:00
JC Brand
d985b7ae27 More bugfixes.
Specifically handle the case where a chatbox was destroyed, and then opened again.
We still have the view, so we reuse it.
2013-03-24 14:01:55 +02:00
JC Brand
efad677f16 JSLint 2013-03-24 12:53:29 +02:00
JC Brand
b495f83745 Now also remove openControlBox 2013-03-24 12:36:40 +02:00
JC Brand
d0b9761d20 More work to remove the need for collection-view anti-pattern.
Remove createChatBox from chatboxesview and move the message received listener to chatboxes
2013-03-24 12:34:41 +02:00
JC Brand
9d89779bee Remove openChat and showChat from chatboxes view and use events instead 2013-03-24 12:05:13 +02:00
JC Brand
974aa02605 Remove unused method 2013-03-24 11:49:22 +02:00