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 |
|
ilya
|
4d86933f4a
|
DG IZ; user's visible posts method queries group objects for their posts
|
2010-08-18 11:40:02 -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 |
|
ilya
|
b0088c73d8
|
DG IZ; user's own post gets referenced in group model
|
2010-08-18 10:37:33 -07:00 |
|
Raphael
|
045878de64
|
call ensure_bson once in visible_person_by_id and group_by_id
|
2010-08-18 10:12:22 -07:00 |
|
Raphael
|
9a188fd9f0
|
Don't try to unsocket albums
|
2010-08-18 10:08:38 -07:00 |
|
Raphael
|
36f8289522
|
Fixing retractions on albums, adding back remove_from_view
|
2010-08-18 10:03:37 -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
|
4a4686ce6e
|
refactored signature validation got specs passing
|
2010-08-17 23:21:00 -07:00 |
|
Raphael
|
cb152ea3c3
|
Shortened user receive, moderated groups.first in the socketing
|
2010-08-17 22:34:01 -07:00 |
|
Raphael
|
55d84b3288
|
Broke up user spec, put user update back in routes
|
2010-08-17 22:03:45 -07:00 |
|
Raphael
|
20bc88c0bf
|
Merge branch 'socket-group' of github.com:diaspora/diaspora_rails
|
2010-08-17 20:19:29 -07:00 |
|
Raphael
|
48756e77f3
|
Friend_by_id changed to visible_person_by_id
|
2010-08-17 19:32:42 -07:00 |
|
Raphael
|
ba83cb9d29
|
Index on email
|
2010-08-17 16:24:52 -07:00 |
|
ilya
|
5e95650ae3
|
DG IZ logger info
|
2010-08-17 16:11:25 -07:00 |
|
ilya
|
f70cf4a60a
|
DG IZ first group for now, added logging statements
|
2010-08-17 16:09:55 -07:00 |
|
ilya
|
87bc9dad1d
|
DG IZ added group id to the action hash
|
2010-08-17 15:27:12 -07:00 |
|
ilya
|
fd539926c2
|
DG IZ; changed variable 'c' to 'comment'
|
2010-08-17 13:59:58 -07:00 |
|
ilya
|
b5c6bbd1df
|
DG IZ; moved commenting methods into User (from Person).
|
2010-08-17 13:56:52 -07:00 |
|
ilya
|
2a90e59f1e
|
DG IZ the group should view the posts for the group (and yourself) w
|
2010-08-17 12:22:14 -07:00 |
|
ilya
|
2af41a0ea9
|
DG IZ; posts_for :group method in User
|
2010-08-17 12:14:02 -07:00 |
|
ilya
|
4f8b8ad3c5
|
DG IZ saving the post
|
2010-08-17 11:03:31 -07:00 |
|
ilya
|
a9c9619a54
|
DG IZ; posting from a user includes adding to the many posts association in said user
|
2010-08-17 10:43:18 -07:00 |
|
ilya
|
dea6551374
|
DG IZ; moved post() into User from Person.
|
2010-08-17 10:35:25 -07:00 |
|
danielvincent
|
7e5ace7cbc
|
minor cleanup in models
|
2010-08-16 22:44:22 -07:00 |
|
ilya
|
1d92d11841
|
DG IZ; user refs are incremented as well as decremented for Posts
|
2010-08-16 20:39:24 -07:00 |
|
ilya
|
74c70d9410
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/models/user.rb
spec/lib/diaspora_parser_spec.rb
|
2010-08-16 18:18:30 -07:00 |
|
ilya
|
b5594ad6bc
|
DG IZ; post user refs started (permissions)
|
2010-08-16 18:11:23 -07:00 |
|
Raphael
|
eae4053902
|
Encryption removed from callbacks, except retractions sort of. verification is in user.receive
|
2010-08-16 17:23:54 -07:00 |
|
Raphael
|
fbee1aabb1
|
Special casing comments from people that you are not friends with so it accepts them
|
2010-08-16 16:32:20 -07:00 |
|
Raphael
|
ad07521e07
|
Made a few more tests pass
|
2010-08-16 16:22:46 -07:00 |
|
Raphael
|
b0537e2f34
|
Comments pushing in the right directions
|
2010-08-16 15:04:09 -07:00 |
|
Raphael
|
fa2e621b0f
|
Syntax error
|
2010-08-16 14:24:30 -07:00 |
|