Commit graph

245 commits

Author SHA1 Message Date
Daniel Vincent Grippi
edae8f1e66 DG MS; fixed a view bug in user edit page. page also displays diaspora username . 2010-09-08 11:58:03 -07:00
Daniel Vincent Grippi
36730978ca login page is more elegant 2010-09-08 11:37:54 -07:00
Raphael
960d40278c Add username, login with username or email 2010-09-08 10:59:08 -07:00
maxwell
804777f9ae MS; updated to released rails 2010-09-07 16:47:53 -07:00
maxwell
919d7d23c0 MS fixed log view; also, now pagination is now working, check out the new method which returns plucky queries instead of arrays 2010-09-06 17:46:09 +02:00
Daniel Vincent Grippi
5e34506df6 added custom as_json methods to models 2010-08-29 23:46:19 -07:00
Daniel Grippi
de8450c7c5 line spacing adjustments. 2010-08-29 23:04:28 -07:00
Raphael
b85333e52b error.new 2010-08-28 18:36:49 -07:00
Raphael
d25e6017e3 Make a couple of generic errors ArgumentError 2010-08-28 14:53:08 -07:00
Raphael
5ef442d93f RS, IZ; Socket spec now more realistic, visible_person_by_id fixed 2010-08-27 10:48:14 -07:00
Raphael
831609ad15 Make a stranger that you receive a comment from visible 2010-08-27 10:19:10 -07:00
Raphael
c629c23232 Tests now pass, export_key changed to exported_key, profile.person changed to _parent_document 2010-08-27 10:05:14 -07:00
Raphael
36342db7a8 logging statement in the user receive after parsing the person 2010-08-26 17:04:40 -07:00
Raphael
977786aa65 remove the raise from the top of user receive 2010-08-26 16:31:57 -07:00
Raphael
9d48b45ee4 merge conflict line 2010-08-26 16:28:34 -07:00
Raphael
3ed191e972 MS IZ testing on remote 2010-08-26 16:27:01 -07:00
Raphael
c3e199a00a Also set object.person 2010-08-26 15:36:56 -07:00
Raphael
0e36d89711 Also set object.person 2010-08-26 15:09:54 -07:00
Raphael
94bb754c34 Changed parseing person from xml a little, using it for comments. 2010-08-26 15:06:39 -07:00
Raphael
1ce34bc6fc Parenthases 2010-08-26 14:42:16 -07:00
Raphael
73d8317534 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-26 14:38:22 -07:00
Raphael
31f79be068 Save the person on receiving a comment 2010-08-26 14:38:06 -07:00
ilya
1d69b88e2e to id so that change of group works 2010-08-26 12:17:35 -07:00
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