ilya
|
6e6763de14
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-08 13:28:17 -04:00 |
|
ilya
|
93c5404cab
|
DG IZ message handler is a singleton'
|
2010-07-08 13:28:02 -04:00 |
|
maxwell
|
d04093f456
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-08 10:18:03 -07:00 |
|
maxwell
|
6293f9f585
|
socket is now a controller
|
2010-07-08 10:17:41 -07:00 |
|
maxwell
|
58ed75a289
|
MS socket now works in the server, but I can't figure out how to mock this stuff
|
2010-07-07 22:20:15 -07:00 |
|
danielvincent
|
b496ee567a
|
DG IZ; person request now appends url to pass validations when saved from inbound XML
|
2010-07-07 20:24:50 -07:00 |
|
maxwell
|
a35892428c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-07 20:09:27 -07:00 |
|
maxwell
|
947f1a60e7
|
RS MS added url for for the socket controller
|
2010-07-07 18:59:32 -07:00 |
|
danielvincent
|
a33acd134e
|
DG IZ; fixed person requesting (friend requests).
|
2010-07-07 18:10:47 -07:00 |
|
danielvincent
|
3d105e7c1e
|
DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.
|
2010-07-07 16:53:52 -07:00 |
|
maxwell
|
bf0afeede0
|
i really have no clue why this works nwow
|
2010-07-07 16:41:42 -07:00 |
|
Raphael
|
2db3366ef4
|
RS, MS; test FILES are now in EM run blocks, tests are in next_ticks
|
2010-07-07 16:04:31 -07:00 |
|
maxwell
|
cc603a7943
|
autotest for rafi
|
2010-07-07 15:27:44 -07:00 |
|
maxwell
|
5350b40e3c
|
broken autotest for rafi
|
2010-07-07 15:27:22 -07:00 |
|
danielvincent
|
d705d39f70
|
DG IZ; added for action to friend request
|
2010-07-07 13:44:06 -07:00 |
|
Raphael
|
4b6e29a4d2
|
Sorry rspec
|
2010-07-07 10:55:32 -07:00 |
|
Raphael
|
86c31698f6
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-07 10:53:40 -07:00 |
|
Raphael
|
43dcf0bada
|
Breaking specs to test CIJOE
|
2010-07-07 10:53:22 -07:00 |
|
ilya
|
79c0e960ad
|
DG IZ; friend now has an active flag
|
2010-07-06 23:43:01 -04:00 |
|
ilya
|
d5d4d4ae84
|
DG IZ; friend requests get saved locally, friend object gets transmitted and saved remotely
|
2010-07-06 21:29:49 -04:00 |
|
ilya
|
a23a2691f3
|
DG IZ; starting fresh with requests
|
2010-07-06 20:09:20 -04:00 |
|
ilya
|
0587688d18
|
DG IZ; friend requests pass through the webhook, need to refactor the parser because now the XML does not make sense, no big deal. P.S. WTF is send_to_seed in message_handler
|
2010-07-06 02:15:49 -04:00 |
|
ilya
|
027d953cf4
|
DG IZ added the FriendRequest model.
|
2010-07-05 23:28:51 -04:00 |
|
Raphael
|
f9856517db
|
Post deletion now deletes comments
|
2010-07-02 14:34:58 -07:00 |
|
danielvincent
|
469599a4a9
|
DG RS IZ; added post deletion propagation
|
2010-07-02 13:08:53 -07:00 |
|
Raphael
|
de0bff17dd
|
Removed headers
|
2010-07-02 11:11:59 -07:00 |
|
danielvincent
|
24af7753fe
|
DG IZ; fixed failing dashboard controller spec
|
2010-07-02 10:27:41 -07:00 |
|
maxwell
|
e696ef7023
|
comments now go go go and are tested RS MS
|
2010-06-30 16:24:44 -07:00 |
|
maxwell
|
fcdba64828
|
pushing to test comment passing
|
2010-06-30 13:54:09 -07:00 |
|
Raphael
|
340a57ea6d
|
RS; figured out recursive serialization with ROXML, posts and comments now serialize with their persons
|
2010-06-30 08:06:30 -07:00 |
|
maxwell
|
638b71ae28
|
Added a spec to person, cleaned up some putses
|
2010-06-29 17:45:13 -07:00 |
|
maxwell
|
77c0bb5c4e
|
urls are now unique, and a user can not add a friend with the exact same url
|
2010-06-29 16:04:15 -07:00 |
|
maxwell
|
19e03c7077
|
person now has a url, and they cant add themselves any longer.... you need to add a url to your old development user, and we need to set it in the field
|
2010-06-29 12:33:00 -07:00 |
|
maxwell
|
1b2745e788
|
added socket renderer spec and slight refactor
|
2010-06-29 11:50:15 -07:00 |
|
maxwell
|
a683a2c1aa
|
RS MS added goog analytics
|
2010-06-29 11:45:41 -07:00 |
|
maxwell
|
45a9d9e342
|
moved the silly destory link over a bit
|
2010-06-28 22:15:52 -07:00 |
|
ilya
|
b5b9c647d7
|
DG IZ Created the profile model & friend view now shows the information
|
2010-06-28 21:32:09 -04:00 |
|
ilya
|
2b42ef216c
|
DG IZ; added a profile; one-to-one relation with Person (non-singleton)
|
2010-06-28 18:20:56 -04:00 |
|
ilya
|
25198a7e86
|
IZ, RS; Moved XML parser to lib
|
2010-06-28 15:56:46 -04:00 |
|
maxwell
|
c99416ca67
|
fixed a broken common.rb spec
|
2010-06-25 23:08:59 -07:00 |
|
maxwell
|
6467f943da
|
MS^2 Comments serialize and deserialize properly
|
2010-06-25 22:49:53 -07:00 |
|
maxwell
|
0d700046c4
|
MS^2 Object parser can handle comments
|
2010-06-25 22:29:08 -07:00 |
|
maxwell
|
a6c33b3e7b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-25 22:15:49 -07:00 |
|
maxwell
|
ec01e2c016
|
Comments now working, but no AJAX, need to refresh to see them
|
2010-06-25 22:15:41 -07:00 |
|
ilya
|
f5ecfebcb9
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-25 23:23:44 -04:00 |
|
maxwell
|
4d65cfab09
|
MS^2 Added the friends panel to application layout
|
2010-06-25 19:22:05 -07:00 |
|
ilya
|
2557271dcc
|
removed users link
|
2010-06-25 21:57:18 -04:00 |
|
ilya
|
5fb8d90738
|
added a validation to bookmark
|
2010-06-25 21:46:20 -04:00 |
|
maxwell
|
b105b0d6f2
|
merged in
|
2010-06-25 15:34:40 -07:00 |
|
maxwell
|
5cade230ac
|
added silly debug toggle
|
2010-06-25 15:33:23 -07:00 |
|