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 |
|
maxwell
|
f172c9e1d2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 18:45:31 -07:00 |
|
maxwell
|
a37b5ae09b
|
IZ MS; added a basic salmon library to help with directed messages, and made an keyhash method
|
2010-08-23 18:45:20 -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
|
7eb1bb5a00
|
removing the sanity check
|
2010-08-19 14:36:15 -07:00 |
|
ilya
|
542c1769f9
|
doing a sanity check, that not requiring serialized key passes the validation
|
2010-08-19 14:25:34 -07:00 |
|
ilya
|
f7608f6292
|
RS IZ trying to create user through instantiate in seed script
|
2010-08-19 14:12:52 -07:00 |
|
maxwell
|
02da9bf634
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 12:00:21 -07:00 |
|
maxwell
|
df435dc319
|
MS IZ made a reques form in the user index page
|
2010-08-19 11:59:58 -07:00 |
|
ilya
|
b723c5997e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 10:49:18 -07:00 |
|
ilya
|
54afb1bad4
|
Rolling assign_key into setup_person
|
2010-08-19 10:49:04 -07:00 |
|
maxwell
|
9942aef5d4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 10:46: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 |
|
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
|
ef15cddf19
|
RS, IZ a slash
|
2010-08-18 18:13:17 -07:00 |
|
ilya
|
5cae2b21b1
|
RS, IZ fixed the url for the image
|
2010-08-18 18:06:13 -07:00 |
|
ilya
|
f6892b88d6
|
photo.remote_photo is relative
|
2010-08-18 17:50:13 -07:00 |
|
ilya
|
76b4b55e98
|
Added spec for remote photo url setting to photos
|
2010-08-18 17:39:38 -07:00 |
|
ilya
|
4019e4425a
|
Checking for failing to set url in photo
|
2010-08-18 17:12:28 -07:00 |
|
ilya
|
b279d6582b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 16:59:52 -07:00 |
|
ilya
|
803de25cc0
|
DG IZ albums are now posts
|
2010-08-18 16:59:19 -07:00 |
|
Raphael
|
5a2b42e4e5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 16:37:12 -07:00 |
|
Raphael
|
7ed31ab96a
|
Moving to file store
|
2010-08-18 16:37:05 -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 |
|
Raphael
|
b7d648e173
|
Validate presence of name on group
|
2010-08-18 11:54:44 -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 |
|
Raphael
|
d640c0672f
|
switch deploy branch to actually be one we are working on
|
2010-08-18 10:56:09 -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
|
539316a235
|
Removing posts relation from person
|
2010-08-17 23:50:07 -07:00 |
|
Raphael
|
42cc1da9f6
|
Removing posts array from person
|
2010-08-17 23:27:17 -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
|
86afa7a987
|
Remove bookmarks and blogs
|
2010-08-17 18:56:42 -07:00 |
|
ilya
|
2614cb5add
|
DG IZ; find_all_by instead of find_by
|
2010-08-17 18:37:08 -07:00 |
|
ilya
|
f4f377e7e7
|
DG IZ finding albums by person_id
|
2010-08-17 18:26:48 -07:00 |
|
ilya
|
daf08cd9f9
|
DG IZ posts by the user get websocketed on the group page and albums
get signed?
|
2010-08-17 18:06:35 -07:00 |
|
ilya
|
f15b3c46b2
|
DG IZ; reverted to before removing latest message methods
|
2010-08-17 17:40:48 -07:00 |
|
ilya
|
e5036862f6
|
DG IZ removed the latest message javascript as well as the hash
|
2010-08-17 16:49:58 -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
|
0af6f7b0e5
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:48:47 -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 |
|
Raphael
|
72559cbce1
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:37:18 -07:00 |
|
Raphael
|
50919ef491
|
Requesting now searches the local server by email for a matching person.
|
2010-08-17 10:37:09 -07:00 |
|
ilya
|
5761d5db36
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:35:37 -07:00 |
|
ilya
|
dea6551374
|
DG IZ; moved post() into User from Person.
|
2010-08-17 10:35:25 -07:00 |
|
Raphael
|
e32315b6c6
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:25:11 -07:00 |
|
Raphael
|
2c1c5df281
|
Moved search specs, renamed method
|
2010-08-17 10:24:59 -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
|
3ff4387cd8
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-16 16:22:55 -07:00 |
|
Raphael
|
ad07521e07
|
Made a few more tests pass
|
2010-08-16 16:22:46 -07:00 |
|
ilya
|
b3d8f59c77
|
removed many posts association within group model
|
2010-08-16 15:51:31 -07:00 |
|
Raphael
|
3a591b0713
|
Merging in friend-refactor...
|
2010-08-16 15:35:14 -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 |
|
Raphael
|
e4af2ccb1f
|
Rename send_comment to dispatch_comment, simplify it
|
2010-08-16 14:22:14 -07:00 |
|
Raphael
|
71aaa9240c
|
only socket if the object isn't yours
|
2010-08-16 14:18:08 -07:00 |
|
Raphael
|
b463958f0d
|
Check ownership on the comment's post
|
2010-08-16 14:06:52 -07:00 |
|
Raphael
|
deeb4832c1
|
Error: insufficient parenthases
|
2010-08-16 14:02:26 -07:00 |
|
Raphael
|
1f40ea23b6
|
logging is awesome
|
2010-08-16 13:58:05 -07:00 |
|
Raphael
|
91b0a1e8f9
|
PAAAARSER
|
2010-08-16 13:51:49 -07:00 |
|
Raphael
|
f8e2e6bf2d
|
Infinite loops are the best
|
2010-08-16 13:49:48 -07:00 |
|
Raphael
|
598c646b07
|
Hack to get comments working for now
|
2010-08-16 12:56:02 -07:00 |
|
Raphael
|
1f0ca49ce5
|
url, not user.url
|
2010-08-16 12:29:26 -07:00 |
|
Raphael
|
fb8d3b3e85
|
Check for local person before destroying accepted request
|
2010-08-16 12:26:15 -07:00 |
|
Raphael
|
4f22222b30
|
Splitting accept_friend_request into two methods
|
2010-08-16 12:10:23 -07:00 |
|
Raphael
|
00a9bd820b
|
Parser confused :(
|
2010-08-16 11:50:43 -07:00 |
|
Raphael
|
a8b402636a
|
Shorten ensure_bson
|
2010-08-16 11:47:23 -07:00 |
|
Raphael
|
f4d6a04f4f
|
Get objects by bson id
|
2010-08-16 11:46:36 -07:00 |
|
Raphael
|
4c731bf818
|
special-casing local webfinger
|
2010-08-16 11:29:14 -07:00 |
|
Raphael
|
99fb383dc0
|
BSONify ids in by_id methods
|
2010-08-16 11:13:00 -07:00 |
|
Raphael
|
eb793ea129
|
Took out a couple more references to User.owner
|
2010-08-16 11:07:18 -07:00 |
|
Raphael
|
3efa36587a
|
Took out a bunch of user.owner references
|
2010-08-16 11:01:58 -07:00 |
|
Raphael
|
26abc68236
|
Use group_by_id or friend_by_id, no querying on friends or groups
|
2010-08-16 10:50:38 -07:00 |
|
Raphael
|
0e67ef8d7e
|
Inspect the friend before calling unfriended by
|
2010-08-16 10:38:36 -07:00 |
|
Raphael
|
ad2d8f8b46
|
Specify id field in the query whose result is passed to unfriended_by
|
2010-08-16 10:37:07 -07:00 |
|
Raphael
|
e84b25b3f5
|
Log the xml again
|
2010-08-16 10:31:39 -07:00 |
|
ilya
|
053ed9176d
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-16 10:00:25 -07:00 |
|
ilya
|
d0c02859e6
|
DG IZ got one more log statement in the user person retraction
|
2010-08-16 10:00:04 -07:00 |
|
danielvincent
|
f1f827120b
|
intentional failing test in user for tomorrow.
|
2010-08-15 21:03:19 -07:00 |
|
danielvincent
|
80b81c1ae1
|
comment now validates presence of text. also, removed unused method overriding ==.
|
2010-08-15 19:28:59 -07:00 |
|
ilya
|
22910ef4ce
|
Check retraction signature on person retraction
|
2010-08-13 19:09:55 -07:00 |
|
ilya
|
99c8869b8f
|
Removing a friend now deletes them from the group(s) they are in
|
2010-08-13 18:56:33 -07:00 |
|
ilya
|
ac40f7974e
|
RS, IZ; A variety of fixes and some refactoring on unfriending and activate friend
|
2010-08-13 18:37:09 -07:00 |
|
ilya
|
bd271b7bec
|
RS, IZ; Refactored the user unfriend and unfriended_by
|
2010-08-13 17:33:26 -07:00 |
|
ilya
|
7bd1193c5e
|
RS, IZ; wrote and tested user retractions actually removing people from the friend lists on retractions
|
2010-08-13 11:19:20 -07:00 |
|
ilya
|
1fcb033b68
|
RS, IZ; receiving a request no longer overwrites the group it is destined for, specs pass
|
2010-08-13 10:55:18 -07:00 |
|
ilya
|
23fc799b4d
|
Turning up logging on friend request receive
|
2010-08-13 10:04:33 -07:00 |
|
ilya
|
3d57fb7f78
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-13 09:47:29 -07:00 |
|
ilya
|
5e33de7e56
|
unfriended method in the user
|
2010-08-13 09:47:08 -07:00 |
|
danielvincent
|
64c7a87aeb
|
removed two bogus lines from user.receive
|
2010-08-13 08:57:22 -07:00 |
|
danielvincent
|
3d12e9ab51
|
DG RS; friending through groups
|
2010-08-12 21:30:16 -07:00 |
|
ilya
|
26bebbe393
|
MS IZ changing it back
|
2010-08-12 10:04:56 -07:00 |
|
ilya
|
352b9f65e0
|
MS IZ unfriending maybe works
|
2010-08-11 20:23:28 -07:00 |
|
ilya
|
283b4a40b5
|
IZ MS tests now pass
|
2010-08-11 17:51:46 -07:00 |
|
ilya
|
b0455b9532
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-11 17:45:13 -07:00 |
|
ilya
|
dd3fb1677b
|
MS IZ continuiung to squash failing tests
|
2010-08-11 17:44:43 -07:00 |
|
Raphael
|
a19e29f2c2
|
RS, DG; Album.mine_or_friends actually fixed
|
2010-08-11 17:33:37 -07:00 |
|
Raphael
|
3d46a49b97
|
RS, DG; fixing Album.mine_or_friends
|
2010-08-11 16:50:22 -07:00 |
|
Raphael
|
cf5476f601
|
RS, DG; stop crashing trying to socket albums
|
2010-08-11 16:40:08 -07:00 |
|
Raphael
|
ab25e35a71
|
Comment guids now serialize
|
2010-08-11 16:31:12 -07:00 |
|
Raphael
|
d8959326d5
|
RS, DG; unsocketing is back in
|
2010-08-11 16:24:05 -07:00 |
|
Raphael
|
4b5071ec05
|
DG, RS; socketing back in for your own posts
|
2010-08-11 16:12:55 -07:00 |
|
Raphael
|
2d14f64745
|
RS, DG; Socketing moved to user
|
2010-08-11 16:10:27 -07:00 |
|
Raphael
|
0907d7a9fd
|
RS, DG; Cleaned up the switch in user.receive
|
2010-08-11 16:01:16 -07:00 |
|
Raphael
|
bee71c5a23
|
RS, DG; All saving moved to user
|
2010-08-11 15:22:06 -07:00 |
|
Raphael
|
c6a620c7dd
|
RS, DG; store_from_xml is gone, use user.receive
|
2010-08-11 15:05:05 -07:00 |
|
Raphael
|
5abd604dad
|
RS, DG; build_xml_for has been eliminated.
|
2010-08-11 14:21:53 -07:00 |
|
Raphael
|
d7828a8bf3
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
Conflicts:
spec/controllers/publics_controller_spec.rb
|
2010-08-11 13:59:21 -07:00 |
|