nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3231 commits 4 branches 0 tags 121 MiB
Commit graph

676 commits

Author SHA1 Message Date
ilya
e3ffd2ffe7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 18:26:06 -07:00
ilya
b31b2de6f5 MS IZ aspect add and delete for a person 2010-10-19 18:25:59 -07:00
Raphael
360891496e Check that time serializes correctly post-parse, not on string equality 2010-10-19 17:09:52 -07:00
Raphael
3557d66749 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 16:07:03 -07:00
Raphael
9309be2d69 Merge branch 'import' 
Conflicts:
	spec/models/user/invite_spec.rb
 2010-10-19 16:06:48 -07:00
ilya
24b136bbd9 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 15:42:51 -07:00
ilya
4e9e716783 another attack vector spec 2010-10-19 15:42:40 -07:00
Raphael
2c66bbbe00 Strip profile names, resolve 357 2010-10-19 13:51:31 -07:00
Raphael
962f282cbc Validate uniqueness of aspect name, 359 2010-10-19 12:23:24 -07:00
Raphael
fce902821b Remove downcasing of diaspora_handle, verify that diaspora_handle querying and validation is case insensitive. 2010-10-19 11:06:43 -07:00
Raphael
2893c3766b Delete em-webfinger file from other branch 2010-10-19 10:09:04 -07:00
maxwell
8ada8414c7 username can be any case, but diaspora handle should always, always, ALWAYS be lowercase, for webfinger reasons 2010-10-18 22:55:09 -07:00
ilya
d642928268 invite sends friend request if already friends, and raises if already friends 2010-10-18 16:27:02 -07:00
ilya
a8bf082e35 The invitation now has an optional personal message 2010-10-18 14:35:41 -07:00
Raphael
f90d38bb9c Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge 2010-10-18 12:00:20 -07:00
Raphael
3436371a96 Merge remote branch 'archi/332-quickfix' 2010-10-18 11:44:47 -07:00
ilya
4fbe933158 removed pending 2010-10-18 10:57:22 -07:00
ilya
17bd9710dc invitation tests we're evaluating before stubbing 2010-10-18 10:38:59 -07:00
ilya
e648042b15 the user destroy now deletes the aspects 2010-10-18 10:26:45 -07:00
archi
5e97fd3b52 Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix 2010-10-18 11:06:42 +02:00
danielvincent
1139299f42 removed loop and hidden checkboxes from publisher. hidden field passes single aspect id or :all to controller 2010-10-17 20:47:51 -07:00
Joseph Method
e3e4a6b319 Continuation of previous commit 2010-10-17 19:07:54 -04:00
Joseph Method
b58b6d380b Controller and module specs and code to prevent a fatal error when you try to befriend yourself 2010-10-17 19:05:19 -04:00
archi
2f7bc02712 Some specs for the make_links function. 
Can i haz youtubeZ? :P
 2010-10-17 22:25:56 +02:00
archi
baa0b43655 Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix 2010-10-17 21:19:27 +02:00
Sarah Mei
fcdcf88a79 Person.by_webfinger preserves case of identifier. Backfill specs for PublicsController#webfinger. 2010-10-17 12:18:53 -07:00
archi
1d9aa4c43d Modified spec (doesn't check Youtube handling due to disabled net::http) 2010-10-17 21:07:49 +02:00
Sarah Mei
50f9e8f240 Reorganize User model. Preserve case of username. 2010-10-16 23:58:01 -07:00
Sarah Mei
f688653936 disallow whitespace in username 2010-10-16 23:34:58 -07:00
Sarah Mei
798d904e7e strip username on create 2010-10-16 23:27:18 -07:00
Sarah Mei
d25847a626 Error message for duplicate email; add email validation spec. 2010-10-16 22:46:13 -07:00
Sarah Mei
83b23a0ffe Error message for duplicate username; refactor User validation specs. 2010-10-16 22:36:26 -07:00
Sarah Mei
d3a62c7a45 RegistrationsController#create deals with validation errors. Username, email, password now required on sign-up. 2010-10-16 22:02:51 -07:00
Sarah Mei
1b6726354f Backfill specs for RegistrationsController#create. 
Remove RegistrationsController#new (which just called super, so it's not necessary).
 2010-10-16 21:14:37 -07:00
Sarah Mei
21d213059c Found the magic incantation for devise controller specs. 2010-10-16 20:14:14 -07:00
Sarah Mei
2ae05f39cd Rails.root isn't always defined when you get to the top of a spec file 2010-10-16 20:05:05 -07:00
archi
e1d5f86f7e Here we go again - fixed sepcs 2010-10-17 02:58:19 +02:00
archi
75d372c737 Fixed the name of the status_message_helper spec 2010-10-17 02:43:34 +02:00
archi
482b2f5ffb Added Links to posts 2010-10-17 02:05:59 +02:00
maxwell
4d3da589df make the invite test pending until it doesnt take 300 seconds to run 2010-10-16 11:30:14 -07:00
maxwell
27bbbafe04 updated the hcard fixture, because the old one is not actually representive of what we are using 2010-10-16 11:16:33 -07:00
ilya
6a4b21753e removed the random duplicated line 2010-10-15 17:28:11 -07:00
ilya
d4702aefa3 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-15 17:20:19 -07:00
ilya
9727b356e1 the invitations add requests which are now correctly auto accepted 2010-10-15 17:20:04 -07:00
maxwell
f83bddadc5 forgot to add the test; and cleaned up the explain partial 2010-10-15 16:19:07 -07:00
ilya
2c9c4b0e14 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	app/views/invitations/_new.haml
 2010-10-15 14:36:49 -07:00
maxwell
733fb3b68e dump typo in spec 2010-10-14 23:12:44 -07:00
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
Raphael
bd6a8a85e2 Add spec for full name searching 2010-10-11 10:46:40 -07:00
Raphael
8cf72441b4 Make intended behavior on hcard action clearer, return 404 on nonexistent person 2010-10-11 10:13:52 -07:00
Raphael
c30155e9a1 Remove outdated photo spec 2010-10-10 15:04:57 -07:00