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

331 commits

Author SHA1 Message Date
Raphael
0f1517af15 Redirect directly to the login page no registrations closed 2010-11-15 12:24:58 -08:00
Raphael
d3098cf6bc Add option to close registration in app_config 2010-11-15 12:15:40 -08:00
Sarah Mei
830a43ec2f Add destroy specs for RequestsController. 
Cucumber feature for contact requests.
 2010-11-14 09:43:28 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
danielvincent
a21af7cac6 friend_users -> connect_users in helper_methods 2010-11-12 20:22:54 -08:00
Raphael
8232a92ca0 Update _person and person show, add specs for those pages 2010-11-10 12:41:18 -08:00
Sarah Mei
a39bd2badb AspectsController#manage now works if you have pending friend requests. 2010-11-10 12:05:28 -07:00
maxwell
4037ae9f33 fixing controller test 2010-11-09 16:55:54 -08:00
Raphael
390fffdee6 Fix new request view 2010-11-09 15:03:56 -08:00
Raphael
bfa0917ce4 add a couple specs 2010-11-09 14:07:26 -08:00
zhitomirskiyi
77fe7a1462 Revert "IZ local comment destroy" 
This reverts commit cb9fb0ad94.
 2010-11-08 19:32:43 -08:00
zhitomirskiyi
34179d60db Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 18:21:02 -08:00
zhitomirskiyi
cb9fb0ad94 IZ local comment destroy 2010-11-08 18:19:55 -08:00
maxwell
a84f9437b0 trying another thing to get the redirect working 2010-11-08 17:43:59 -08:00
maxwell
4164ceaf90 trying another thing to get the redirect working 2010-11-08 16:30:46 -08:00
maxwell
52908cec1a services controller should now go back to the referer. this might not actually work 2010-11-08 16:18:15 -08:00
maxwell
3fd5852d44 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:56:18 -08:00
maxwell
2162a2e3f9 collapse person's photos and status message into their profile; also, made these nested on a person 2010-11-08 15:55:58 -08:00
zhitomirskiyi
cbabc547a2 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:10:32 -08:00
zhitomirskiyi
e50f29b032 the profile cannot massassign diaspora handle 2010-11-08 15:10:23 -08:00
maxwell
4d2820e31c MS RS fixed photo show bug 2010-11-08 14:05:01 -08:00
Raphael
9970ee0e22 Write comments controller spec 2010-11-05 14:15:40 -07:00
Raphael
0ce37bbfa8 Remove some extra receives in tests 2010-11-05 14:15:40 -07:00
Raphael
693847480b Take out notifier stubbing, it's in test mode. 2010-11-05 11:31:52 -07:00
Sarah Mei
c816a1f78e RegistrationsController#create re-renders the form instead of redirecting, so user doesn't lose what they've entered. 
Took out RegistrationsController#update, since all it was doing was calling super.
Took out stubbing of user save, because I actually want to check that save is doing the right thing.
 2010-11-04 22:51:30 -07:00
