ilya
|
c1d2f271d9
|
RS, IZ; close the file after writing the backer number
|
2010-08-13 12:43:27 -07:00 |
|
ilya
|
7e377fc292
|
RS, IZ; adding set backer number to routes, not authenticating it
|
2010-08-13 12:37:49 -07:00 |
|
ilya
|
23c57c653f
|
RS, IZ; Trying to speed up cap db reset
|
2010-08-13 12:34:24 -07:00 |
|
ilya
|
640d148fa7
|
RS IZ trying to do DB seed without the loop
|
2010-08-13 12:17:54 -07:00 |
|
ilya
|
5c9a96d245
|
That last commit was dumb, including the right module
|
2010-08-13 12:11:10 -07:00 |
|
ilya
|
0b23b959b4
|
Adding parser methods to devutilities, these should probably be in controller helpers
|
2010-08-13 12:06:29 -07:00 |
|
ilya
|
99eec04265
|
Using webfinger in dev_utilities
|
2010-08-13 11:59:54 -07:00 |
|
ilya
|
339f1a65e2
|
Removing friends check on zombiefriends
|
2010-08-13 11:50:43 -07:00 |
|
ilya
|
085dd61607
|
RS, IZ; changed zombiefriends to use webfinger
|
2010-08-13 11:43:30 -07:00 |
|
ilya
|
ef97b4f19d
|
RS, IZ; updated DB seed to have a group, zombiefriend with a group
|
2010-08-13 11:36:59 -07:00 |
|
ilya
|
7bd1193c5e
|
RS, IZ; wrote and tested user retractions actually removing people from the friend lists on retractions
|
2010-08-13 11:19:20 -07:00 |
|
ilya
|
1fcb033b68
|
RS, IZ; receiving a request no longer overwrites the group it is destined for, specs pass
|
2010-08-13 10:55:18 -07:00 |
|
ilya
|
23fc799b4d
|
Turning up logging on friend request receive
|
2010-08-13 10:04:33 -07:00 |
|
ilya
|
af6c70db47
|
RS, IZ; hack to test requests, accepted friends go into the first group.
|
2010-08-13 09:56:18 -07:00 |
|
ilya
|
3d57fb7f78
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-13 09:47:29 -07:00 |
|
ilya
|
5e33de7e56
|
unfriended method in the user
|
2010-08-13 09:47:08 -07:00 |
|
danielvincent
|
64c7a87aeb
|
removed two bogus lines from user.receive
|
2010-08-13 08:57:22 -07:00 |
|
danielvincent
|
3d12e9ab51
|
DG RS; friending through groups
|
2010-08-12 21:30:16 -07:00 |
|
ilya
|
26bebbe393
|
MS IZ changing it back
|
2010-08-12 10:04:56 -07:00 |
|
ilya
|
9bec1131f6
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-12 10:03:51 -07:00 |
|
danielvincent
|
f7e43ee3d0
|
photo fancybox indicates progress. unfortunately, it doesn't reset after you close it right now...
|
2010-08-12 00:27:26 -07:00 |
|
danielvincent
|
013a6d0849
|
add photo is now in a fancy-pancy box
|
2010-08-11 20:45:57 -07:00 |
|
ilya
|
352b9f65e0
|
MS IZ unfriending maybe works
|
2010-08-11 20:23:28 -07:00 |
|
danielvincent
|
97b04fc0d7
|
nevermind
|
2010-08-11 20:12:10 -07:00 |
|
danielvincent
|
3e1081acaa
|
commented out tinyMCE js for the time being
|
2010-08-11 20:09:16 -07:00 |
|
ilya
|
0d97c883cf
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-11 19:59:29 -07:00 |
|
ilya
|
c2d027517f
|
MS IZ commented out the friending for debug
|
2010-08-11 19:59:13 -07:00 |
|
Raphael
|
8b51f94d1d
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-11 18:13:38 -07:00 |
|
Raphael
|
eb36190188
|
DG, RS; Albums create failure prettier
|
2010-08-11 18:13:23 -07:00 |
|
ilya
|
283b4a40b5
|
IZ MS tests now pass
|
2010-08-11 17:51:46 -07:00 |
|
ilya
|
b0455b9532
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-11 17:45:13 -07:00 |
|
ilya
|
dd3fb1677b
|
MS IZ continuiung to squash failing tests
|
2010-08-11 17:44:43 -07:00 |
|
Raphael
|
a19e29f2c2
|
RS, DG; Album.mine_or_friends actually fixed
|
2010-08-11 17:33:37 -07:00 |
|
Raphael
|
144d673dac
|
DG, RS; album button looks better
|
2010-08-11 17:16:20 -07:00 |
|
Raphael
|
3d46a49b97
|
RS, DG; fixing Album.mine_or_friends
|
2010-08-11 16:50:22 -07:00 |
|
Raphael
|
cf5476f601
|
RS, DG; stop crashing trying to socket albums
|
2010-08-11 16:40:08 -07:00 |
|
Raphael
|
ab25e35a71
|
Comment guids now serialize
|
2010-08-11 16:31:12 -07:00 |
|
Raphael
|
d8959326d5
|
RS, DG; unsocketing is back in
|
2010-08-11 16:24:05 -07:00 |
|
Raphael
|
4b5071ec05
|
DG, RS; socketing back in for your own posts
|
2010-08-11 16:12:55 -07:00 |
|
Raphael
|
2d14f64745
|
RS, DG; Socketing moved to user
|
2010-08-11 16:10:27 -07:00 |
|
Raphael
|
0907d7a9fd
|
RS, DG; Cleaned up the switch in user.receive
|
2010-08-11 16:01:16 -07:00 |
|
Raphael
|
bee71c5a23
|
RS, DG; All saving moved to user
|
2010-08-11 15:22:06 -07:00 |
|
Raphael
|
c6a620c7dd
|
RS, DG; store_from_xml is gone, use user.receive
|
2010-08-11 15:05:05 -07:00 |
|
Raphael
|
5228e51262
|
RS, DG; store_from_xml now takes one objects. All talk of arrays and collections has been eliminated.
|
2010-08-11 14:40:48 -07:00 |
|
Raphael
|
11758beaf3
|
RS, DG; Removed <posts> from xml
|
2010-08-11 14:26:39 -07:00 |
|
Raphael
|
5abd604dad
|
RS, DG; build_xml_for has been eliminated.
|
2010-08-11 14:21:53 -07:00 |
|
Raphael
|
e94faf89bb
|
Finishing moving to dynamic build_xml_for
|
2010-08-11 14:05:57 -07:00 |
|
Raphael
|
d7828a8bf3
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
Conflicts:
spec/controllers/publics_controller_spec.rb
|
2010-08-11 13:59:21 -07:00 |
|
Raphael
|
9c9ebbf4c7
|
build_xml_for is no longer static, we should probably change the name
|
2010-08-11 13:58:18 -07:00 |
|
ilya
|
29b1217fcd
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-11 12:29:35 -07:00 |
|