Sarah Mei
|
81ef7386b3
|
validation errors in profile and person bubble up to user.
|
2010-10-19 22:33:12 -07:00 |
|
Raphael
|
9309be2d69
|
Merge branch 'import'
Conflicts:
spec/models/user/invite_spec.rb
|
2010-10-19 16:06:48 -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 |
|
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
|
7ab2b00231
|
moved fb posting into the user model
|
2010-10-18 14:50:48 -07:00 |
|
ilya
|
a8bf082e35
|
The invitation now has an optional personal message
|
2010-10-18 14:35:41 -07:00 |
|
ilya
|
e648042b15
|
the user destroy now deletes the aspects
|
2010-10-18 10:26:45 -07: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
|
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
|
d3a62c7a45
|
RegistrationsController#create deals with validation errors. Username, email, password now required on sign-up.
|
2010-10-16 22:02:51 -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 |
|
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 |
|
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
|
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
|
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 |
|
ilya
|
3b8998ab71
|
Invitations contains the inviters
|
2010-10-13 13:29:45 -07:00 |
|
Shawn McGuire
|
711dcdc5f4
|
Issue #280 Fixed trailing whitespace error
|
2010-10-13 14:36:03 -05:00 |
|
ilya
|
bf42b5766c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-13 11:20:43 -07:00 |
|
Raphael
|
9a1590fa02
|
Move user module requires out to the user modules definition file
|
2010-10-13 11:18:06 -07:00 |
|
ilya
|
db1a01d51b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-12 18:24:20 -07:00 |
|
ilya
|
324f14c719
|
setting the token to nil on accept of invite
|
2010-10-12 18:23:59 -07:00 |
|
Raphael
|
fe0120cc0d
|
Return everyone on an empty search
|
2010-10-12 18:18:03 -07:00 |
|
ilya
|
d6b08de6fc
|
corrected link on the account page
|
2010-10-11 15:07:17 -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
|
fe360e386a
|
Merge remote branch 'rmaskey/master' into search
|
2010-10-11 10:47:24 -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 |
|
rmaskey
|
94f20ba684
|
resolution for issue #151 - search with multiple words
|
2010-10-10 08:43:43 -07:00 |
|
ilya
|
8e61b438ab
|
setting the username
|
2010-10-08 16:00:58 -07:00 |
|
Raphael
|
a720694364
|
Make logging less verbose
|
2010-10-08 15:51:12 -07:00 |
|
Raphael
|
b7bf526b91
|
Make logging message clearer
|
2010-10-08 15:47:30 -07:00 |
|
ilya
|
ef3e627bed
|
the users are now made with people
|
2010-10-08 15:40:42 -07:00 |
|
danielvincent
|
154ec95717
|
killed the public tab. made a broadcast button in everyone tab
|
2010-10-08 14:06:49 -07:00 |
|
ilya
|
ddb98502b9
|
setup the controller, still need to make the person
|
2010-10-07 19:25:34 -07:00 |
|
ilya
|
4ecda6ab8f
|
Merge branch 'master' of github.com:diaspora/diaspora into invites
Conflicts:
Gemfile
Gemfile.lock
|
2010-10-07 18:20:51 -07:00 |
|
danielvincent
|
2e73104d6f
|
DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2
|
2010-10-07 18:17:26 -07:00 |
|
ilya
|
3c61365fa1
|
initial invitable in user
|
2010-10-07 18:11:17 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|