Raphael
f6d899f1d9 Move prep_image_url into profile image_url setter 2010-11-04 18:46:15 -07:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
zhitomirskiyi
a55878f2a3 invitations controller test, tnx coyote 2010-11-03 22:58:42 -07:00
zhitomirskiyi
2da1f860cd validate user ownership on status message destroy 2010-11-03 18:04:10 -07:00
zhitomirskiyi
6a6cedbc62 oops did not save the pending 2010-11-03 16:43:10 -07:00
zhitomirskiyi
8246882067 MS IZ fixed some permissions in photo controller 2010-11-03 16:42:33 -07:00
zhitomirskiyi
3578daa14e IZ MS more photo controller specs 2010-11-03 12:21:32 -07:00
maxwell
62c25057e6 adding photocontroller spec for IZ 2010-11-03 10:43:27 -07:00
Raphael
5cdeed6c54 Add a spec to people_controller, make those specs a little clearer 2010-11-02 17:10:19 -07:00
Raphael
ccd92fb850 make requests controller spec a little clearer 2010-11-02 16:55:23 -07:00
Raphael
bbd8cadc14 Retaining specs and line from robustdj's patch 2010-11-02 11:27:51 -07:00
Raphael
9d273c6d24 Now expecting a 500 on someone passing an id to create, should really be a 422 2010-11-01 12:31:00 -07:00
Raphael
488df6eaa0 RS IZ a good test to overwrite ids 2010-11-01 11:35:37 -07:00
Raphael
7f7697c11d Merge remote branch 'traction/441-failed-aspect-creation-redirect' 2010-10-31 23:22:10 -07:00
Sarah Mei
ce213513eb PeopleController#update handles getting an empty string for :image 2010-10-31 17:49:47 -07:00
danielvincent
b08c4fb84e removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts) 2010-10-31 12:34:26 -07:00
Raphael
ccf3b7d87b stub out some stuff in publics_controller 2010-10-29 19:10:29 -07:00
Raphael
f7708fb9bf Get rid of deprecation warning 2010-10-29 18:55:30 -07:00
Raphael
49e1bde150 Stub user creation in registrations_controller 2010-10-29 18:46:57 -07:00
Raphael
555c15dfef Simplify validations on user 2010-10-29 16:56:04 -07:00
maxwell
15bd24a64f Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/lib/message_handler_spec.rb
	spec/spec_helper.rb
 2010-10-29 16:23:33 -07:00
Raphael
99eb25762d Moving to make_user, a few specs broken 2010-10-29 15:53:21 -07:00
maxwell
a272b22208 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-29 15:16:17 -07:00
danielvincent
7acc138a21 resolved issue regarding profile images referenced at https:// locations. 2010-10-29 14:56:41 -07:00
maxwell
7e7c4c3431 refactored message handler spec 2010-10-29 14:26:11 -07:00
Raphael
86ddc2561a fix spec in users_controller 2010-10-29 13:22:25 -07:00
Raphael
d753e31205 Merge remote branch 'ed0h/309-user-choose-language' 
Add explicit language set to spec in users_controller_spec.rb

Conflicts:
	app/models/user.rb
 2010-10-29 12:06:14 -07:00
maxwell
1b48572674 MS tests are now green 2010-10-29 11:16:50 -07:00
zhitomirskiyi
534cc112bf IZ MS rebase master 2010-10-29 11:15:13 -07:00
maxwell
acd977a115 adding pending spec to check for error within webfinger process 2010-10-29 11:14:55 -07:00
maxwell
eddcb71fcb EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:11:05 -07:00
maxwell
58f836ab46 adding pending spec to check for error within webfinger process 2010-10-29 11:06:31 -07:00
maxwell
8fe339b03b EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05:17 -07:00
Sarah Mei
14fedf5369 GAHHH STOP EMAILING ME (specs pass) 
Also, added attr_protected to Photo#person and Photo#person_id.
 2010-10-29 00:59:26 -07:00
