Raphael
|
f3c20bf3c0
|
accept comments from strangers
|
2010-08-26 12:01:11 -07:00 |
|
Raphael
|
c7974f8046
|
Save comment's person in receive
|
2010-08-26 11:53:32 -07:00 |
|
Raphael
|
c3fe3bf443
|
RS, IZ, check against self.person, not self in user receive
|
2010-08-26 11:48:34 -07:00 |
|
Raphael
|
9f11a474d8
|
Take out some logging, put in log user on receive
|
2010-08-26 11:46:04 -07:00 |
|
Raphael
|
7feb30e3e1
|
RS, IZ, try saving the comment
|
2010-08-26 11:41:16 -07:00 |
|
Raphael
|
958627cc1c
|
RS IZ object.post
|
2010-08-26 11:32:33 -07:00 |
|
Raphael
|
a65f512fa3
|
verify post creator signature in receive
|
2010-08-26 11:29:06 -07:00 |
|
Raphael
|
6d3d37b7c6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 18:20:37 -07:00 |
|
Raphael
|
ad67798004
|
User to_id on groups_with_post
|
2010-08-25 18:15:38 -07:00 |
|
maxwell
|
a26229223c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 18:07:49 -07:00 |
|
maxwell
|
b4174c664e
|
you can now reassign a peson's group
|
2010-08-25 18:07:31 -07:00 |
|
Raphael
|
50459d896c
|
Socket received comments
|
2010-08-25 17:34:12 -07:00 |
|
Raphael
|
00f8a3e628
|
removed ensure_bson in user. added to_id method to String and ObjectID classes
|
2010-08-25 17:11:57 -07:00 |
|
maxwell
|
22f63a4c44
|
MS IZ added the move friend method
|
2010-08-25 16:58:07 -07:00 |
|
Raphael
|
55c94c385c
|
fixed photos going through the websocket. added a spec to SocketsController
|
2010-08-25 16:08:44 -07:00 |
|
Raphael
|
1faaf1dd81
|
Fix profile pic getting unset on profile update
|
2010-08-24 17:43:11 -07:00 |
|
Raphael
|
41aa8ed10e
|
Specs pass again, need to make albums have a group
|
2010-08-24 17:12:27 -07:00 |
|
Raphael
|
c102e81b03
|
put the visible back in
|
2010-08-24 16:56:04 -07:00 |
|
ilya
|
9db4838543
|
collecting the ids
|
2010-08-24 16:15:59 -07:00 |
|
ilya
|
f5ae090e9b
|
posting empty albums to people
|
2010-08-24 16:05:29 -07:00 |
|
Raphael
|
10bd40d1a2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 15:49:04 -07:00 |
|
Raphael
|
abafa03e92
|
Spec for posting to no group
|
2010-08-24 15:48:51 -07:00 |
|
maxwell
|
204c910f66
|
MS fixing small bugs, adding a very dump list of a groups that a friend is in for you
|
2010-08-24 15:47:44 -07:00 |
|
Raphael
|
72c41a5ff8
|
User post now requires a :to field
|
2010-08-24 15:42:24 -07:00 |
|
Raphael
|
db33d94f07
|
Render nothing on status_messages create, Websockets now honestly
support multiple groups.
|
2010-08-24 14:36:03 -07:00 |
|
Raphael
|
abf48cefd4
|
Putting back in both generate_key
|
2010-08-24 13:41:09 -07:00 |
|
Raphael
|
2814dfceb7
|
Deleted the wrong generate_key
|
2010-08-24 13:40:36 -07:00 |
|
Raphael
|
d1c540439e
|
Moved friending out to a lib file, specs all pass
|
2010-08-24 12:13:10 -07:00 |
|
Raphael
|
7ca9d1e791
|
Changed group_nav a little, deleted people_sidebar
|
2010-08-24 11:02:30 -07:00 |
|
Raphael
|
e05956bddd
|
rescuing 500 on friending someone that was already friends
|
2010-08-23 17:05:24 -07:00 |
|
Raphael
|
511f571ae5
|
Specs mostly pass again
|
2010-08-23 15:01:39 -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 |
|
ilya
|
f7608f6292
|
RS IZ trying to create user through instantiate in seed script
|
2010-08-19 14:12:52 -07:00 |
|
ilya
|
54afb1bad4
|
Rolling assign_key into setup_person
|
2010-08-19 10:49:04 -07:00 |
|
ilya
|
9b47e67a15
|
call the right method in before_validation_on_create
|
2010-08-19 10:23:40 -07:00 |
|
ilya
|
9e78c9b64c
|
removing setup person
|
2010-08-18 21:58:29 -07:00 |
|
ilya
|
0a3277d306
|
maybe the instantiate method will help
|
2010-08-18 21:51:51 -07:00 |
|
ilya
|
0f6ec71dcd
|
we need assign key as well
|
2010-08-18 21:45:41 -07:00 |
|
ilya
|
0c9f041f28
|
we need do bad things in the user for seeding the database
|
2010-08-18 21:42:37 -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
|
21f70c643d
|
DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing
|
2010-08-18 16:15:10 -07:00 |
|
ilya
|
1ab21fe8b1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 15:25:23 -07:00 |
|
ilya
|
08739ad23d
|
DG IZ; retractions remove post references in group objects
|
2010-08-18 15:23:46 -07:00 |
|
Raphael
|
f570199d17
|
Add a couple specs to groups, moved socketing into each block, unclear where or why groups are being created wrongly
|
2010-08-18 14:30:16 -07:00 |
|
Raphael
|
0cc5cc5487
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/models/user.rb
|
2010-08-18 12:20:07 -07:00 |
|
ilya
|
034755368b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-18 12:17:23 -07:00 |
|
Raphael
|
9b2f2bbddf
|
Move socketing out to method from receive
|
2010-08-18 12:14:47 -07:00 |
|
Raphael
|
5e439bdb28
|
Ensure_bson on groups_with_person
|
2010-08-18 11:56:11 -07:00 |
|