github/devise
1
1
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2026-01-13 00:38:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,288 Commits 28 Branches 145 Tags
lm-jruby
Commit Graph

76 Commits

Author SHA1 Message Date
Jon Phenow
211159f2eb translation for mailer subject 2015-08-27 10:26:12 -05:00
Timo Schilling
6b0d11ed7a use authentication_keys in flash message, instead of static ‘username’ (fix #3201) 2014-09-23 18:42:11 +02:00
Paul A. Jungwirth
6e0c287391 All causes of failed login should have the same error message 2014-09-11 08:38:14 -07:00
Lauro Caetano
571dead19b Check if there is a signed in user before sign out. 
Only execute the `SessionsController#destroy` if there is a signed in
user, otherwise it will raise
`ActionController::InvalidAuthenticityToken`.

Fixes #2934.
 2014-04-09 10:25:44 -03:00
Oleg Pudeyev
dbddce6acd Missed some "instructions about" -> for 2014-02-28 15:12:07 -05:00
Oleg Pudeyev
1a87fd6477 All other text does not use camel case 2014-02-28 02:04:35 -05:00
Oleg Pudeyev
00af1481f8 Grammar/content fixes for email confirmation language 
- account -> email address
- was -> has been
 2014-02-28 02:04:23 -05:00
Paul Anunda
43282f738e Fixed small grammatical error in en.yml 2013-11-28 10:29:50 -06:00
Vitaly Bezkrovny
aba19c1ca4 * typo 2013-10-16 23:57:11 +03:00
Vitaly Bezkrovny
e20e446cf4 + last_attempt 
+ @@last_attempt_warning

+ last_attempt? method;
* send :last_attempt key if it is the last attempt

+ test for last attempt

* update test to make two asserts

* update message
 2013-10-15 01:53:56 +03:00
Greg Gates
989d7192fa Tweaks confirmation flow for signed_in users 
For #2627

When allow_unconfirmed_access_for > 0, users may
be already signed in at the time they confirm
their account. Consequently, the default
confirmation should be compatible with this
possibility. Additionally, they should not be
redirected to the sign in form after confirmation
in this case. So I've changed
ConfirmationsController#after_confirmation_path_for
to send the user to the root path when signed in,
or the sign in form otherwise.
 2013-09-16 10:12:15 -04:00
José Valim
6b3b0c5e8c Remove deprecated token lookups 2013-09-02 19:23:15 -03:00
José Valim
dff7891b97 Get rid of token authentication 2013-09-02 19:15:47 -03:00
Greg Gates
fc251c306c Fixes incorrect flash message on confirmation 
The :confirmed default message in devise.en.yml
used to say "You are now signed in." This is no
longer the default behavior in v3.1.0.

This commit renames that message to
:confirmed_and_signed_in and changes the :confirmed
message to be appropriate for the default post-
confirmation location (which is now the new session
page). The new :confirmed message reads:

"Your account was successfully confirmed. Please
sign in."
 2013-08-30 17:16:56 -04:00
hakanensari
b861a65e72 Fix run-on sentence 2013-07-26 14:24:19 +01:00
hakanensari
1ab7792beb Fix grammar 2013-07-26 14:24:13 +01:00
camelmasa
6fd21ae37e sorted locale file 2013-01-23 10:39:58 +09:00
José Valim
e1fde192f2 Update CHANGELOG 2012-12-13 08:43:43 +01:00
Gabe Martin-Dempesy
130d684198 Change failure key for missing database resource to :invalid_email 2012-11-19 15:49:21 -08:00
Gabe Martin-Dempesy
ffab77c35e Fix typo on nonexistent error 2012-11-18 15:19:15 -08:00
Gabe Martin-Dempesy
cde2229e59 Support alternate sign in error message when email record does not exist 
By default, the nonexistent error is still identical to the :invalid
message, and must be customized by the developer to implement.
 2012-11-18 15:08:57 -08:00
Nils Landt
87f2fa9767 Add options to expire confirmation tokens 
With this patch, functionality is added to expire the confirmation
tokens that are being sent by email.
For example, if a token is valid for 3 days only, it cannot be used for
confirmation on the 4th day.
 2012-07-09 14:43:12 +02:00
Gregory Bataille
ff75341c75 Redirect to sign in page when trying to access password#edit without a 
reset_password_token (i.e. not coming from a reset password email)
 2012-06-08 10:08:35 +02:00
Aditya Sanghi
ff6e30cec4 Minor updates suggested to default language in locales. Be consistent with "email" and "e-mail"; email address exists "in" our database not "on" our database. 2012-05-14 17:44:51 -03:00
Abe Voelker
3ac2c1dd18 Change OmniAuth flash wording (authorize->authenticate) 2012-02-24 14:35:43 -06:00
José Valim
8c9cf7d671 Add deprecations, update changelog. 2012-01-24 14:23:34 +01:00
Jo Liss
c78c196423 More helpful sign-up message for Confirmable 
This is also better for translations, because we can translate paragraph-wise.

signed_up_but_inactive and signed_up_but_locked are likely not needed,
but I wasn't sure how to best remove them.
 2012-01-23 13:52:32 +01:00
Kaleem Ullah
41b1e87105 fix unlock message 2012-01-23 15:20:05 +04:00
Rodrigo Flores
94fca31be8 Improving the unconfirmed message 2011-12-06 09:24:06 -02:00
José Valim
6d681c5b8a Merge remote-tracking branch 'heimidal/updates' into reconfirm 
Conflicts:
	lib/devise/models/confirmable.rb
	test/support/helpers.rb
 2011-12-04 20:58:41 +01:00
Andrey Korobkov
a46144e022 typo 2011-10-13 18:14:09 +04:00
Brian Rose
7f754caba3 Merge branch 'master' into updates 2011-10-12 10:56:08 -06:00
Rémy Coutable
ebbabaea5b After a password reset, don't show "You are now signed in." if the user can't be signed-in anyway. 2011-09-01 00:24:10 +02:00
Brian Rose
8c0f74f036 Add better message when user updates while reconfirmable is enabled. 2011-08-30 22:19:18 -06:00
hck
7264bb55b2 added I18n support to inactive_message in RegistrationsController 2011-08-02 08:11:25 +03:00
Rodrigo Flores
40c0a7b50b Added paranoid mode to lockable 2011-06-22 12:52:11 -03:00
Rodrigo Flores
225c89fbf1 Paranoid mode on confirmable 2011-06-22 12:52:10 -03:00
Rodrigo Flores
803e46cda7 Refactoring the paranoid controller 2011-06-22 12:52:10 -03:00
Rodrigo Flores
004fe2ad12 Paranoid mode for recoverable 2011-06-22 12:50:34 -03:00
José Valim
ae976f60ca Mark the token as expired, because invalid gives no clue of what to do next. 2011-04-21 19:17:33 +02:00
Jack Dempsey
567d59e48a update verbiage to be more concise 2011-04-16 19:16:33 +08:00
Jack Dempsey
f89f71262d require_no_authentication now sets flash with I18n message 2011-04-16 19:16:33 +08:00
Michael Klaus
bb89ca4865 Added link to i18n wiki page. 2011-03-06 14:30:07 +08:00
José Valim
ad8d2d7d99 Be more helpful in the already confirmed message, closes #613 2010-11-06 08:54:03 +01:00
José Valim
611261c64e More tests for Omniauth. 2010-10-18 15:00:34 +02:00
takahashim
a1c80b6211 use I18n'ed header on error messages block 2010-10-04 15:38:07 +08:00
José Valim
db1ce8eeb2 Sign up now check if the user is active or not and redirect him accordingly setting the inactive_signed_up message. This commit also moves after_update_path_for to inside RegistrationsController, not allowing it to be overriden inside ApplicationController anymore. 2010-09-30 09:12:00 +02:00
José Valim
c31b1f2146 Remove skipped handling from OAuth in favor of exceptions and rescue_from syntax. 2010-07-28 21:51:26 +02:00
José Valim
bd1006d321 Add the possibility to skip OAuth authentication by returning nil from the finder method. 2010-07-26 20:32:06 +02:00
José Valim
b31d60ce7c Implement error handling for OAuth. 2010-07-26 20:32:05 +02:00