Raphael
|
b5bb61a135
|
Merging master into production
|
2010-08-24 11:18:42 -07:00 |
|
Raphael
|
fb33d955c9
|
Fix group show controller/view and haml error in nav
|
2010-08-24 11:11:25 -07:00 |
|
Raphael
|
6ab6dc1c3a
|
Removing some unused routes
|
2010-08-24 11:06:56 -07:00 |
|
Raphael
|
7ca9d1e791
|
Changed group_nav a little, deleted people_sidebar
|
2010-08-24 11:02:30 -07:00 |
|
Raphael
|
ab4ad249df
|
Forgot to return in that rescue
|
2010-08-23 17:09:20 -07:00 |
|
Raphael
|
e05956bddd
|
rescuing 500 on friending someone that was already friends
|
2010-08-23 17:05:24 -07:00 |
|
Raphael
|
0cff5a45a2
|
Deleting gridfs controller
|
2010-08-23 15:02:28 -07:00 |
|
Raphael
|
76f2aa98ac
|
Push to multiple groups
|
2010-08-23 14:45:13 -07:00 |
|
Raphael
|
ae6f0fdc51
|
new photo form now loads through ajax
|
2010-08-23 13:58:33 -07:00 |
|
Raphael
|
01dac4d173
|
Take tinymce out of layout
|
2010-08-23 11:56:06 -07:00 |
|
Raphael
|
dc1dd07720
|
Don't crash on requesting a non-existent email address
|
2010-08-23 11:04:57 -07:00 |
|
Raphael
|
15b2c23b51
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
|
2010-08-23 09:50:38 -07:00 |
|
maxwell
|
361adda6cd
|
added group picker. sends the right params, but posts only have one group right now so thats a bummer
|
2010-08-22 22:20:34 -07:00 |
|
Raphael
|
f66b5f4006
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
Conflicts:
app/controllers/users_controller.rb
app/models/user.rb
config/sprinkle/provision.rb
|
2010-08-19 16:09:08 -07:00 |
|
maxwell
|
35f6856380
|
MS search and index works
|
2010-08-19 12:40:50 -07:00 |
|
maxwell
|
756278f498
|
MS added friend search, and allow for autodiscover
|
2010-08-19 12:37:34 -07:00 |
|
maxwell
|
c98c52ad14
|
MS IZ renamed the array
|
2010-08-19 12:17:29 -07:00 |
|
maxwell
|
df435dc319
|
MS IZ made a reques form in the user index page
|
2010-08-19 11:59:58 -07:00 |
|
maxwell
|
5d25861dc6
|
IZ MS person profile page now displays only posts a user can see
|
2010-08-19 10:46:47 -07:00 |
|
maxwell
|
af8448dd51
|
photos on the profile edit page now are only your photos, for now. also, no more remove friend button on your profile page
|
2010-08-19 10:20:43 -07:00 |
|
maxwell
|
84cc598017
|
MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page
|
2010-08-18 22:58:57 -07:00 |
|
Raphael
|
a23df47dbc
|
Trying to merge in the pivots changes that we want in master
|
2010-08-18 21:10:42 -07:00 |
|
ilya
|
516a667ce4
|
going back to showing the first group on the index page
|
2010-08-18 16:35:11 -07:00 |
|
ilya
|
5de9362933
|
DG IZ setting group id to nil and changing the deploy script for renaming of the repo
|
2010-08-18 16:27:08 -07:00 |
|
Raphael
|
70247f987b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-18 15:04:30 -07:00 |
|
Raphael
|
a52077b176
|
Redirect to the group you put someone in after adding them as friends
|
2010-08-18 14:57:53 -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
|
034755368b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-18 12:17:23 -07:00 |
|
Raphael
|
b7d648e173
|
Validate presence of name on group
|
2010-08-18 11:54:44 -07:00 |
|
Raphael
|
4cd46abaac
|
render nothing at the top
|
2010-08-18 11:48:32 -07:00 |
|
Raphael
|
10aef7a0a3
|
Begin rescue on publics controller to make the post for nonexistent user error more readable
|
2010-08-18 11:46:28 -07:00 |
|
ilya
|
b0088c73d8
|
DG IZ; user's own post gets referenced in group model
|
2010-08-18 10:37:33 -07:00 |
|
Raphael
|
b99a86e6bd
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
app/models/user.rb
|
2010-08-18 10:10:20 -07:00 |
|
danielvincent
|
2409fd3f20
|
user page doesn't give an error anymore. fixed visible_person_by_id to return self.person instead of self
|
2010-08-18 02:40:53 -07:00 |
|
Raphael
|
539316a235
|
Removing posts relation from person
|
2010-08-17 23:50:07 -07:00 |
|
ilya
|
501bcdd197
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 23:25:33 -07:00 |
|
ilya
|
c501707f80
|
DG IZ posts_for to visible posts
|
2010-08-17 23:24:42 -07:00 |
|
ilya
|
55b4d4758f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
app/models/user.rb
spec/models/user_spec.rb
|
2010-08-17 22:58:46 -07:00 |
|
Raphael
|
82f53663ab
|
remove user index
|
2010-08-17 20:39:05 -07:00 |
|
Raphael
|
9285839296
|
Merging in socket-group
|
2010-08-17 20:30:30 -07:00 |
|
Raphael
|
20bc88c0bf
|
Merge branch 'socket-group' of github.com:diaspora/diaspora_rails
|
2010-08-17 20:19:29 -07:00 |
|
Raphael
|
456e9e9634
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
Conflicts:
app/models/user.rb
|
2010-08-17 19:34:19 -07:00 |
|
Raphael
|
48756e77f3
|
Friend_by_id changed to visible_person_by_id
|
2010-08-17 19:32:42 -07:00 |
|
Raphael
|
e8e141b24e
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 19:04:03 -07:00 |
|
Raphael
|
86afa7a987
|
Remove bookmarks and blogs
|
2010-08-17 18:56:42 -07:00 |
|
Raphael
|
8619584834
|
things mostly working
|
2010-08-17 18:27:50 -07:00 |
|
ilya
|
7d68089c8b
|
DG IZ using group_id when passing the id around the app
|
2010-08-17 16:02:12 -07:00 |
|
ilya
|
87bc9dad1d
|
DG IZ added group id to the action hash
|
2010-08-17 15:27:12 -07:00 |
|
Raphael
|
1d6e132a9f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
|
2010-08-17 13:07:26 -07:00 |
|
Raphael
|
842b321dfa
|
User email checking, routes working again
|
2010-08-17 13:02:42 -07:00 |
|