danielvincent 0c16038e2d Merge branch 'master' of github.com:diaspora/diaspora_rails ...

Conflicts:
	app/views/layouts/application.html.haml
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass

2010-06-29 17:30:29 -07:00

..

tiny_mce

MS DG added tinyMCE, now a blog is better than a status messsage

2010-06-23 11:58:46 -07:00

FABridge.js

working websocket

2010-06-19 00:09:58 -07:00

jquery142.js

swaped out js for jquery

2010-06-15 09:53:19 -07:00

jquery_form.js

oops forgot to add jquery_form

2010-06-22 16:44:41 -07:00

jquery.infieldlabel.js

DG IZ; cool labels fade in

2010-06-29 17:27:09 -07:00

publisher.js

fixed publisher in chrome and broke it out to a seperate js file

2010-06-29 17:04:46 -07:00

rails.js

swaped out js for jquery

2010-06-15 09:53:19 -07:00

satisfaction-display.js

fixed publisher in chrome and broke it out to a seperate js file

2010-06-29 17:04:46 -07:00

satisfaction.js

thanks to dan, GS works great now MS RS

2010-06-29 15:00:30 -07:00

swfobject.js

working websocket

2010-06-19 00:09:58 -07:00

view.js

fixed publisher in chrome and broke it out to a seperate js file

2010-06-29 17:04:46 -07:00

web_socket.js

working websocket

2010-06-19 00:09:58 -07:00

WebSocketMain.swf

working websocket

2010-06-19 00:09:58 -07:00