maxwell
9e5eb86866
invitations are not sent from magent queue (a problem in itself)
...
Revert "Revert "removing the form for user creation thru signup". Shutting down magent is a less annoying solution."
This reverts commit b9cafc0579
2010-11-26 15:52:34 -08:00
Michael Sofaer and Raphael Sofaer
b9cafc0579
Revert "removing the form for user creation thru signup". Shutting down magent is a less annoying solution.
...
This reverts commit 4c96e12a31
2010-11-26 17:16:11 -05:00
maxwell
4c96e12a31
removing the form for user creation thru signup
2010-11-26 09:56:30 -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
32390933e8
PALINDROME message for multiple emails
2010-11-23 00:14:26 -08:00
MrZYX
e72f4e1da7
translatable status is good again
...
made default aspects translatable
fix all the misssing translations I found
cleanup en.yml
2010-11-22 22:30:37 +01:00
Jonne Hass
f426c08dcc
made shared/_contatct_list.html.haml
...
and the type after "viewing:" in shared/_author_info.html.haml translatable
2010-11-19 17:25:05 +01:00
Raphael
2ecf1e8b71
No name fields on invitation accept
2010-11-17 15:45:40 -08:00
maxwell
0d26348e69
remove arnold from the inviter mail form
2010-11-08 10:05:34 -08:00
Hexagon
938d146405
Common translations are used without the namespace
2010-11-02 00:07:24 +01:00
Hexagon
1acc206fa4
#475 : Fixed more untranslated strings
2010-11-01 22:22:13 +01: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 fb70dc8c9953fef63a9a
2010-10-20 14:59:55 +02:00
maxwell
d0055cee37
changed a bit of text in the invite, also made it show on all aspects now that we have it fixed
2010-10-19 21:07:10 -07:00
maxwell
f26dc039c9
removed empty hash from invite email
2010-10-19 20:43:45 -07:00
danielvincent
b218a53bf7
fancyboxes have title bars now, kind of.
2010-10-19 14:06:44 -07:00
Raphael
676e802fd2
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-18 15:46:44 -07:00
Raphael
b681850783
Get rid of warning/error on invites/_new partial
2010-10-18 15:46:14 -07:00
ilya
a8bf082e35
The invitation now has an optional personal message
2010-10-18 14:35:41 -07:00
danielvincent
eca37e1a28
small view cleanups
2010-10-17 21:55:03 -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
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
danielvincent
be017bfb0a
DG MS; invite is now a lightbox on feed and manage pages
2010-10-11 14:16:24 -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
