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

168 commits

Author SHA1 Message Date
maxwell
0ecc27a935 MS IZ posts should now update 2010-11-02 18:56:00 -07:00
Raphael
15ecc22130 Unpending user spec 2010-11-02 16:41:31 -07:00
Raphael
2c903ea519 check that User#build does not save a Person 2010-11-02 16:28:55 -07:00
Raphael
6c0b187d40 Merge remote branch 'jwinky/446-user-name-length-limit' 
Conflicts:
	app/models/user.rb
 2010-11-01 11:00:02 -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
555c15dfef Simplify validations on user 2010-10-29 16:56:04 -07:00
Raphael
581985990c Delete no-longer-relevant spec, now down to master branch failures 2010-10-29 15:59:42 -07:00
Raphael
99eb25762d Moving to make_user, a few specs broken 2010-10-29 15:53:21 -07:00
Raphael
ce805c8167 Test pollution from locale being set 2010-10-29 13:26:54 -07:00
maxwell
f75bd6bc2e whoops, taking out queue stuff untill i finish 2010-10-29 13:05:35 -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
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
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
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
livefromthemoon@gmail.com
b7a586b1a5 allow user to change his language in his settings 2010-10-28 17:29:17 +02:00
danielvincent
05c5e770ee removed real name from signup process. 2010-10-27 16:25:22 -07:00
maxwell
6913381781 username now can only contain letters numbers, periods, and underscores 2010-10-22 17:26:10 -07:00
Raphael
1a19c28199 Move spec to user_spec 2010-10-22 11:10:35 -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
35a830aa03 Fix profile update spec 2010-10-21 10:39:19 -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
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
Sarah Mei
81ef7386b3 validation errors in profile and person bubble up to user. 2010-10-19 22:33:12 -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
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
e648042b15 the user destroy now deletes the aspects 2010-10-18 10:26:45 -07: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
maxwell
adbc4dddbc added pending spec for aspect removal on account deletion 2010-10-14 00:12:00 -07:00
Raphael
3fb2ee6e1b adding spec for password confirmation fail 2010-10-13 16:28:56 -07:00
ilya
007f6cfb6f close account 2010-10-11 14:58:11 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -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
Sarah Mei
68a8ecb05f Merge branch 'master' of github.com:diaspora/diaspora 2010-09-26 13:08:56 -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
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
danielvincent
4c0dc58458 spec cleanup 2010-09-21 20:02:37 -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
danielvincent
25b4b409be Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 16:19:48 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -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
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
426d038aaf Remove email based filter 2010-09-14 11:22:32 -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
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Raphael
68dc74e0b7 Tests pass again, use id => in retraction.perform 2010-09-09 18:15:30 -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
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
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
55d84b3288 Broke up user spec, put user update back in routes 2010-08-17 22:03:45 -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
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
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
b5594ad6bc DG IZ; post user refs started (permissions) 2010-08-16 18:11:23 -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
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
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
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
ilya
11a8b8f3d4 MS IZ testing many the friend request user methods 2010-08-11 12:28:48 -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
56d7c67bbb Going toward pending requests 2010-08-09 17:21:41 -07:00
Raphael
4350e17656 RS, IZ; removed lots of putses, fixed up request, parser, retractions 2010-08-06 16:01:39 -07:00
Raphael
0f596af5c4 Refactored message_queue getting, fixed retraction spec 2010-08-06 13:13:00 -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
danielvincent
c92a225556 DG MS; user-person relationship done. bunch of failing stuff. 2010-08-04 19:22:14 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
Raphael
74691228d3 RS, IZ; All relevant controllers now create with user.post 2010-08-02 16:32:52 -07:00