Raphael
|
701bec670f
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
Conflicts:
app/views/groups/index.html.haml
config/deploy_config.yml
|
2010-08-18 20:50:28 -07:00 |
|
Raphael
|
ac694eda8c
|
A bunch of dumb checks to make the group index publisher pass tests
|
2010-08-18 15:42:06 -07:00 |
|
Raphael
|
61c906a9d3
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
app/models/user.rb
app/views/groups/index.html.haml
config/deploy_config.yml
|
2010-08-18 14:45:41 -07:00 |
|
ilya
|
055c222fc2
|
DG IZ; using group_id instead of group in post method. passing in :group_id into publisher partial
|
2010-08-18 10:53:43 -07:00 |
|
Raphael
|
d5c608c7ae
|
Removing welcome home line
|
2010-08-17 13:07:11 -07:00 |
|
ilya
|
fc7f59bdfc
|
DG IZ stream for the current user's posts
|
2010-08-17 10:13:23 -07:00 |
|
danielvincent
|
18cd4b858a
|
broke out group index and show
|
2010-08-14 00:27:43 -07:00 |
|
Raphael
|
a48fbaaf59
|
RS, DG; DashboardsController has been eliminated.
|
2010-08-10 11:36:00 -07:00 |
|