Commit Graph

2301 Commits

Author SHA1 Message Date
JC Brand
367cc14213 Preliminary work to get jasmine tests working again 2013-04-12 20:31:05 +02:00
JC Brand
52bbe024cb Bugfix.
Differentiate more clearly between presence type and the show element
2013-04-12 20:29:37 +02:00
JC Brand
00fc0f874e Update README with new screenshot and text changes from index.html 2013-04-12 16:16:17 +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
2f5c7014be Custom message was hidden with new css from gh-pages 2013-04-01 23:43:17 +02:00
JC Brand
c02dba7682 message time bugfix 2013-04-01 23:42:51 +02:00
JC Brand
09c614816c Make the user search form similar to the status dropdown 2013-04-01 20:50:25 +02:00
JC Brand
43497f7200 Style fancy dropdown li elements 2013-04-01 20:00:30 +02:00
JC Brand
54554e94ed Fix closing of controlbox without a connection being present 2013-04-01 19:53:39 +02:00
JC Brand
aa09ea58cd Give more detailed feedback when connecting 2013-04-01 19:48:37 +02:00
JC Brand
a5badf53f5 Use existing blue from converse.css 2013-04-01 19:48:31 +02:00
JC Brand
78ec620eac Explicitly make background white 2013-04-01 19:47:52 +02:00
JC Brand
2161c02ffb Fix z-indexes 2013-04-01 19:10:09 +02:00
JC Brand
65c54d0ded CSS tweak after merging gh-pages 2013-04-01 18:52:52 +02:00
JC Brand
7066ec9964 Include converse.css 2013-04-01 18:41:46 +02:00
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