Gabriel Gilder
bdb77ff282 redirecting to :back instead of manage page on failed aspect creation +spec 2010-10-28 21:01:53 -07:00
Raphael
78acdb7368 Pushing broken photo controller spec for dan to fix 2010-10-28 16:19:18 -07:00
Raphael
b5bea7f14d Add specs for photo mass assignment 2010-10-28 16:19:18 -07:00
Raphael
512f40eac2 attr_accessible on Post 2010-10-28 15:50:19 -07:00
livefromthemoon@gmail.com
b7a586b1a5 allow user to change his language in his settings 2010-10-28 17:29:17 +02:00
danielvincent
1d5b7a87f1 Merge branch 'master' into getting-started 2010-10-27 18:14:08 -07:00
danielvincent
05c5e770ee removed real name from signup process. 2010-10-27 16:25:22 -07:00
zhitomirskiyi
4a09eb2ece IZ MS update pending aspects controller spec 2010-10-27 10:14:24 -07:00
zhitomirskiyi
63c740fce7 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 2010-10-27 09:53:50 -07:00
zhitomirskiyi
fa484e95e4 MS IZ refactored querying 2010-10-26 17:05:38 -07:00
danielvincent
6e015790a7 settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update 2010-10-26 16:02:53 -07:00
zhitomirskiyi
e776389d19 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 2010-10-26 11:19:50 -07:00
danielvincent
060d8f9c7b DG MS; fixed some bugs with posting publicly. 2010-10-25 19:24:48 -07:00
danielvincent
b2e8ebd0bc OmniauthService -> Service. Cleaned up views. 2010-10-25 17:41:59 -07:00
maxwell
154b6e0ee7 MS DG added specs for posting to twitter, and basic services controller tests 2010-10-25 17:41:58 -07:00
ilya
c27f05ed42 Initial refactor done, need to stop mapping user.friends to people so much 2010-10-22 18:11:04 -07:00
Sarah Mei
7e4529f2bd im in ur test stubbin ur mailers 2010-10-22 06:22:47 -07:00
ilya
6fa82490c9 remove friend from aspect box, with js call to remove the person from the aspect 2010-10-20 17:34:52 -07:00
ilya
62700387ad MS IZ added an add to aspect form on the request partial 2010-10-20 15:30:30 -07:00
ilya
94a7a3c6ad IZ MS; deleted move_friends removed 2010-10-20 14:26:45 -07:00
ilya
02f37c6156 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/controllers/aspects_controller_spec.rb
 2010-10-20 13:21:16 -07:00
ilya
8fddb4ecf5 MS IZ added test concerning people in multiple aspects 2010-10-20 13:19:32 -07:00
Raphael
4d81583533 Backfill spec on mass-assignment in aspect update 2010-10-20 12:29:36 -07:00
Raphael
9c8e514642 Adding a spec for a mass-assignment attack through profile update 2010-10-20 12:15:13 -07:00
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
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -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
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
Raphael
f90d38bb9c Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge 2010-10-18 12:00:20 -07: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
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
Sarah Mei
fcdcf88a79 Person.by_webfinger preserves case of identifier. Backfill specs for PublicsController#webfinger. 2010-10-17 12:18:53 -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
maxwell
f83bddadc5 forgot to add the test; and cleaned up the explain partial 2010-10-15 16:19:07 -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
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
ilya
324f14c719 setting the token to nil on accept of invite 2010-10-12 18:23:59 -07:00
Raphael
8cf72441b4 Make intended behavior on hcard action clearer, return 404 on nonexistent person 2010-10-11 10:13:52 -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
Sarah Mei
4da2f9cf58 Fix pending spec in SocketsControllerSpec 2010-10-09 21:58:46 -06: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
4dba2d7c35 Fix failing spec. Backfill spec for DevUtilitiesController#set_backer_number. 2010-10-07 15:27:04 -06:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
maxwell
d638bdb018 MS IZ password change field is now in edit profile 2010-10-05 17:49:06 -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
Raphael
e9f433e12f Add spec for not overwriting the image_url on profile update 2010-09-27 16:54:08 -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
Raphael
ae7c869bc3 Add specs for album controller failure 2010-09-24 15:01:36 -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
Michael Sofaer
27c00bae90 MJS RJS Fix initialization of album test 2010-09-19 18:12:42 -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
d760725145 Don't webfinger another server on receiving a webfinger request 2010-09-15 23:01:13 -07:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
maxwell
84c60e5f2e DG MS fixing webfinger, i hope to goodness 2010-09-15 13:28:06 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
ilya
2311c33626 MS IZ mocked all the webrequest tests 2010-09-14 11:13:58 -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
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
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
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
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
55c94c385c fixed photos going through the websocket. added a spec to SocketsController 2010-08-25 16:08:44 -07:00
Raphael
72c41a5ff8 User post now requires a :to field 2010-08-24 15:42:24 -07:00
Raphael
d1c540439e Moved friending out to a lib file, specs all pass 2010-08-24 12:13:10 -07:00
Raphael
511f571ae5 Specs mostly pass again 2010-08-23 15:01:39 -07:00
Raphael
a23df47dbc Trying to merge in the pivots changes that we want in master 2010-08-18 21:10:42 -07:00
ilya
5761d5db36 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-17 10:35:37 -07:00