maxwell
|
bf3d34090e
|
MS IZ = AHHH
|
2010-07-15 19:08:25 -07:00 |
|
maxwell
|
9ff4cd015d
|
MS IZ = AHHH
|
2010-07-15 19:05:59 -07:00 |
|
maxwell
|
f927ace140
|
MS IZ = AHHH
|
2010-07-15 19:01:14 -07:00 |
|
maxwell
|
8f59a9d788
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-15 18:42:44 -07:00 |
|
maxwell
|
b903163d3f
|
MS IZ = AHHH
|
2010-07-15 18:42:25 -07:00 |
|
Raphael
|
cae5700222
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-15 18:41:01 -07:00 |
|
Raphael
|
501620e9fb
|
DG RS; fixed some visual bugs. request link now turns red on new request
|
2010-07-15 18:40:55 -07:00 |
|
maxwell
|
65deaba558
|
MS IZ hcard, emptyfiles, routesw
|
2010-07-15 18:36:07 -07:00 |
|
maxwell
|
45abeb2346
|
MS IZ small webfinger bug fixes
|
2010-07-15 17:11:20 -07:00 |
|
maxwell
|
6bab2fedc8
|
MS IZ small webfinger bug fixes
|
2010-07-15 17:06:48 -07:00 |
|
maxwell
|
2dc6b5f46a
|
MS IZ small webfinger bug fixes
|
2010-07-15 17:02:36 -07:00 |
|
maxwell
|
d393458ae8
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-15 16:55:09 -07:00 |
|
maxwell
|
cc712196a6
|
MS IZ small webfinger bug fixes
|
2010-07-15 16:54:46 -07:00 |
|
Raphael
|
7fb7c519cc
|
Adding active to friend view
|
2010-07-15 16:30:56 -07:00 |
|
maxwell
|
720550189d
|
MS more cleanup
|
2010-07-15 10:59:36 -07:00 |
|
maxwell
|
f97218c005
|
MS IZ cleanup of pubsub stuff
|
2010-07-15 10:24:41 -07:00 |
|
maxwell
|
902a8cb349
|
MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change
|
2010-07-10 10:34:46 -07:00 |
|
maxwell
|
d37461a432
|
ms dg post deletions now come thru the socket again
|
2010-07-09 19:27:39 -07:00 |
|
danielvincent
|
7bfdaac691
|
added unfriend button to person show page
|
2010-07-09 18:54:48 -07:00 |
|
danielvincent
|
aa916d0604
|
moved User.first out of the application view
|
2010-07-09 18:50:39 -07:00 |
|
maxwell
|
48adc9ebc1
|
DG MS; person object now properly stored with request object save
|
2010-07-09 14:07:35 -07:00 |
|
maxwell
|
b49f198c4f
|
DG MS cleaned up some of the request stuff
|
2010-07-09 11:14:00 -07:00 |
|
maxwell
|
408b58cbbf
|
Merge branch 'safe-without-gpg'
|
2010-07-08 21:45:27 -07:00 |
|
maxwell
|
6cc9deaa65
|
merging with head
|
2010-07-08 21:44:14 -07:00 |
|
maxwell
|
583d3d0c82
|
DG MS friending now tests out
|
2010-07-08 21:34:38 -07:00 |
|
maxwell
|
06eec9204a
|
DG MS; person request is now request. refactoring as well. user verbiage for request actions
|
2010-07-08 18:28:39 -07:00 |
|
ilya
|
122bbf0cd2
|
Merging dashboards
|
2010-07-08 20:56:25 -04:00 |
|
ilya
|
a5db2cd231
|
Added keyrings to gitignore, symlinked to shared dir in cap scripts
|
2010-07-08 20:54:20 -04:00 |
|
maxwell
|
900f1080a2
|
DG MS; fixed destroy links for status messages, added link for requests on top nav
|
2010-07-08 14:38:26 -07:00 |
|
maxwell
|
db1811eb61
|
DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket
|
2010-07-08 14:14:03 -07:00 |
|
maxwell
|
1fa2dfd6eb
|
DG MS cleaning up friend request
|
2010-07-08 12:05:06 -07:00 |
|
maxwell
|
89959bdcb8
|
MS dont make person request remote for now
|
2010-07-08 10:42:42 -07:00 |
|
maxwell
|
d04093f456
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-08 10:18:03 -07:00 |
|
ilya
|
3ff32e4905
|
DG IZ; removed views and controller associated with friend object
|
2010-07-08 12:38:14 -04: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 |
|
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
|
7bdf52e173
|
comment numbers update uncleanly
|
2010-07-06 12:38:24 -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 |
|
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 |
|