maxwell
|
b9718c079b
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-10 16:05:10 -07:00 |
|
maxwell
|
8a3eb9f6cf
|
IZ MS one last receive url...i think...
|
2010-08-10 16:04:08 -07:00 |
|
Raphael
|
a9ebe44b1d
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-10 16:03:54 -07:00 |
|
Raphael
|
0fb55be7a0
|
RS, DG; You can now sign up to be a user on a seed
|
2010-08-10 16:03:38 -07:00 |
|
maxwell
|
89c54d1a63
|
MS IZ receive url in the request and a slash in person
|
2010-08-10 15:56:34 -07:00 |
|
Raphael
|
8b9cd3453d
|
RS, DG; User.instatntiate simplified
|
2010-08-10 15:44:14 -07:00 |
|
maxwell
|
432ce02a14
|
MS IZ receive url is better
|
2010-08-10 15:35:40 -07:00 |
|
Raphael
|
a8b77cf868
|
DG RS; made an instantiate method for user which makes a person and profile
|
2010-08-10 15:35:27 -07:00 |
|
maxwell
|
da4de20ce1
|
IZ MS made things push to the receive url
|
2010-08-10 15:24:51 -07:00 |
|
maxwell
|
487de2d865
|
MS IZ receive, not recieve
|
2010-08-10 15:17:12 -07:00 |
|
maxwell
|
7ff25ef81a
|
MS IZ saved the person model
|
2010-08-10 15:10:11 -07:00 |
|
maxwell
|
0ffe893f8a
|
MS IZ merging diffs
|
2010-08-10 12:37:04 -07:00 |
|
maxwell
|
71612ba33d
|
changing some webfinger resources
|
2010-08-10 12:36:00 -07:00 |
|
Raphael
|
aa1f892c35
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-10 12:27:02 -07:00 |
|
Raphael
|
9947a2abb8
|
RS, DG; latest_status thing now works, started putting signup back in
|
2010-08-10 12:26:43 -07:00 |
|
maxwell
|
95c4de5d6c
|
MS IZ fixed all of the request specs zomg
|
2010-08-10 11:26:32 -07:00 |
|
Raphael
|
b645eb3f3d
|
RS, DG, comments socket again
|
2010-08-10 11:05:29 -07:00 |
|
Raphael
|
aa4d428ab7
|
RS, DG; Groups can now include other users, the user's first group is displayed by default, never use many without :in =>
|
2010-08-10 11:02:04 -07:00 |
|
maxwell
|
38abd51666
|
MS IZ fixed a couple of failing specs in the parser
|
2010-08-09 21:09:51 -07:00 |
|
maxwell
|
68c4de6c16
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-09 19:05:12 -07:00 |
|
maxwell
|
d443be35f9
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
Conflicts:
app/controllers/publics_controller.rb
app/models/user.rb
|
2010-08-09 17:31:46 -07:00 |
|
maxwell
|
56d7c67bbb
|
Going toward pending requests
|
2010-08-09 17:21:41 -07:00 |
|
Raphael
|
838fec4921
|
RS, DG; Working on group nav, fixed some stuff in photo
|
2010-08-09 16:34:06 -07:00 |
|
Raphael
|
aebe7b97c0
|
DG RS; added groups. can't delete, but can make new ones
|
2010-08-09 15:58:53 -07:00 |
|
Raphael
|
c14bb5a4f8
|
Changed info logging to debug logging almost everywhere
|
2010-08-09 14:39:37 -07:00 |
|
Raphael
|
59147eb232
|
Person.new in dev seed
|
2010-08-09 13:03:27 -07:00 |
|
Raphael
|
33a827c33a
|
RS, DG; Websocket is now working again, users have a channel
|
2010-08-09 13:02:08 -07:00 |
|
maxwell
|
82578ad80c
|
MS IZ doing the friend querying correctly in user
|
2010-08-09 12:25:36 -07:00 |
|
maxwell
|
4243d8efca
|
MS IZ using the particular user's friends in the send_friend_request_to
|
2010-08-09 12:19:26 -07:00 |
|
maxwell
|
f4428679ef
|
First attempt at fixing warzombie friendingw
|
2010-08-09 11:44:13 -07:00 |
|
maxwell
|
921ee029b6
|
MS IZ putting the person in the return trip
|
2010-08-09 11:12:15 -07:00 |
|
maxwell
|
8532be1307
|
MS IZ moved activate_friend to user
|
2010-08-09 11:03:16 -07:00 |
|
maxwell
|
67843a21e2
|
MS IZ saving the person in accept of FR
|
2010-08-09 10:50:49 -07:00 |
|
Raphael
|
73a6cd911b
|
DG, RS; User person delegation fixed
|
2010-08-09 10:46:02 -07:00 |
|
maxwell
|
544f7f08e5
|
MS IZ doesn't delete from pending friends since there is nothing in it
|
2010-08-09 10:38:13 -07:00 |
|
ilya
|
890f927492
|
removed references of mine? method in all views
|
2010-08-08 22:53:23 -07:00 |
|
ilya
|
8e6dfe7166
|
DG IZ having an email key makes devise work, ring to deploy
|
2010-08-08 17:00:39 -07:00 |
|
Raphael
|
214685e5a9
|
Dev seed might now work
|
2010-08-06 17:11:50 -07:00 |
|
Raphael
|
7076097ee4
|
RS, IZ; The tests are green.
|
2010-08-06 16:56:13 -07:00 |
|
Raphael
|
4350e17656
|
RS, IZ; removed lots of putses, fixed up request, parser, retractions
|
2010-08-06 16:01:39 -07:00 |
|
Raphael
|
f2e327d908
|
User factory now works
|
2010-08-06 13:27:42 -07:00 |
|
Raphael
|
0f596af5c4
|
Refactored message_queue getting, fixed retraction spec
|
2010-08-06 13:13:00 -07:00 |
|
Raphael
|
b5cbfab36e
|
RS, IZ; Comment spec now passes
|
2010-08-05 19:01:45 -07:00 |
|
maxwell
|
5d924dadf4
|
MS DG; 19 failing specs left
|
2010-08-05 17:16:51 -07:00 |
|
maxwell
|
5e6d0c1153
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into
friend-refactor, also fixed more specs
Conflicts:
app/models/person.rb
app/models/user.rb
spec/factories.rb
|
2010-08-05 15:13:05 -07:00 |
|
danielvincent
|
dae8f26692
|
DG MS; fixed most photo specs
|
2010-08-05 11:56:37 -07:00 |
|
Raphael
|
bb66e87905
|
RS, IZ; Encryption specs now pass with openssl
|
2010-08-05 11:56:31 -07:00 |
|
Raphael
|
f8e7d3f313
|
RS, IZ; Rolling back special casing of friend-request
|
2010-08-05 11:14:40 -07:00 |
|
Raphael
|
2429a1a476
|
RS, IZ; keys should roxml
|
2010-08-05 11:13:38 -07:00 |
|
Raphael
|
ebe14b5afd
|
RS, IZ; Not using person in friend request verification
|
2010-08-05 11:09:36 -07:00 |
|