danielvincent
|
3d12e9ab51
|
DG RS; friending through groups
|
2010-08-12 21:30:16 -07:00 |
|
ilya
|
dd3fb1677b
|
MS IZ continuiung to squash failing tests
|
2010-08-11 17:44:43 -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
|
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 |
|
ilya
|
29b1217fcd
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-11 12:29:35 -07:00 |
|
ilya
|
11a8b8f3d4
|
MS IZ testing many the friend request user methods
|
2010-08-11 12:28:48 -07:00 |
|
Raphael
|
144e9ed439
|
Bookmarks now clean link in instantiate, posting them should work right again
|
2010-08-11 11:18:40 -07:00 |
|
maxwell
|
a45d852f30
|
MS IZ request specs now PASS
|
2010-08-10 17:36:25 -07:00 |
|
Raphael
|
8b9cd3453d
|
RS, DG; User.instatntiate simplified
|
2010-08-10 15:44:14 -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
|
71612ba33d
|
changing some webfinger resources
|
2010-08-10 12:36:00 -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
|
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 |
|
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
|
aebe7b97c0
|
DG RS; added groups. can't delete, but can make new ones
|
2010-08-09 15:58:53 -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
|
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
|
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 |
|
maxwell
|
cc04d4e08d
|
MS DG; more tests pass after making person have many people
|
2010-08-05 13:25:31 -07:00 |
|
danielvincent
|
67d4aea1db
|
DG MS; fixed album specs
|
2010-08-05 12:00:23 -07:00 |
|
danielvincent
|
dae8f26692
|
DG MS; fixed most photo specs
|
2010-08-05 11:56:37 -07:00 |
|
danielvincent
|
4827953bec
|
DG MS; person specs are now passing. retraction on unfriend is now uncommented
|
2010-08-05 10:29:30 -07:00 |
|
danielvincent
|
42c0b82068
|
one failing test in Person. i have no idea.
|
2010-08-04 23:54:15 -07:00 |
|
danielvincent
|
f2d7f35b84
|
unfriend still not removing association from bad_friend
|
2010-08-04 20:29:54 -07:00 |
|
danielvincent
|
c92a225556
|
DG MS; user-person relationship done. bunch of failing stuff.
|
2010-08-04 19:22:14 -07:00 |
|
Raphael
|
b8a2e8ecdf
|
RS, IZ; Fix Photo.instantiate, make photo url include spec a little more specific
|
2010-08-04 16:13:32 -07:00 |
|
Raphael
|
e2c0ae2cee
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-04 16:01:37 -07:00 |
|
danielvincent
|
75663b2447
|
DG MS; user can edit photo caption. also, photos have captions.
|
2010-08-04 16:00:59 -07:00 |
|
Raphael
|
58addca8dd
|
RS, IZ; extracted and murdered ostatus.
|
2010-08-04 16:00:01 -07:00 |
|
Raphael
|
74691228d3
|
RS, IZ; All relevant controllers now create with user.post
|
2010-08-02 16:32:52 -07:00 |
|
Raphael
|
9fe37b1d8c
|
RS, IZ; Cleaned up user spec, started to add current_user.post
|
2010-08-02 16:16:23 -07:00 |
|
Raphael
|
ac45960bbf
|
Fixed album spec, condensed traversing tests to halve the time of the spec (It was reading the photos from disk on every spec)
|
2010-08-02 12:33:36 -07:00 |
|
Raphael
|
b8ae6b44a2
|
RS; Image filename is now the Photo model id
|
2010-08-02 10:05:34 -07:00 |
|
maxwell
|
6aa1fa1826
|
DG MS profiles send? who knows...
|
2010-07-29 15:53:38 -07:00 |
|
danielvincent
|
11a099914c
|
on photo delete, photo checks to see if it is set in user profile. if it is, profile is edited.
|
2010-07-29 11:07:44 -07:00 |
|
maxwell
|
049361ea15
|
MS profiles should send, need to just make the parser now
|
2010-07-28 18:32:00 -07:00 |
|
maxwell
|
80db1132d1
|
Fixed the tests;
|
2010-07-28 16:50:38 -07:00 |
|
maxwell
|
311a60f7b7
|
MS should be able to unsubscribe from an ostatus feed now, now it needs to be put in the controller
|
2010-07-23 21:16:36 -07:00 |
|