Diaspora
|
f8e20eca16
|
|
2010-07-06 19:18:26 -07:00 |
|
Diaspora
|
f7ce67b768
|
|
2010-07-06 19:17:35 -07:00 |
|
root
|
825a447563
|
Merge commit '61ee237'
Conflicts:
script/build
|
2010-07-07 02:13:32 +00:00 |
|
root
|
73445c0780
|
RS MJS Try to change the working directory in a crazy way
|
2010-07-07 02:11:27 +00:00 |
|
root
|
8f9edaf7ca
|
tweaking integrity script
|
2010-07-07 01:44:26 +00:00 |
|
root
|
ddf3a07f76
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-07 01:40:23 +00:00 |
|
root
|
9cbc963539
|
RS, MJS build script for integrity
|
2010-07-07 01:40:11 +00: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
|
65713a733e
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-06 15:11:36 -04: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
|
e7ac8bec32
|
rake task reset kills all friend requests
|
2010-07-06 14:57:21 -04:00 |
|
Raphael
|
76c9877316
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-06 11:50:20 -07:00 |
|
Raphael
|
d00798e982
|
added preventdefault to publisher
|
2010-07-06 11:49:54 -07: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 |
|
ilya
|
b1ca01edb4
|
DG IZ text boxes are round in firefox
|
2010-07-05 20:18:04 -04:00 |
|
ilya
|
e81412f240
|
fixed header shadows in firefox
|
2010-07-05 19:59:54 -04:00 |
|
danielvincent
|
b45a72f41b
|
Merge branch 'master' into color-change
|
2010-07-05 16:40:00 -07:00 |
|
ilya
|
a009bb1565
|
Added the expected behavior of fading out the publisher field(s) if content type is clicked again
|
2010-07-05 05:37:23 -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
|
33611abeba
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-03 23:39:20 -07:00 |
|
danielvincent
|
0001797850
|
moved user's name to the right of their picture
|
2010-07-03 23:39:05 -07:00 |
|
Raphael
|
0c09445919
|
RS; blur in clear_form
|
2010-07-03 23:35:10 -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
|
a0cdd7cb0e
|
RS; Refactored publisher, tested it, it seems to work perfectly, but I could be wrong.
|
2010-07-03 13:26:11 -07:00 |
|
Raphael
|
fffd3aebfc
|
Added remote is true to stream partials, no more redirecting
|
2010-07-02 15:36:07 -07:00 |
|
Raphael
|
cae4f832cf
|
hover fix
|
2010-07-02 15:28:32 -07:00 |
|
Raphael
|
6ab9904f25
|
delete js now applies to new things
|
2010-07-02 15:19:33 -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
|
de0bff17dd
|
Removed headers
|
2010-07-02 11:11:59 -07:00 |
|
Raphael
|
76eabef2c1
|
commenting out sender parsing
|
2010-07-02 10:53:34 -07:00 |
|
danielvincent
|
24af7753fe
|
DG IZ; fixed failing dashboard controller spec
|
2010-07-02 10:27:41 -07:00 |
|
danielvincent
|
d39d02c8ec
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-02 10:03:36 -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 |
|
Raphael
|
8e210cba68
|
REBOOT
|
2010-07-01 20:45:45 -07:00 |
|
Raphael
|
ad5c8ba548
|
dev env
|
2010-07-01 20:30:19 -07:00 |
|