maxwell
|
0f75072477
|
make import spec pending with diaspora handle bug
|
2010-10-14 23:03:23 -07:00 |
|
maxwell
|
341009e20f
|
Merge branch 'master' of github.com:diaspora/diaspora into maxwell
Conflicts:
Gemfile
Gemfile.lock
spec/models/user/invite_spec.rb
|
2010-10-14 23:02:06 -07:00 |
|
maxwell
|
11925ded2b
|
moving branches
|
2010-10-14 19:15:32 -07:00 |
|
ilya
|
4a7c4e0848
|
requests are made on invite but perhaps they should be made on signup so that we have a person
|
2010-10-14 18:12:18 -07:00 |
|
maxwell
|
d61a227fc7
|
posts now serialize their created_at time
|
2010-10-14 16:49:08 -07:00 |
|
maxwell
|
a30a2666c6
|
merging
|
2010-10-14 16:32:37 -07:00 |
|
Raphael
|
d66c1e70bc
|
Merge remote branch 'bigbash/280-bug-fix'
|
2010-10-14 13:21:50 -07:00 |
|
Sarah Mei
|
007b06c8ea
|
Stub ::Devise.mailer for great justice. And/or fewer strange arity errors.
|
2010-10-14 00:26:07 -07:00 |
|
maxwell
|
adbc4dddbc
|
added pending spec for aspect removal on account deletion
|
2010-10-14 00:12:00 -07:00 |
|
maxwell
|
f2bdc98b47
|
Merge branch 'master' of github.com:diaspora/diaspora into import
|
2010-10-13 23:52:46 -07:00 |
|
maxwell
|
e1dd0cf6be
|
Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion
|
2010-10-13 23:49:13 -07:00 |
|
maxwell
|
6ef1780008
|
removing pointless pending spec
|
2010-10-13 23:20:25 -07:00 |
|
maxwell
|
e218ab6780
|
Merge branch 'master' of github.com:diaspora/diaspora into import
Conflicts:
app/controllers/users_controller.rb
|
2010-10-13 23:09:48 -07:00 |
|
ilya
|
d0c6f12ea8
|
added another attack vector spec
|
2010-10-13 18:43:22 -07:00 |
|
maxwell
|
04f6cdaacf
|
MS DG; basic view support; it works, but it is ugly
|
2010-10-13 18:42:24 -07:00 |
|
maxwell
|
a86d965079
|
DG MS; importer now takes params for username, password, and diaspora handle
|
2010-10-13 17:07:16 -07:00 |
|
maxwell
|
f04934cbae
|
DG MS; ensure aspect post_ids are only for user
|
2010-10-13 16:54:18 -07:00 |
|
ilya
|
f82f241932
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-13 16:53:17 -07:00 |
|
ilya
|
36b9f66f60
|
the invited user keeps track of who invited them, limit on invites,
removed the invites controller test
|
2010-10-13 16:52:33 -07:00 |
|
maxwell
|
b395208a51
|
DG MS; added more stuff to importer.
|
2010-10-13 16:42:27 -07:00 |
|
Raphael
|
3fb2ee6e1b
|
adding spec for password confirmation fail
|
2010-10-13 16:28:56 -07:00 |
|
maxwell
|
2c40fa5ebf
|
DG MS; spec for clean_aspects
|
2010-10-13 13:32:22 -07:00 |
|
ilya
|
3b8998ab71
|
Invitations contains the inviters
|
2010-10-13 13:29:45 -07:00 |
|
maxwell
|
637a79a99d
|
DG MS; spec for clean_aspects
|
2010-10-13 13:28:10 -07:00 |
|
maxwell
|
55227f3f72
|
DG MS; filter_post method, aspect_clean method
|
2010-10-13 13:10:08 -07:00 |
|
Shawn McGuire
|
5c26b895f2
|
Fixed trailing whitespace bug
|
2010-10-13 14:39:04 -05:00 |
|
Shawn McGuire
|
711dcdc5f4
|
Issue #280 Fixed trailing whitespace error
|
2010-10-13 14:36:03 -05:00 |
|
danielvincent
|
0315869a24
|
all specs should pass again after merge
|
2010-10-13 09:43:58 -07:00 |
|
danielvincent
|
59c3be41b3
|
Merge branch 'master' of github.com:diaspora/diaspora into import
|
2010-10-13 09:21:27 -07:00 |
|
ilya
|
add350ce16
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-13 00:19:29 -07:00 |
|
Sarah Mei
|
56c6688c81
|
Take out reloads so specs run on 1.9.2
|
2010-10-12 20:54:00 -07:00 |
|
danielvincent
|
7ea3fe5bf1
|
MS DG; verifys implemented, but need more tests
|
2010-10-12 18:53:12 -07:00 |
|
ilya
|
324f14c719
|
setting the token to nil on accept of invite
|
2010-10-12 18:23:59 -07:00 |
|
danielvincent
|
92e5622247
|
DG MS; adding verification methods to importer.
|
2010-10-12 17:41:09 -07:00 |
|
danielvincent
|
8915eca3d5
|
DG MS; testing that posts actually get serialized into an array.
|
2010-10-12 15:39:52 -07:00 |
|
danielvincent
|
8720dfa950
|
DG MS; made test slower. posts now export correctly.
|
2010-10-12 15:33:08 -07:00 |
|
ilya
|
0896052b80
|
remote comment spec, which passed surprisingly, the comment contains the person
|
2010-10-12 15:31:54 -07:00 |
|
danielvincent
|
1d1ff7e330
|
Merge branch 'master' of github.com:diaspora/diaspora into import
|
2010-10-12 11:34:31 -07:00 |
|
danielvincent
|
2e8bba1a04
|
MS DG adding more to exporter and importer
|
2010-10-12 11:34:13 -07:00 |
|
ilya
|
a068ee532d
|
almost all green
|
2010-10-12 11:17:29 -07:00 |
|
Raphael
|
19b5fb0b84
|
Delete instead of destroy to simulate a remote user
|
2010-10-12 10:55:19 -07:00 |
|
ilya
|
a955dd308e
|
user_friending_spec green, did a slight refactor need more
|
2010-10-12 10:25:43 -07:00 |
|
ilya
|
ee2d134cb0
|
receiving spec is green
|
2010-10-11 19:20:00 -07:00 |
|
danielvincent
|
948c5d9b02
|
DG MS; end of day.
|
2010-10-11 19:04:27 -07:00 |
|
ilya
|
03df0ff716
|
parser spec is green
|
2010-10-11 18:22:19 -07:00 |
|
danielvincent
|
b2f3074eb0
|
DG MS; scenario for importer spec
|
2010-10-11 17:00:42 -07:00 |
|
ilya
|
bb7e2a9918
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 14:58:22 -07:00 |
|
ilya
|
007f6cfb6f
|
close account
|
2010-10-11 14:58:11 -07:00 |
|
danielvincent
|
9bfb213465
|
Merge branch 'invites' of github.com:diaspora/diaspora into invites
|
2010-10-11 11:52:57 -07:00 |
|
Raphael
|
73e4d2b25b
|
Pull in search improvement, remove cruft
|
2010-10-11 11:08:54 -07:00 |
|