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 |
|
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
|
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 |
|
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
|
f71b5b51d1
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-06 19:33:00 -04:00 |
|
ilya
|
14e5b23eb5
|
trying deploying
|
2010-07-06 19:32:44 -04:00 |
|
Raphael
|
bb325cbf6b
|
cleaned up a little
|
2010-07-06 12:41:28 -07:00 |
|
Raphael
|
d46e82d004
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-06 12:38:46 -07:00 |
|
Raphael
|
7bdf52e173
|
comment numbers update uncleanly
|
2010-07-06 12:38:24 -07:00 |
|
ilya
|
1a44cf5ab3
|
DG IZ push to wrapped to check before sending off a friend req
|
2010-07-06 15:11:24 -04:00 |
|
ilya
|
3974b01b29
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-06 14:49:08 -04:00 |
|
ilya
|
9cddf26a53
|
DG IZ fixed views for friend request
|
2010-07-06 14:48:44 -04:00 |
|
Raphael
|
e971c71451
|
refactor websocket receive insert javascript
|
2010-07-06 11:40:19 -07: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 |
|
danielvincent
|
20b056586d
|
warming up the page. colors were too cold and non-human before.
|
2010-07-05 00:02:16 -07:00 |
|
danielvincent
|
0001797850
|
moved user's name to the right of their picture
|
2010-07-03 23:39:05 -07:00 |
|
danielvincent
|
85cee4064b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
public/javascripts/publisher.js
|
2010-07-03 22:45:56 -07:00 |
|
danielvincent
|
e709eba243
|
publisher as a faux nav element.
|
2010-07-03 22:43:11 -07:00 |
|
Raphael
|
fffd3aebfc
|
Added remote is true to stream partials, no more redirecting
|
2010-07-02 15:36:07 -07:00 |
|
danielvincent
|
df3fe6c2a9
|
DG IZ RS; deletion now gets sent through the websocket
|
2010-07-02 15:16:28 -07:00 |
|
danielvincent
|
8e6ddb4b2e
|
propagate_delete -> propagate_retraction
|
2010-07-02 14:40:25 -07: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
|
737614e04b
|
google analytics for real
|
2010-07-01 22:20:57 -07:00 |
|
Raphael
|
418635aa72
|
Added google to session wall layout
|
2010-07-01 22:13:55 -07:00 |
|
danielvincent
|
1616f5573d
|
DG MS; fixed position of flash message
|
2010-07-01 19:55:38 -07:00 |
|
danielvincent
|
4f7579a5db
|
DG MS; fixed delete button bug on stream
|
2010-07-01 19:49:56 -07:00 |
|
danielvincent
|
88f0244353
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 17:22:30 -07:00 |
|
danielvincent
|
368f550f65
|
preview text next to diaspora in header
|
2010-07-01 17:22:24 -07:00 |
|
maxwell
|
2b2864b78d
|
now its just a message for ie 6, 7
|
2010-07-01 17:12:21 -07:00 |
|
maxwell
|
8d1ec57fa4
|
beefed it up to ie 7
|
2010-07-01 17:07:36 -07:00 |
|
maxwell
|
8e94fc5b4f
|
added mean message
|
2010-07-01 17:05:14 -07:00 |
|
maxwell
|
86c6cdcafa
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 16:38:51 -07:00 |
|
maxwell
|
ba984009f8
|
added chrome frame
|
2010-07-01 16:38:32 -07:00 |
|
danielvincent
|
c27bc09e75
|
fixed user image bug
|
2010-07-01 16:35:44 -07:00 |
|
danielvincent
|
b25880f04a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 16:25:11 -07:00 |
|
danielvincent
|
03e7071aae
|
fixed nav list/link deal for firefox, html compliance
|
2010-07-01 16:24:51 -07:00 |
|
maxwell
|
6f17e5f28f
|
added chrome frame for ie lameos
|
2010-07-01 16:17:32 -07:00 |
|
maxwell
|
b0a3feb30c
|
fixed g analytics
|
2010-07-01 15:51:17 -07:00 |
|
danielvincent
|
c0a744b2ce
|
owner picture selector in application helper
|
2010-07-01 15:34:35 -07:00 |
|
danielvincent
|
99d12964b6
|
to warzombie, user must have email tom@joindiaspora.com, and there musn't be a bomb in the lasanga
|
2010-07-01 10:55:22 -07:00 |
|