Merge pull request #4259 from netom/4173-disable-invite-button

Disable invite button after sending invite

Conflicts:
	Changelog.md
This commit is contained in:
Jonne Haß 2013-07-06 12:40:05 +02:00
commit 3da9b1bf7f
3 changed files with 3 additions and 1 deletions

View file

@ -7,6 +7,7 @@
* Don't focus comment form on 'show n more comments' [#4265](https://github.com/diaspora/diaspora/issues/4265)
* Do not render mobile photo view for none-existing photos [#4194](https://github.com/diaspora/diaspora/issues/4194)
* Render markdown content for prettier email subjects and titles [#4182](https://github.com/diaspora/diaspora/issues/4182)
* Disable invite button after sending invite [#4173](https://github.com/diaspora/diaspora/issues/4173)
## Features
* Admin: add option to find users under 13 (COPPA) [#4252](https://github.com/diaspora/diaspora/pull/4252)

View file

@ -31,4 +31,4 @@
%br
%p
= submit_tag t('.send_an_invitation')
= submit_tag t('.send_an_invitation'), :disable_with => t('.sending_invitation')

View file

@ -381,6 +381,7 @@ en:
to: "To"
personal_message: "Personal message"
send_an_invitation: "Send an invitation"
sending_invitation: "Sending invitation..."
send_invitation: "Send invitation"
paste_link: "Share this link with your friends to invite them to Diaspora*, or email them the link directly."
codes_left: