maxwell
|
68c4de6c16
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-09 19:05:12 -07:00 |
|
Raphael
|
91b42ac0e2
|
Specs now mostly pass again, one is failing
|
2010-08-09 18:06:09 -07:00 |
|
Raphael
|
744693e7fb
|
RS, DG; There is now a add friend box on the front page that passes group idto the app
|
2010-08-09 17:33:54 -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
|
02f66d4c0e
|
Merge branch 'group-top' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-09 15:59:23 -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
|
d71966476b
|
Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top
Conflicts:
app/views/albums/show.html.haml
app/views/authors/show.html.haml
app/views/layouts/application.html.haml
app/views/photos/show.html.haml
|
2010-08-09 15:09:05 -07:00 |
|
Raphael
|
039ec0d06e
|
warzombie is now more friendly
|
2010-08-09 15:05:54 -07:00 |
|
Raphael
|
c14bb5a4f8
|
Changed info logging to debug logging almost everywhere
|
2010-08-09 14:39:37 -07:00 |
|
Raphael
|
614c8c72ba
|
RS, DG; Log files should now rotate
|
2010-08-09 14:27:17 -07:00 |
|
Raphael
|
088da2544b
|
RS, DG; We now delete channels when there is nobody subscribed to them
|
2010-08-09 14:11:46 -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
|
ac7530d17f
|
MS IZ person doesn't have friends user does
|
2010-08-09 11:51:32 -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
|
0a40efdaf7
|
Removing unused messages
|
2010-08-09 10:47:45 -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 |
|
maxwell
|
7be374ac48
|
MS IZ fixed a couple of view things as well as the dev db seed script
|
2010-08-09 10:10:41 -07:00 |
|
ilya
|
890f927492
|
removed references of mine? method in all views
|
2010-08-08 22:53:23 -07:00 |
|
ilya
|
ec13527717
|
buren back in the game, THE GAME
|
2010-08-08 21:53:54 -07:00 |
|
ilya
|
6acdde7313
|
fixing the seed script for the refactor
|
2010-08-08 21:42:08 -07:00 |
|
ilya
|
fb4254535d
|
DG IZ; slashes and http in seed script
|
2010-08-08 21:32:09 -07:00 |
|
ilya
|
27b4c19337
|
Getting the deployment changes from master
|
2010-08-08 21:24:34 -07:00 |
|
ilya
|
8e6dfe7166
|
DG IZ having an email key makes devise work, ring to deploy
|
2010-08-08 17:00:39 -07:00 |
|
danielvincent
|
a6f5603dc9
|
added email field to login screen. strange error won't let me log in?
|
2010-08-06 23:55:05 -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
|
5b14c4822c
|
RS, IZ; webhooks spec should use user.post
|
2010-08-06 12:19:40 -07:00 |
|
Raphael
|
62e6ea0756
|
Error rescue in parser now is specific to not a real type error
|
2010-08-06 12:14:51 -07:00 |
|
Raphael
|
d130b82e42
|
RS, IZ; ApplicationHelper specs now passed, specs for mine? moved into person spec as specs for owns?
|
2010-08-06 11:52:33 -07:00 |
|
Raphael
|
6449d20687
|
Working on devise mocking in helper specs
|
2010-08-06 11:19:40 -07:00 |
|
danielvincent
|
6f1a596dff
|
small color changes
|
2010-08-06 00:40:44 -07:00 |
|
danielvincent
|
c54d47337b
|
updated button style
|
2010-08-06 00:15:22 -07:00 |
|
Raphael
|
a46212ec09
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-05 19:17:09 -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 |
|
Raphael
|
94406a5c27
|
Sprinkle back in bundle
|
2010-08-05 15:48:36 -07:00 |
|
Raphael
|
8356126f8d
|
Added deploy key
|
2010-08-05 15:44:18 -07:00 |
|
maxwell
|
7a1011c46c
|
DG MS; webhook specs fixed
|
2010-08-05 15:41:32 -07:00 |
|