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

791 commits

Author SHA1 Message Date
maxwell
a7b3fc48ec https is now a valid url for people. thx grippi 2010-10-29 12:30:38 -07:00
maxwell
9c2ca15e93 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-29 12:09:32 -07:00
maxwell
c6fbcd28f7 stubbing out the hub publish method 2010-10-29 12:09:10 -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
23db4fe278 merge complete 2010-10-29 11:33:31 -07:00
maxwell
39f66cc5d9 tests are green 2010-10-29 11:19:07 -07:00
maxwell
7c32649df4 rebasing master 2010-10-29 11:18:20 -07:00
maxwell
6d139ab946 more tests pass 2010-10-29 11:17:39 -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
68a44af856 making a few more cleanup and tests 2010-10-29 11:13:08 -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
9a2e3ef158 making a few more cleanup and tests 2010-10-29 11:05:17 -07:00
maxwell
8fe339b03b EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05:17 -07:00
danielvincent
a7df1bca68 photos do not require an album. uploading files on a user's photos#index page will post to all aspects. 2010-10-29 10:38: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
Justin Wienckowski
cdcb693c95 Issue #446: Adding 32-character length limit to User#username, Profile#first_name, Profile#last_name 2010-10-28 21:12:36 -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
f1ae95fac9 443- patch trim on validation + spec 2010-10-28 20:03:49 -07:00
zhitomirskiyi
3fc5651e9d Merge branch 'master' of github.com:diaspora/diaspora 2010-10-28 17:03:14 -07:00
zhitomirskiyi
f5d54ff6f8 another silly malicious friend spec 2010-10-28 17:02:55 -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
Raphael
f7d2665950 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-28 14:29:40 -07:00
Raphael
4aaa921121 A couple specs for create overwriting users 2010-10-28 14:26:20 -07:00
zhitomirskiyi
55b38585d6 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-28 12:13:50 -07:00
zhitomirskiyi
f484eb957f comments now don't imbed the person in the xml 2010-10-28 12:13:39 -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
Raphael
ae65b7fc9b Merge branch 'master' of github.com:diaspora/diaspora 2010-10-27 11:13:41 -07:00
Raphael
6c94d40bd4 Factory.build saves users 2010-10-27 11:03:57 -07:00
zhitomirskiyi
a5099bb89f IZ moved methods found in spec helper to helper methods file. now we can include them in the db scripts to keep friending behavior in sync 2010-10-27 10:32:09 -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
Sarah Mei
0c8de9460c Fix for 1.9 (no spaces between method name and parens) 2010-10-27 03:21:17 -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
1024b8a3a7 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 
Conflicts:
	app/controllers/aspects_controller.rb
 2010-10-26 14:57:52 -07:00
