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

1143 commits

Author SHA1 Message Date
Raphael
961510a8ed Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build. 2010-10-20 11:03:47 -07:00
Raphael
f97f63e2d1 Merge remote branch 'tristil/239-380-identity-error-handling' 2010-10-20 10:36:03 -07:00
Raphael
4986de2c33 Put reloads back in 2010-10-20 10:35:16 -07:00
Raphael
0758f9245f Clean up specs a little, fix unfriending 2010-10-20 10:28:08 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
ilya
4d1ce410d7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 09:39:32 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 2010-10-20 14:59:55 +02:00
maxwell
e7f764ffeb attack vector where you take posts from valid (unknown) diaspora people is now fixed 2010-10-20 00:42:33 -07:00
Raphael
d3d0182164 Put database cleaner back in 2010-10-19 23:29:59 -07:00
Raphael
d98ac70155 Clean up some repetition in specs 2010-10-19 23:29:59 -07:00
Raphael
197bd8eb49 make user/receive spec less repetitive 2010-10-19 23:29:59 -07:00
Raphael
74ec629b01 user_friending_spec passes again 2010-10-19 23:29:59 -07:00
Raphael
52f7350f78 Fix a couple more specs 2010-10-19 23:29:59 -07:00
Raphael
43dd95147e Starting to remove database-cleaner 2010-10-19 23:29:58 -07:00
Sarah Mei
b007ba1487 Fixed cucumber features. Backfilled tests for AspectsController#create. 2010-10-19 22:57:55 -07:00
Sarah Mei
81ef7386b3 validation errors in profile and person bubble up to user. 2010-10-19 22:33:12 -07:00
Joseph Method
4b588ccefb Addresses [#380] and [#239] by handling the errors from bad identities 2010-10-19 23:44:43 -04:00
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
Sarah Mei
2a24de2ba7 Changing spec to pending because it hasn't been implemented yet 2010-10-10 13:29:03 -07:00
maxwell
fd0902abb4 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-10 11:54:16 -07:00
maxwell
0541833c18 stop the file include madness. using File.join and Rails.root for includes everywhere I could 2010-10-10 11:54:08 -07:00
Sarah Mei
ac85fbcc64 DevUtilitiesControllerSpec runs under 1.9.2. 
FileUtils.mv with the :force option works under 1.8.7 if the source file doesn't exist, but fails under 1.9.2.
 2010-10-10 11:52:19 -07:00
ilya
1ac410b590 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-09 21:44:26 -07:00
ilya
3887712115 slight refactor of receiving spec, wrote a spec that exposed malicious friend attack 
vector
 2010-10-09 21:34:53 -07:00
Sarah Mei
4da2f9cf58 Fix pending spec in SocketsControllerSpec 2010-10-09 21:58:46 -06:00
ilya
ef3e627bed the users are now made with people 2010-10-08 15:40:42 -07:00
Raphael
6064b2e022 Add a spec, move another to posting 2010-10-08 14:37:22 -07:00
danielvincent
154ec95717 killed the public tab. made a broadcast button in everyone tab 2010-10-08 14:06:49 -07:00
danielvincent
b70cf713ec removed old pending spec 2010-10-08 09:16:11 -07:00
Sarah Mei
4a88ac22c2 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 02:15:17 -06:00
Sarah Mei
899d82b766 Fix 1 of 2 pending photo specs. 2010-10-08 02:15:07 -06:00
danielvincent
4bb26cfce4 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 00:46:41 -07:00
danielvincent
fab9e8b6eb cleaned request spec 2010-10-08 00:46:24 -07:00
Sarah Mei
ce9aa3600d Refactor user friending spec 2010-10-08 01:42:48 -06:00
Sarah Mei
511cd8fa1c Clean up reloading in user friending spec. 2010-10-08 01:23:33 -06:00
Raphael
3632143959 Take out pending on spec that exposes issue 150 2010-10-07 17:54:26 -07:00
Raphael
1d463d22a1 Person show for a nonexistent person now redirects to people index page, rather than giving a 500 2010-10-07 16:50:19 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
danielvincent
0ebb597b72 DG MS; test for users#export 2010-10-07 15:22:03 -07:00
Sarah Mei
b63fb5d7a6 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 15:27:18 -06:00
Sarah Mei
4dba2d7c35 Fix failing spec. Backfill spec for DevUtilitiesController#set_backer_number. 2010-10-07 15:27:04 -06:00
danielvincent
7a3d168123 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 14:17:22 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
maxwell
ec4c63ada7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 17:51:10 -07:00
maxwell
d638bdb018 MS IZ password change field is now in edit profile 2010-10-05 17:49:06 -07:00
Stoyan Gaydarov
dbacff250a added extra user spec 2010-10-06 08:27:25 +08:00
Stoyan Gaydarov
9eb8fe0c5a use the correct pod url in the user spec 2010-10-06 08:27:25 +08:00
danielvincent
f3c34692d8 pubsub support 2010-10-05 13:39:56 -07:00
ilya
7b690f5dcb slight publics controller spec refactor 2010-10-02 13:20:23 -07:00
ilya
f9cecd9d89 specs are green 2010-10-02 13:03:11 -07:00
ilya
7dcde292e1 user posting spec is now green, now stubbing on the apropriate method 2010-10-02 12:34:16 -07:00
ilya
b6a912dd02 slowly getting specs to pass on with the new api 2010-09-30 15:17:53 -07:00
ilya
e9521d7144 tiny commit to switch branches 2010-09-29 12:15:54 -07:00
ilya
46bf0cfd99 roundtrip done, just need to clean and move to the new api 2010-09-28 15:11:01 -07:00
ilya
c7d29b29c8 the salmon now encrypts the activity, and stores the aes key in the header 2010-09-28 13:22:19 -07:00
ilya
6eede48f9f started to refactor the salmon spec, changed data in to be parsed data 
to be more clear
 2010-09-28 12:39:55 -07:00
danielvincent
eac6b8a63b builder is now a class initialized with a user. added director class. 2010-09-27 21:54:01 -07:00
danielvincent
58b688aa68 fixed builder spec 2010-09-27 21:28:21 -07:00
danielvincent
eb7244e07c Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 19:07:01 -07:00
ilya
1225291fc2 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 19:01:25 -07:00
danielvincent
26a4dc76a6 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 18:34:55 -07:00
danielvincent
3b8ddf76a3 temp route for atom feed. also, public atom currently displays all posts. 2010-09-27 18:34:47 -07:00
ilya
7852c346f2 mode the visible posts api more general and moved to it on the public controller 2010-09-27 18:31:37 -07:00
Raphael
6100b318e4 More accurately describe a spec 2010-09-27 18:12:55 -07:00
danielvincent
df800dc87e ostatus builder 2010-09-27 17:58:44 -07:00
ilya
6e407572c4 removed unused repost method, going through the warden object 2010-09-27 17:27:49 -07:00
Raphael
591347a77a Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 16:54:18 -07:00
Raphael
e9f433e12f Add spec for not overwriting the image_url on profile update 2010-09-27 16:54:08 -07:00
ilya
08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
 2010-09-27 15:39:50 -07:00
ilya
8f55852ea9 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 15:30:27 -07:00
michael.scheffler
2c55e70067 Replaced hardcoded '@example.com' with APP_CONFIG[:terse_pod_url] 2010-09-28 02:50:56 +08:00
Raphael
1ab536bf04 Merge branch 'master' of http://github.com/sarahmei/diaspora 2010-09-27 11:09:14 -07:00
ilya
98bc2df841 removed the encryption key= method, and user with private key factory 2010-09-27 10:10:54 -07:00
ilya
cf0df90dae moved the private key into user where it belongs, two failing cucumber tests 2010-09-26 22:08:42 -07:00
Sarah Mei
68a8ecb05f Merge branch 'master' of github.com:diaspora/diaspora 2010-09-26 13:08:56 -07:00
Sarah Mei
5d1afe21be Refactor user specs to speed up spec runs. 2010-09-26 13:08:30 -07:00
Sarah Mei
0ec074be6d Remove annoying deprecation warning from spec runs 
Add spec for validation hook
 2010-09-26 10:00:29 -07:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
Sarah Mei
64e1912c37 Disabled image resizing in specs => 15% faster test suite. FTW 2010-09-26 00:40:40 -07:00
Sarah Mei
17757a2e2d Merging upstream changes 2010-09-25 15:57:59 -07:00
Stephen Caudill
72cefc6265 Move relationship_flow spec to its helper spec 2010-09-25 13:18:46 -04:00
Stephen Caudill
8c6dff35c0 Remove unnecessary includes 2010-09-25 13:11:44 -04:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
Stephen Caudill
821643deb9 Use the new style of spec_helper require 2010-09-25 11:27:59 -04:00
Sarah Mei
e3ec00595d Cleaned up file path joining in some of the dev utilties. 
Backfilled tests where necessary to make sure changes didn't break existing code.
 2010-09-25 04:34:48 -07:00
ilya
e414558f79 passing the right things to the partial 2010-09-24 15:52:29 -07:00
Raphael
ae7c869bc3 Add specs for album controller failure 2010-09-24 15:01:36 -07:00
ilya
bb58678556 added a fb_status model & parser method 2010-09-24 14:41:31 -07:00
Raphael
950c6a7cab Merge branch '1.9.2' into HEAD 
Conflicts:
	app/models/photo.rb
 2010-09-24 14:36:00 -07:00
Raphael
19199dabfe fix spec_helper for 1.9.2 2010-09-24 11:49:30 -07:00
Raphael
ed6df7d1bf Delete user.terse_url 2010-09-23 10:24:10 -07:00
Steve Conover
5edd054ac7 MS Use class_eval because of some sort of load ordering issue 2010-09-22 22:22:18 -07:00
danielvincent
e9d16cc09b DG IZ; cleanup 2010-09-22 15:48:50 -07:00
danielvincent
6dd7911c8c DG IZ; update_or_repost 2010-09-22 10:52:29 -07:00
danielvincent
4c0dc58458 spec cleanup 2010-09-21 20:02:37 -07:00
danielvincent
4a3bfea1ba DG MS; cleaned spec 2010-09-21 17:43:46 -07:00
danielvincent
03638ee68e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 16:35:25 -07:00
danielvincent
107c05ef6f DG MS; validate_aspect_permissions broken out of post method 2010-09-21 16:35:18 -07:00
ilya
394bf1acb5 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	app/models/user.rb
	spec/models/user_spec.rb
 2010-09-21 16:15:01 -07:00
ilya
efd901dcd9 RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG 2010-09-21 15:46:57 -07:00
danielvincent
44db21ffd4 DG MS; cleaned up spec 2010-09-21 15:41:29 -07:00
Raphael
50414fef40 Remove unused method from message handler 2010-09-21 11:03:21 -07:00
Raphael
8dd11c0c95 Add a couple specs to friending 2010-09-20 16:41:03 -07:00
danielvincent
5bb4ee5d36 DG IZ; posting now ensures aspect ownership. 2010-09-20 15:15:37 -07:00
danielvincent
af9cda52af DG IZ; always query through the current_user in the controllers. 2010-09-20 13:18:11 -07:00
Michael Sofaer
27c00bae90 MJS RJS Fix initialization of album test 2010-09-19 18:12:42 -07:00
Raphael
60e29f6572 Magent should use the same settings as mongomapper, app config should load first, websocket spec is a little better. 2010-09-19 16:37:34 -07:00
danielvincent
08f833ba7a case insensitivity on search 2010-09-18 17:21:18 -07:00
Stephen Caudill
81d753e773 Refactor Album spec 
* use let(!) where appropriate (see [1] for more info).
* use `context` to portray scenarios
* use `describe` to portray method and Class specifications
* omit the word "should" from example descriptions (Dave Chelimsky
  remarked to me that it was "tantamount to line-noise" and I'm of the
  opinion that it adds no value.
* use more idiomatic Ruby (prefer things like 2.times to 1.upto(2))
* use more idiomatic Rails (prefer 1.minute.from_now to Time.now +
  60*60)
* use more idiomatic Rspec (prefer album.should be_valid to
  album.valid?.should be_true
* also ensure to only make one assertion per example

Other sundry cleanups.

[1] http://rdoc.info/github/rspec/rspec-core/master/RSpec/Core/Let/ClassMethods#let-instance_method
 2010-09-17 16:41:58 -04:00
Raphael
71ac61c01d Fix websocket specs 2010-09-17 12:49:05 -07:00
Raphael
ce2260b747 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-17 11:57:36 -07:00
Raphael
99ad001d28 Fix websocket spec, take out puts in by_webfinger 2010-09-17 09:52:31 -07:00
Raphael
2e8ecceaf7 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 21:53:34 -07:00
Raphael
7c02200a67 Finish moving out websocket server, add task to start it 2010-09-16 21:42:16 -07:00
danielvincent
25b4b409be Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 16:19:48 -07:00
danielvincent
cbb692b6a3 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 16:06:28 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
Federico Brubacher
05808456d8 fixed small issue in albums#update anad added corressponding controller test 2010-09-16 12:21:08 -03:00
Raphael
1e646fb0a9 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 23:54:57 -07:00
Raphael
d760725145 Don't webfinger another server on receiving a webfinger request 2010-09-15 23:01:13 -07:00
Raphael
c67a8ea100 Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	config/deploy.rb
	config/environments/production.rb
	spec/models/request_spec.rb
 2010-09-15 22:37:05 -07:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Raphael
de93fd2818 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 18:10:13 -07:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
33048fe6db Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	spec/models/aspect_spec.rb
 2010-09-15 17:24:00 -07:00
Raphael
01d26f6d0e Using custom registrations controller 2010-09-15 17:05:21 -07:00
Daniel Vincent Grippi
ee89bfaf8f removed do bad things 2010-09-15 16:18:33 -07:00
maxwell
8828707c45 MS fixed the login bug, deploying to master 2010-09-15 15:15:15 -07:00
maxwell
c57f6b2d9a fixing merge 2010-09-15 13:29:39 -07:00
maxwell
84c60e5f2e DG MS fixing webfinger, i hope to goodness 2010-09-15 13:28:06 -07:00
Daniel Vincent Grippi
a925c14310 fixing webfinger/salmon 2010-09-15 12:35:23 -07:00
Raphael
1006e8a680 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
8647220328 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-14 20:44:47 -07:00
ilya
0560b46080 MS IZ added friend redirect, and moved the webfinger responces to fixture directory 2010-09-14 11:58:40 -07:00
Daniel Vincent Grippi
3a468a9f1b Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-14 11:45:33 -07:00
Daniel Vincent Grippi
426d038aaf Remove email based filter 2010-09-14 11:22:32 -07:00
Daniel Vincent Grippi
7643fb4125 remember that aspects are seeded 2010-09-14 11:15:10 -07:00
ilya
2311c33626 MS IZ mocked all the webrequest tests 2010-09-14 11:13:58 -07:00
Daniel Vincent Grippi
c1a9a89be7 Merge branch 'production' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	config/deploy.rb
	spec/factories.rb
	spec/models/request_spec.rb
	spec/spec_helper.rb
 2010-09-14 11:08:18 -07:00
Daniel Vincent Grippi
b2b60af8aa Albums_by_aspect now takes :all 2010-09-13 17:32:29 -07:00
Daniel Vincent Grippi
1b92bcd17c Add albums_by_aspect method to user 2010-09-13 17:26:24 -07:00
Daniel Vincent Grippi
84b29770fe Put raise back in webfinger fail 2010-09-13 16:05:43 -07:00
Daniel Vincent Grippi
40ecf176e8 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:26:15 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
b05d106aed Remove user_refs from Person, put pendings in the broken photo specs 2010-09-13 12:16:43 -07:00
Raphael
9837340eb2 Rename files from group to aspect 2010-09-13 10:43:15 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Raphael
4922ebd84c Finish removing encryption from retractions 2010-09-10 16:14:37 -07:00
Raphael
a44d40168a Encryption removed from everything other than comments, most irrelevant specs removed 2010-09-10 16:04:09 -07:00
Raphael
aa1f3c6438 Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file 2010-09-10 10:31:23 -07:00
Raphael
68dc74e0b7 Tests pass again, use id => in retraction.perform 2010-09-09 18:15:30 -07:00
Raphael
86d9a41d25 send_friend_request_to now takes a person and group, rather than a receive url and a group id 2010-09-09 16:06:42 -07:00
Raphael
fd61535e11 Hcards working 2010-09-09 15:43:16 -07:00
Raphael
67f9d9dab5 Add hcard, add id for pod_location 2010-09-09 15:34:20 -07:00
Raphael
59006e657f Hcard done manually 2010-09-09 15:15:37 -07:00
Raphael
c6aff4a562 making the hcard work 2010-09-09 13:02:59 -07:00
Raphael
240dda4eab Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished 2010-09-09 12:21:36 -07:00
Raphael
4fd0853e71 Moving to salmon 2010-09-08 18:29:39 -07:00
Raphael
960d40278c Add username, login with username or email 2010-09-08 10:59:08 -07:00
Daniel Grippi & Raphael Sofaer
7984756aa7 controller cleanup: using respond_to and respond_with. 2010-08-29 22:49:13 -07:00
Raphael
5ef442d93f RS, IZ; Socket spec now more realistic, visible_person_by_id fixed 2010-08-27 10:48:14 -07:00
Raphael
831609ad15 Make a stranger that you receive a comment from visible 2010-08-27 10:19:10 -07:00
Raphael
c629c23232 Tests now pass, export_key changed to exported_key, profile.person changed to _parent_document 2010-08-27 10:05:14 -07:00
Raphael
2dd2f38442 Attempting to make comments from unknown users save 2010-08-26 19:15:22 -07:00
Raphael
3ed191e972 MS IZ testing on remote 2010-08-26 16:27:01 -07:00
Raphael
94bb754c34 Changed parseing person from xml a little, using it for comments. 2010-08-26 15:06:39 -07:00
Raphael
a29a1bec3e Add some logging to comments 2010-08-26 11:07:26 -07:00
maxwell
a26229223c Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 18:07:49 -07:00
Raphael
00f8a3e628 removed ensure_bson in user. added to_id method to String and ObjectID classes 2010-08-25 17:11:57 -07:00
maxwell
22f63a4c44 MS IZ added the move friend method 2010-08-25 16:58:07 -07:00
Raphael
55c94c385c fixed photos going through the websocket. added a spec to SocketsController 2010-08-25 16:08:44 -07:00
Raphael
41aa8ed10e Specs pass again, need to make albums have a group 2010-08-24 17:12:27 -07:00
Raphael
c102e81b03 put the visible back in 2010-08-24 16:56:04 -07:00
maxwell
68bd5bf5f5 MS merging in master again 2010-08-24 16:21:20 -07:00
Raphael
abafa03e92 Spec for posting to no group 2010-08-24 15:48:51 -07:00
Raphael
72c41a5ff8 User post now requires a :to field 2010-08-24 15:42:24 -07:00
maxwell
f5316fb3c1 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-08-24 14:45:04 -07:00
maxwell
4f63f60b03 MS merging, and added a dumb check for the email validating twice 2010-08-24 14:03:57 -07:00
maxwell
2c9a1e3a43 added wall spec 2010-08-24 13:47:58 -07:00
Raphael
d1c540439e Moved friending out to a lib file, specs all pass 2010-08-24 12:13:10 -07:00
maxwell
f172c9e1d2 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 18:45:31 -07:00
maxwell
a37b5ae09b IZ MS; added a basic salmon library to help with directed messages, and made an keyhash method 2010-08-23 18:45:20 -07:00
Raphael
511f571ae5 Specs mostly pass again 2010-08-23 15:01:39 -07:00
Raphael
76f2aa98ac Push to multiple groups 2010-08-23 14:45:13 -07:00
Raphael
364cdfed22 Allowed email checking no longer so ridiculous 2010-08-23 10:20:19 -07:00
Raphael
a23df47dbc Trying to merge in the pivots changes that we want in master 2010-08-18 21:10:42 -07:00
Raphael
701bec670f Merge branch 'master' of github.com:diaspora/diaspora into pivots 
Conflicts:
	app/views/groups/index.html.haml
	config/deploy_config.yml
 2010-08-18 20:50:28 -07:00
ilya
5cae2b21b1 RS, IZ fixed the url for the image 2010-08-18 18:06:13 -07:00
ilya
76b4b55e98 Added spec for remote photo url setting to photos 2010-08-18 17:39:38 -07:00
Raphael
5a2b42e4e5 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 16:37:12 -07:00
Raphael
7ed31ab96a Moving to file store 2010-08-18 16:37:05 -07:00
ilya
21f70c643d DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing 2010-08-18 16:15:10 -07:00
Raphael
39c96bfd04 Changing to a smaller pic in the tests 2010-08-18 16:00:06 -07:00
ilya
1ab21fe8b1 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 15:25:23 -07:00
ilya
08739ad23d DG IZ; retractions remove post references in group objects 2010-08-18 15:23:46 -07:00
Raphael
61c906a9d3 Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 
Conflicts:
	app/models/user.rb
	app/views/groups/index.html.haml
	config/deploy_config.yml
 2010-08-18 14:45:41 -07:00
Raphael
f570199d17 Add a couple specs to groups, moved socketing into each block, unclear where or why groups are being created wrongly 2010-08-18 14:30:16 -07:00
ilya
034755368b Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-18 12:17:23 -07:00
Raphael
10aef7a0a3 Begin rescue on publics controller to make the post for nonexistent user error more readable 2010-08-18 11:46:28 -07:00
ilya
4d86933f4a DG IZ; user's visible posts method queries group objects for their posts 2010-08-18 11:40:02 -07:00
ilya
055c222fc2 DG IZ; using group_id instead of group in post method. passing in :group_id into publisher partial 2010-08-18 10:53:43 -07:00
ilya
b0088c73d8 DG IZ; user's own post gets referenced in group model 2010-08-18 10:37:33 -07:00
Raphael
b99a86e6bd Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 
Conflicts:
	app/models/user.rb
 2010-08-18 10:10:20 -07:00
Raphael
539316a235 Removing posts relation from person 2010-08-17 23:50:07 -07:00
ilya
501bcdd197 Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 2010-08-17 23:25:33 -07:00
Raphael
4a4686ce6e refactored signature validation got specs passing 2010-08-17 23:21:00 -07:00
ilya
55b4d4758f Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 
Conflicts:
	app/models/user.rb
	spec/models/user_spec.rb
 2010-08-17 22:58:46 -07:00
Raphael
7c75a54d90 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-17 22:34:21 -07:00
Raphael
cb152ea3c3 Shortened user receive, moderated groups.first in the socketing 2010-08-17 22:34:01 -07:00
ilya
9ee10450c4 removing traces of bookmarks and blogs from specs 2010-08-17 22:32:13 -07:00
Raphael
55d84b3288 Broke up user spec, put user update back in routes 2010-08-17 22:03:45 -07:00
Raphael
9f9395bc9c visible_person_by_id should check against self.person.id 2010-08-17 19:51:29 -07:00
Raphael
1d6e132a9f Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 2010-08-17 13:07:26 -07:00
Raphael
842b321dfa User email checking, routes working again 2010-08-17 13:02:42 -07:00
ilya
2a90e59f1e DG IZ the group should view the posts for the group (and yourself) w 2010-08-17 12:22:14 -07:00
ilya
2af41a0ea9 DG IZ; posts_for :group method in User 2010-08-17 12:14:02 -07:00
ilya
0af6f7b0e5 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-17 10:48:47 -07:00
ilya
a9c9619a54 DG IZ; posting from a user includes adding to the many posts association in said user 2010-08-17 10:43:18 -07:00
Raphael
cba0f5477c spec for by_webfinger... after the fact 2010-08-17 10:41:01 -07:00
ilya
5761d5db36 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-17 10:35:37 -07:00
ilya
dea6551374 DG IZ; moved post() into User from Person. 2010-08-17 10:35:25 -07:00
Raphael
e32315b6c6 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-17 10:25:11 -07:00
Raphael
2c1c5df281 Moved search specs, renamed method 2010-08-17 10:24:59 -07:00
danielvincent
7e5ace7cbc minor cleanup in models 2010-08-16 22:44:22 -07:00
ilya
1d92d11841 DG IZ; user refs are incremented as well as decremented for Posts 2010-08-16 20:39:24 -07:00
ilya
74c70d9410 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/models/user.rb
	spec/lib/diaspora_parser_spec.rb
 2010-08-16 18:18:30 -07:00
ilya
b5594ad6bc DG IZ; post user refs started (permissions) 2010-08-16 18:11:23 -07:00
Raphael
eae4053902 Encryption removed from callbacks, except retractions sort of. verification is in user.receive 2010-08-16 17:23:54 -07:00
Raphael
3ff4387cd8 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-16 16:22:55 -07:00
Raphael
ad07521e07 Made a few more tests pass 2010-08-16 16:22:46 -07:00
ilya
b3d8f59c77 removed many posts association within group model 2010-08-16 15:51:31 -07:00
Raphael
3a591b0713 Merging in friend-refactor... 2010-08-16 15:35:14 -07:00
Raphael
3efa36587a Took out a bunch of user.owner references 2010-08-16 11:01:58 -07:00
danielvincent
f1f827120b intentional failing test in user for tomorrow. 2010-08-15 21:03:19 -07:00
ilya
99c8869b8f Removing a friend now deletes them from the group(s) they are in 2010-08-13 18:56:33 -07:00
ilya
ac40f7974e RS, IZ; A variety of fixes and some refactoring on unfriending and activate friend 2010-08-13 18:37:09 -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
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
3d12e9ab51 DG RS; friending through groups 2010-08-12 21:30:16 -07:00
ilya
283b4a40b5 IZ MS tests now pass 2010-08-11 17:51:46 -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
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
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
8d986a207e IZ MS; Socket test now passes 2010-08-10 17:50:17 -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
0ffe893f8a MS IZ merging diffs 2010-08-10 12:37:04 -07:00
maxwell
71612ba33d changing some webfinger resources 2010-08-10 12:36:00 -07:00
Raphael
ac2f82c3d7 Renamed dashboards spec to groups 2010-08-10 12:28:36 -07:00
maxwell
95c4de5d6c MS IZ fixed all of the request specs zomg 2010-08-10 11:26:32 -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
38abd51666 MS IZ fixed a couple of failing specs in the parser 2010-08-09 21:09:51 -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
33a827c33a RS, DG; Websocket is now working again, users have a channel 2010-08-09 13:02:08 -07:00
Raphael
73a6cd911b DG, RS; User person delegation fixed 2010-08-09 10:46:02 -07:00
Raphael
7076097ee4 RS, IZ; The tests are green. 2010-08-06 16:56:13 -07:00
maxwell
58de12df5e DG MS; PeopleController#index now accepts query string for search (only looks at first_name and last_name) 2010-08-06 16:35:02 -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
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
7a1011c46c DG MS; webhook specs fixed 2010-08-05 15:41:32 -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
Raphael
bb66e87905 RS, IZ; Encryption specs now pass with openssl 2010-08-05 11:56:31 -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
ilya
5dfc097c88 replaced the functionality with openssl, didn't do the encryption spec 2010-08-04 20:32: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
danielvincent
b7fb844fdf more cleanup on Diaspora::OStatusParser 2010-08-04 00:57:46 -07:00
danielvincent
2938341b54 removed parse_ from every method name in Diaspora::OStatusParser 2010-08-04 00:47:29 -07:00
danielvincent
c5ace3069d diaspora module correctly loads everything (lazy) 2010-08-04 00:41:23 -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
8432db34b3 RS; Fixed profile marshalling spec, now CI should pass! 2010-08-02 12:52:13 -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
Raphael
3376057c33 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-29 13:58:49 -07:00
Raphael
f4bace85b3 No more key deletion in specs, parser included correctly 2010-07-29 12:45:43 -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
Raphael
9750684e61 Maybe because diasporaparser was moved out to a different file? 2010-07-29 10:10:17 -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
bda87bbeab MS switched request new links to just the request link 2010-07-26 18:13:20 -07:00
Maxwell Salzberg
66f66b85a6 MS added test, things still seem broken though 2010-07-24 23:21:02 -07:00
maxwell
b797704a14 MS small pointless webhooks refactor 2010-07-24 16:11:32 -07:00
maxwell
416f128ba8 MS pushing code around into seperate files for clairty, many specs moved around to much more sane names. i still need to break out diaspora generator out of webhooks module 2010-07-24 15:48:42 -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
ilya
4eccf63fef Can't upload to other people's album 2010-07-23 16:26:05 -07:00
maxwell
0fdce91756 DG MS added views for ostatus following 2010-07-22 21:27:43 -07:00
maxwell
16bbce3054 DG MS ostatus post and author now exsist 2010-07-22 20:16:24 -07:00
maxwell
1118b56bb1 DG MS we now fully parse an ostatus response 2010-07-22 16:55:28 -07:00
maxwell
daf0de2eb0 Merge branch 'master' of github.com:diaspora/diaspora_rails into ostatus 2010-07-22 11:54:07 -07:00
maxwell
a615853b07 DG MS; added more specs for pubsub 2010-07-22 11:53:57 -07:00
ilya
41c358d53c Storing in phototest 2010-07-22 11:43:59 -07:00
ilya
24f8b33f2f Tests all pass! 2010-07-22 11:36:36 -07:00
maxwell
69477b17f5 DG MS; added specs for publishing to a hub 2010-07-22 11:14:37 -07:00
Raphael
07767e62fe Photo factory 2010-07-22 10:49:27 -07:00
Raphael
dce861ff17 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-22 10:43:41 -07:00
Raphael
0cb6e39ff4 comment signing spec was broken 2010-07-22 10:43:35 -07:00
ilya
773dbd91aa RS IZ one more test passing going to bisect 2010-07-22 10:21:10 -07:00
Raphael
b6ab4db7cc Trying to get photos working again 2010-07-22 10:12:25 -07:00
maxwell
9b1fcdbab2 MS DG some serious message handler and user request API stuff....needs way more tests 2010-07-21 20:33:43 -07:00
ilya
606fa3353c RS, IZ; Photos might push urls to friends 2010-07-21 18:02:13 -07:00
maxwell
0d268905e7 DG MS all photos of a album are destroyed on album deletion 2010-07-21 17:05:40 -07:00
maxwell
695a93ddad DG MS added basic album traversal 2010-07-21 14:29:58 -07:00
maxwell
301343ae01 DG MS added basic album support 2010-07-20 21:28:24 -07:00
maxwell
dac3c7a8de Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-20 16:22:08 -07:00
maxwell
933bf61db8 RS, MS, relationship_flow returns the action and the url to execute it to 2010-07-20 16:15:36 -07:00
danielvincent
51fd87db36 no ideas why collection saving isn't working... 2010-07-20 15:15:11 -07:00
ilya
1bd2c16ef1 DG IZ started the collection spec 2010-07-20 14:01:56 -07:00
Raphael
d8cbbcf6c8 Added photo file validation spec 2010-07-20 11:31:41 -07:00
Raphael
de3a08d031 Took out putses 2010-07-20 10:23:19 -07:00
Raphael
bb21361a6b Photo controller fixed 2010-07-17 18:13:51 -07:00
Raphael
7d7c39e3dc callbacks not running on photo save 2010-07-17 14:09:21 -07:00
Raphael
40435d6891 Commented out tests that require internets to function 2010-07-17 13:20:06 -07:00
Raphael
93e900b998 fixed comments, did I break request url? 2010-07-17 11:29:30 -07:00
Raphael
d8ad4367d5 Tests now pass 2010-07-17 09:32:41 -07:00
maxwell
31629f8115 MS fixed webfinger spec regression 2010-07-16 23:11:23 -07:00
maxwell
cd31d11aca MS IZ adding a friend through the webfinger profile 2010-07-16 22:11:55 -07:00
maxwell
f34e033bce MS IZ getting the profile 2010-07-16 21:59:40 -07:00
maxwell
a742ef1253 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	Gemfile
 2010-07-16 21:33:57 -07:00
Raphael
bb4d5cad59 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-16 17:26:22 -07:00
Raphael
fa46fb31f4 Added photos, profile editing 2010-07-16 17:26:06 -07:00
maxwell
3d87c111df webfinger is now not washington specific 2010-07-16 14:15:19 -07:00
Raphael
9165ac413a image uploading started 2010-07-16 12:31:24 -07:00
Raphael
d7e07dfda8 comment specs fixed, comments now signed by post poster 2010-07-15 14:41:39 -07:00
Raphael
2d5d3a2f2d commit more often 2010-07-15 13:29:21 -07:00
Raphael
fd18ac6c4b Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption 2010-07-15 13:06:46 -07:00
maxwell
f97218c005 MS IZ cleanup of pubsub stuff 2010-07-15 10:24:41 -07:00
Raphael
c82f41e740 Merging in master 2010-07-14 12:16:24 -07:00
Raphael
335f202e2b RS, IZ; Profiles are now embedded 2010-07-14 11:22:44 -07:00
maxwell
1b63fbbec7 DG MS added pubsub gem, added hub to message queue 2010-07-14 11:01:28 -07:00
Raphael
f680c4b71e RS, IZ; Signature Verification now stubbed out outside of encryption specs, green 2010-07-14 11:01:21 -07:00
ilya
4a0bd5fc0c RS IZ; removed validations on marshaling and removed key deletion on person destroyw 2010-07-13 17:36:18 -07:00
ilya
d4d1aa0fd5 RS IZ validations of signature are now called on craeeton of a post 2010-07-13 14:34:30 -07:00
maxwell
9e93fd072e DG MS; added subscriber model for ostatus interop 2010-07-13 14:32:27 -07:00
ilya
83ea15c97a merging in master 2010-07-13 12:23:09 -07:00
ilya
964ee65b11 rs iz ; the signature of the signable_accessors are now in the xml 2010-07-13 12:21:11 -07:00
maxwell
0bcbd5b16c DG MS; diaspora xml generate model genereates a valid atom feed for status messages 2010-07-13 12:09:06 -07:00
ilya
add9961ca4 Now signing only xml accessors other than person 2010-07-13 11:41:57 -07:00
ilya
a219801c2d Now using detached signatures 2010-07-13 11:10:04 -07:00
ilya
6d431e9459 signing tests sort of almost done 2010-07-13 11:01:27 -07:00
ilya
b9146cbb41 RS IZ; now signatures work like in real life 2010-07-12 20:42:22 -07:00
danielvincent
ed8ed9be9e DG MS; started Diaspora::XML for ostatus compliance 2010-07-12 20:15:12 -07:00
ilya
406c00aeb6 RS IZ; using detached signatures and verification things 2010-07-12 18:31:20 -07:00
maxwell
f9f7f0fcc7 DG MS; request makes sure http:// and an ending slash is present on a new request link 2010-07-12 12:33:31 -07:00
ilya
174eb7e8f7 Merging in Master 2010-07-12 11:28:39 -07:00
maxwell
18760f13f8 push changes 2010-07-12 11:25:53 -07:00
ilya
3dfb55ee85 IZ MS pulled in master: this is now the authoritative branch; waiting for dan to fix gpg so we can move on 2010-07-11 00:04:08 -04:00
maxwell
8e752209bb merge complete 2010-07-11 00:01:20 -07:00
maxwell
603fc15120 MS IZ added the env setting line to factories 2010-07-10 23:54:25 -07:00
ilya
72e7514535 MS fixed your key fingerprint bug. ROML sux. all things which are marshalled as a class need to be after the other fields, because those fields were ignored. also, ids were no long being marshalled correctlyw 2010-07-10 23:30:24 -04:00
maxwell
902a8cb349 MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change 2010-07-10 10:34:46 -07:00
ilya
1bed575b90 Added the Key Fingerprint validation to the person model(defaults to empty string) 2010-07-10 06:09:53 -04:00
ilya
7eba033c0d Revert "RS IZ Friday night, key_fingerprint serialization weirdness" 
This reverts commit c6e16835df9c5d46d0ec5e0f1860da1ef4c0986a.
 2010-07-10 05:29:57 -04:00
ilya
8c75761ba1 RS IZ Friday night, key_fingerprint serialization weirdness 2010-07-10 02:25:48 -04:00
maxwell
8147602570 DG MS friends now are delete 2010-07-09 18:10:11 -07:00
ilya
eec66395c1 Removed key password 2010-07-09 20:22:01 -04:00
ilya
91e96973ef Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption 2010-07-09 19:17:14 -04:00
ilya
2f5ec3d7c4 added a bunch of public keys to test ring 2010-07-09 19:17:07 -04:00
maxwell
ed412e12b0 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-09 16:08:07 -07:00
maxwell
f5fd0b011a DG MS; upon friend deletion, all connected posts and comments are purged 2010-07-09 16:08:00 -07:00
ilya
7eec041846 Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption 2010-07-09 18:15:22 -04:00
ilya
8c45dd4702 testing signing 2010-07-09 18:15:17 -04:00
ilya
929adca383 calling after create hook direcly in tests 2010-07-09 17:42:32 -04:00
ilya
b802db9194 writing signing 2010-07-09 17:41:01 -04:00
maxwell
cf352b6f8d DG MS; cannot friend request an existing friend. 2010-07-09 14:35:42 -07:00
maxwell
b052ddeb84 DG MS; database seed scripts now ensure all friends are set to true 2010-07-09 14:13:39 -07:00
maxwell
48adc9ebc1 DG MS; person object now properly stored with request object save 2010-07-09 14:07:35 -07:00
ilya
eb9c6814d6 screen in tools, keyring clearing disabled 2010-07-09 13:36:24 -04:00
maxwell
c2c64d9938 MS DG more friend request tests pass 2010-07-08 23:14:54 -07:00
maxwell
408b58cbbf Merge branch 'safe-without-gpg' 2010-07-08 21:45:27 -07:00
maxwell
6cc9deaa65 merging with head 2010-07-08 21:44:14 -07:00
maxwell
e1834cc887 DG MS fixed spec 2010-07-08 20:51:12 -07:00
maxwell
06eec9204a DG MS; person request is now request. refactoring as well. user verbiage for request actions 2010-07-08 18:28:39 -07:00
ilya
895742824d Sped up specs, fixed env 2010-07-08 21:23:08 -04:00
ilya
122bbf0cd2 Merging dashboards 2010-07-08 20:56:25 -04:00
ilya
a5db2cd231 Added keyrings to gitignore, symlinked to shared dir in cap scripts 2010-07-08 20:54:20 -04:00
ilya
9e8426ceb4 RS, IZ; Users now have keys, keyring now in db folder 2010-07-08 19:57:10 -04:00
maxwell
db1811eb61 DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket 2010-07-08 14:14:03 -07:00
maxwell
1fa2dfd6eb DG MS cleaning up friend request 2010-07-08 12:05:06 -07:00
maxwell
11d4a9e2c7 rolled back some message handler nonsense 2010-07-08 11:16:38 -07:00
ilya
6e6763de14 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-08 13:28:17 -04:00
ilya
93c5404cab DG IZ message handler is a singleton' 2010-07-08 13:28:02 -04:00
maxwell
d04093f456 Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo 2010-07-08 10:18:03 -07:00
maxwell
6293f9f585 socket is now a controller 2010-07-08 10:17:41 -07:00
maxwell
58ed75a289 MS socket now works in the server, but I can't figure out how to mock this stuff 2010-07-07 22:20:15 -07:00
danielvincent
b496ee567a DG IZ; person request now appends url to pass validations when saved from inbound XML 2010-07-07 20:24:50 -07:00
maxwell
a35892428c Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo 2010-07-07 20:09:27 -07:00
maxwell
947f1a60e7 RS MS added url for for the socket controller 2010-07-07 18:59:32 -07:00
danielvincent
a33acd134e DG IZ; fixed person requesting (friend requests). 2010-07-07 18:10:47 -07:00
danielvincent
3d105e7c1e DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket. 2010-07-07 16:53:52 -07:00
maxwell
bf0afeede0 i really have no clue why this works nwow 2010-07-07 16:41:42 -07:00
Raphael
2db3366ef4 RS, MS; test FILES are now in EM run blocks, tests are in next_ticks 2010-07-07 16:04:31 -07:00
maxwell
cc603a7943 autotest for rafi 2010-07-07 15:27:44 -07:00
maxwell
5350b40e3c broken autotest for rafi 2010-07-07 15:27:22 -07:00
danielvincent
d705d39f70 DG IZ; added for action to friend request 2010-07-07 13:44:06 -07:00
Raphael
4b6e29a4d2 Sorry rspec 2010-07-07 10:55:32 -07:00
Raphael
86c31698f6 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-07 10:53:40 -07:00
Raphael
43dcf0bada Breaking specs to test CIJOE 2010-07-07 10:53:22 -07:00
ilya
79c0e960ad DG IZ; friend now has an active flag 2010-07-06 23:43:01 -04:00
ilya
d5d4d4ae84 DG IZ; friend requests get saved locally, friend object gets transmitted and saved remotely 2010-07-06 21:29:49 -04:00
ilya
a23a2691f3 DG IZ; starting fresh with requests 2010-07-06 20:09:20 -04:00
ilya
0587688d18 DG IZ; friend requests pass through the webhook, need to refactor the parser because now the XML does not make sense, no big deal. P.S. WTF is send_to_seed in message_handler 2010-07-06 02:15:49 -04:00
ilya
027d953cf4 DG IZ added the FriendRequest model. 2010-07-05 23:28:51 -04:00
Raphael
f9856517db Post deletion now deletes comments 2010-07-02 14:34:58 -07:00
danielvincent
469599a4a9 DG RS IZ; added post deletion propagation 2010-07-02 13:08:53 -07:00
Raphael
de0bff17dd Removed headers 2010-07-02 11:11:59 -07:00
danielvincent
24af7753fe DG IZ; fixed failing dashboard controller spec 2010-07-02 10:27:41 -07:00
maxwell
e696ef7023 comments now go go go and are tested RS MS 2010-06-30 16:24:44 -07:00
maxwell
fcdba64828 pushing to test comment passing 2010-06-30 13:54:09 -07:00
Raphael
340a57ea6d RS; figured out recursive serialization with ROXML, posts and comments now serialize with their persons 2010-06-30 08:06:30 -07:00
maxwell
638b71ae28 Added a spec to person, cleaned up some putses 2010-06-29 17:45:13 -07:00
maxwell
77c0bb5c4e urls are now unique, and a user can not add a friend with the exact same url 2010-06-29 16:04:15 -07:00
maxwell
19e03c7077 person now has a url, and they cant add themselves any longer.... you need to add a url to your old development user, and we need to set it in the field 2010-06-29 12:33:00 -07:00
maxwell
1b2745e788 added socket renderer spec and slight refactor 2010-06-29 11:50:15 -07:00
maxwell
a683a2c1aa RS MS added goog analytics 2010-06-29 11:45:41 -07:00
maxwell
45a9d9e342 moved the silly destory link over a bit 2010-06-28 22:15:52 -07:00
ilya
b5b9c647d7 DG IZ Created the profile model & friend view now shows the information 2010-06-28 21:32:09 -04:00