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
|
23057869e1
|
DG MS debugging friend request
|
2010-07-09 18:41:39 -07:00 |
|
maxwell
|
8147602570
|
DG MS friends now are delete
|
2010-07-09 18:10:11 -07:00 |
|
maxwell
|
ed412e12b0
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-09 16:08:07 -07:00 |
|
maxwell
|
f5fd0b011a
|
DG MS; upon friend deletion, all connected posts and comments are purged
|
2010-07-09 16:08:00 -07:00 |
|
ilya
|
929adca383
|
calling after create hook direcly in tests
|
2010-07-09 17:42:32 -04:00 |
|
maxwell
|
cf352b6f8d
|
DG MS; cannot friend request an existing friend.
|
2010-07-09 14:35:42 -07:00 |
|
maxwell
|
b052ddeb84
|
DG MS; database seed scripts now ensure all friends are set to true
|
2010-07-09 14:13: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
|
d21a3baf32
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-09 11:14:11 -07:00 |
|
maxwell
|
b49f198c4f
|
DG MS cleaned up some of the request stuff
|
2010-07-09 11:14:00 -07:00 |
|
ilya
|
228d8820c8
|
checking in test keyring
|
2010-07-09 14:09:42 -04:00 |
|
ilya
|
cfaf13ac7d
|
Use pregenerated keys
|
2010-07-09 13:45:00 -04:00 |
|
ilya
|
eb9c6814d6
|
screen in tools, keyring clearing disabled
|
2010-07-09 13:36:24 -04:00 |
|
maxwell
|
275e0baa0c
|
MS DG fixed deploy script so tom has correct URL
|
2010-07-09 10:27:18 -07:00 |
|
maxwell
|
c7e1bc3a46
|
DG MS debugging friend requests
|
2010-07-09 10:18:29 -07:00 |
|
maxwell
|
874ea58678
|
new rake spec for dev database (different default user than tom, friends
with all other boxes)
|
2010-07-09 09:59:48 -07:00 |
|
maxwell
|
c2c64d9938
|
MS DG more friend request tests pass
|
2010-07-08 23:14:54 -07:00 |
|
ilya
|
2142ad2776
|
People -> Person in rake backer
|
2010-07-09 01:03:46 -04: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 |
|
ilya
|
cdd6e2034e
|
Updated deploy scripts
|
2010-07-09 00:23:37 -04:00 |
|
maxwell
|
e1834cc887
|
DG MS fixed spec
|
2010-07-08 20:51:12 -07:00 |
|
ilya
|
caa92ea3a0
|
commented ci out of deploy
|
2010-07-08 21:30:19 -04: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
|
895742824d
|
Sped up specs, fixed env
|
2010-07-08 21:23:08 -04: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 |
|
ilya
|
9e8426ceb4
|
RS, IZ; Users now have keys, keyring now in db folder
|
2010-07-08 19:57:10 -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
|
da4e148fed
|
DG MS; fixing friend request
|
2010-07-08 11:44:18 -07:00 |
|
maxwell
|
1885b5b6b9
|
MS DG fixed friend request
|
2010-07-08 11:30:58 -07:00 |
|
maxwell
|
11d4a9e2c7
|
rolled back some message handler nonsense
|
2010-07-08 11:16:38 -07:00 |
|
maxwell
|
0c00e6a512
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-08 10:42:55 -07:00 |
|
maxwell
|
89959bdcb8
|
MS dont make person request remote for now
|
2010-07-08 10:42:42 -07:00 |
|
Raphael
|
2a90fb2bdc
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-08 10:28:36 -07:00 |
|
Raphael
|
97b1e8dd5d
|
oops
|
2010-07-08 10:28:23 -07:00 |
|
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 |
|
Raphael
|
4819ce694b
|
removed emspec from gemfile
|
2010-07-08 10:27:22 -07:00 |
|
maxwell
|
f3fd820dc7
|
Merge branch 'socket-foo' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-08 10:20:24 -07:00 |
|
maxwell
|
09b79293f0
|
merged master
|
2010-07-08 10:19:58 -07: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
|
29eb883f76
|
socket is now a controller
|
2010-07-08 10:14:17 -07:00 |
|
ilya
|
3ff32e4905
|
DG IZ; removed views and controller associated with friend object
|
2010-07-08 12:38:14 -04:00 |
|