zhitomirskiyi
8acdf21234 MS IZ got rid of the requests for me scope in the user 2010-10-26 14:49:37 -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
zhitomirskiyi
917d1838de MS IZ specs are green 2010-10-25 18:55:51 -07:00
danielvincent
287d633c44 user#post now handles posting to services. 2010-10-25 17:41:59 -07:00
danielvincent
b2e8ebd0bc OmniauthService -> Service. Cleaned up views. 2010-10-25 17:41:59 -07:00
maxwell
be39df75fe removed fb_status from the factories. whoops. 2010-10-25 17:41:58 -07:00
maxwell
fdd222003a fixed failing specs due to omitted factories. 2010-10-25 17:41:58 -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
maxwell
b17ae0bf38 DG MS removed unused fb_status model and respective specs, fixtures. 2010-10-25 12:26:08 -07:00
ilya
ff3dad2bff adding assertion to album_spec many association 2010-10-24 14:03:03 -07:00
ilya
8d61fb0aeb tiny bug in the spec 2010-10-24 01:45:26 -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
ilya
7083d2aa03 Moving friendships into a 'Contact' proxy object. 2010-10-22 18:11:04 -07:00
maxwell
606a6bb43a status message length is limited to 1000 chars. 2010-10-22 17:42:59 -07:00
maxwell
6913381781 username now can only contain letters numbers, periods, and underscores 2010-10-22 17:26:10 -07:00
maxwell
5af3d5fa82 double checking that matches are in front or back 2010-10-22 16:34:08 -07:00
maxwell
6720fa2c59 added tests to make sure Person.by_webfinger only returns exact matches 2010-10-22 16:28:03 -07:00
ilya
637d35d673 Remove puts 2010-10-22 12:27:28 -07:00
ilya
d1a2ebd236 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-22 11:56:04 -07:00
ilya
9a217d1fa8 MS IZ request acceptance email 2010-10-22 11:55:50 -07:00
Raphael
7dd86b3c87 Move comment signing spec to comment spec, make encryption spec not depend on message building 2010-10-22 11:18:43 -07:00
Raphael
d8bbe38019 Move spec to request_spec 2010-10-22 11:11:51 -07:00
Raphael
1a19c28199 Move spec to user_spec 2010-10-22 11:10:35 -07:00
Raphael
b67cee9af0 Trying to make spec directory structure the same as the lib and app structures 2010-10-22 11:09:20 -07:00
Raphael
61d539e555 Moving user_encryption_spec to lib 2010-10-22 11:06:31 -07:00
Raphael
6993f3e2b5 Fix spec in user_encryption 2010-10-22 11:05:37 -07:00
Raphael
b404346c40 Stop stubbing signature verification unless it's necessary 2010-10-22 11:01:58 -07:00
Sarah Mei
ffa467b795 more stubbing! yay? 2010-10-22 06:38:46 -07:00
Sarah Mei
7e4529f2bd im in ur test stubbin ur mailers 2010-10-22 06:22:47 -07:00
maxwell
6620f33ae2 fixing spec with a mock on mailer 2010-10-22 01:07:57 -07:00
maxwell
5701c3a873 should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now 2010-10-22 00:49:01 -07:00
ilya
80cd4761f3 started the new invitation email 2010-10-22 00:49:01 -07:00
Raphael
41cfd36b19 Refactor user_spec a little 2010-10-21 16:06:47 -07:00
Raphael
fe1a6bce20 Attr-accessible on aspects, check whether built user is persisted 2010-10-21 12:49:50 -07:00
Raphael
705cef3696 Fix comment spec 2010-10-21 10:55:17 -07:00
Raphael
35a830aa03 Fix profile update spec 2010-10-21 10:39:19 -07:00
Sarah Mei
e414b1c553 Fix some comment specs (still one failing). Remove warning from receive spec. 2010-10-21 06:45:15 -07:00
Raphael
bef6d76bfd Refactor specs a little more 2010-10-20 17:53:09 -07:00
Raphael
e1cdcc68c8 Cut 10 seconds off of visible_posts_spec 2010-10-20 17:48:16 -07:00
Raphael
f9919d1cce Not calling friend_users until it is needed takes a couple seconds off 2010-10-20 17:43:13 -07:00
Raphael
abf27bbfb2 Take unused models out of webhooks spec 2010-10-20 17:43:13 -07:00
Raphael
ff3666df5e Cut parser spec time by a couple seconds 2010-10-20 17:43:13 -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
554adeae69 MS IZ; querying through for person not in aspect is tested 2010-10-20 16:39:37 -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
02c0bf3c43 fixed the seed script 2010-10-20 14:52:17 -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
dfef8d0113 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 12:15:36 -07:00
Raphael
9c8e514642 Adding a spec for a mass-assignment attack through profile update 2010-10-20 12:15:13 -07:00
ilya
e6de6179e9 MS IZ dependant destroy is back for aspects 2010-10-20 11:47:09 -07:00
ilya
992bd42b55 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/models/aspect_spec.rb
 2010-10-20 11:30:06 -07:00
ilya
ea1ab59c3a MS, IZ finished adding and removing people from aspects methods, refactored the move friend method 2010-10-20 11:28:56 -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