Commit graph

6 commits

Author SHA1 Message Date
maxwell
9631977597 RS MS comments propagate, and show up IN REAL TIME 2010-06-30 17:29:32 -07:00
Raphael
3d976ca47e RS, a little bit of autolinking in statuses and comments 2010-06-30 08:36:51 -07:00
danielvincent
762cbcb0f2 Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
	app/views/comments/_comment.html.haml
	app/views/layouts/application.html.haml
2010-06-28 12:09:35 -07:00
ilya
a540f09109 RS, IZ; Added ids to views 2010-06-28 14:46:43 -04:00
danielvincent
39e85754d8 nav should be collapsed into a filter list. comments are more clear. 2010-06-26 00:07:21 -07:00
maxwell
ec01e2c016 Comments now working, but no AJAX, need to refresh to see them 2010-06-25 22:15:41 -07:00