MrZYX
a68031179b
prevent inviting yourself, #515
2011-05-22 14:48:07 +02:00
zhitomirskiyi
2b650e6b6d
removed person can't be blank error message
2011-02-11 16:29:19 -08:00
zhitomirskiyi
4e96d11cd0
Revert "refactored local person person friend finder functionality to use the partial"
...
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.
Conflicts:
app/views/services/_remote_friend.html.haml
app/views/users/getting_started/_step_3.html.haml
refactored invitations, added them to the last page
fixed styling on adding an aspect to the aspect list
added a facebook for person edit aspect memberships
touched up and simplified sign-up flow
fix styling on step 3
2011-02-08 16:40:33 -08:00
zhitomirskiyi
83a9e916e4
resending of invitation in resque and works
2011-02-05 15:01:04 -08:00
zhitomirskiyi
da6e16b3a4
WIP
2011-02-05 15:01:04 -08:00
zhitomirskiyi
3392f11b64
Job::InviteUser -> Job::InviteUserByEmail
2011-01-26 12:16:48 -08:00
Raphael
88fa595d59
Move seed_aspects to after accept_invitation
2011-01-20 15:03:33 -08:00
maxwell
e7a065a521
make jobs have a base class, which will verify the activerecord connection before trying the job
2011-01-19 14:10:42 -08:00
maxwell
7a02a31440
fix invitations#new, and a post spec which was mongo specific
2011-01-18 22:11:58 -08:00
Raphael
d44e76a6aa
Down to 250 failures in mysql
2010-12-20 00:36:48 -08:00
danielvincent
6f62161442
invitation emails stripped of whitespace from form
2010-12-10 18:10:24 -08:00
danielvincent
2c5d5d9328
show already invited users on invitation#new
2010-12-10 18:05:08 -08:00
Raphael
3ef5ac5252
Add some specs to Invitation, use I18n in InvitationsController
2010-12-05 14:37:43 -08:00
Michael Sofaer
9e575ea765
MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues
2010-12-04 19:36:22 -08:00
maxwell
b9ab799569
ironing out invites
2010-12-04 16:49:45 -08:00
maxwell
b300adbef5
fixed a potentially bad bug with nil invite tokens
2010-12-04 16:13:44 -08:00
maxwell
8306cfffde
add token back to invite form
2010-12-04 16:03:35 -08:00
maxwell
7dce94814c
fixing the invite user job
2010-12-03 22:41:16 -08:00
maxwell
0a831cfbf4
invites are now on the queue
2010-12-03 19:33:54 -08:00
Sarah Mei
967fcd9a52
Revert "Added genderized variants of t() to views, controllers and helpers."
...
This reverts commit 017251fef9
2010-12-01 22:29:24 -08:00
Paweł Wilk
017251fef9
Added genderized variants of t() to views, controllers and helpers.
2010-12-01 18:19:48 +01:00
Raphael
08ba387311
More sane redirect on failing to accept an invitation
2010-11-25 00:39:13 -05:00
Sarah Mei
fa602cabf2
fix messaging around invitation success/failure
2010-11-24 09:34:05 -08:00
zhitomirskiyi
9ca54a2282
accepting an invitation correctly adds the request to the user
2010-11-23 18:58:26 -08:00
maxwell
52b02176db
invited users seed aspects
2010-11-23 11:07:33 -08:00
MrZYX
ed3dc10f79
various fixes to translations - i like downcased keys only :P - made stuff translatable - cleaned up en.yml a bit
2010-11-23 14:02:13 +01:00
maxwell
da16e3ee1e
PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once
2010-11-23 00:08:30 -08:00
danielvincent
aa9966ea26
removed the word friend everywhere minus translation files
2010-11-12 20:22:55 -08:00
Raphael
6dd58fe875
Specs pass again, invitations moved to Invitation model, refactor possibly complete
2010-11-09 14:07:26 -08:00
MrZYX
1102fcd565
made flash messages translatable
2010-11-04 20:49:50 +01: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
ilya
f33298e762
removed the puts, initial token checking
2010-10-16 00:42:37 -07:00
ilya
9727b356e1
the invitations add requests which are now correctly auto accepted
2010-10-15 17:20:04 -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
ilya
0074aadd48
added a select tag to email invitations
2010-10-15 14:21:08 -07:00
maxwell
20f164fd45
fixing some of the invite copy
2010-10-15 11:11:25 -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
3b8998ab71
Invitations contains the inviters
2010-10-13 13:29:45 -07:00
danielvincent
afad554f01
DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile
2010-10-11 13:42:05 -07:00
ilya
ef3e627bed
the users are now made with people
2010-10-08 15:40:42 -07:00
