Marin Jankovski
26d1bd7c2a
Set return url as param.
2014-06-19 14:20:25 +02:00
Marin Jankovski
af5ea92cc4
Merge branch 'master' into login_page
...
Conflicts:
CHANGELOG
2014-04-07 20:13:37 +02:00
Dmitriy Zaporozhets
d70939f680
Remove unnecessary sign *
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-07 18:59:10 +03:00
Marin Jankovski
aea3712e8d
Add option for disable standard signin.
2014-04-07 17:11:06 +02:00
Dmitriy Zaporozhets
4ab32be8a7
Dont care about emails for oauth
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-07 15:20:40 +03:00
Job van der Voort
622bbf9629
line break
2014-03-19 14:07:42 +01:00
Job van der Voort
0e31cb40d3
require public email with oauth provider message
2014-03-19 14:01:13 +01:00
Dmitriy Zaporozhets
87415ab2a6
Add bottom margin to nav-tabs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-15 13:41:48 +02:00
Pixelindustries
c187d27955
Added margin between form and button in resend-confirmation form.
2014-02-14 15:45:41 +01:00
Pixelindustries
9d61ea55d1
Added margin between form and button in reset-password form.
2014-02-11 10:39:13 +01:00
Dmitriy Zaporozhets
a379bd00dc
Style devise views
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-01-01 20:53:44 +02:00
Dmitriy Zaporozhets
42003f5312
Improve UI/UX for reset_password, signup, confirmation pages
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-16 21:11:52 +02:00
Dmitriy Zaporozhets
6f556d8e71
Add resend-confirmation-link to sign-in page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-16 21:10:59 +02:00
Dmitriy Zaporozhets
687cf48e60
Improve email with confirmation instructions
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-16 21:10:18 +02:00
Jeroen van Baarsen
bfacf13668
Fixed all the confirm: deprecation warnings
2013-12-10 20:33:21 +01:00
Dmitriy Zaporozhets
fc3c57734d
Style resend confirmation instructions
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-21 09:46:09 +02:00
Perry Faro
3fb6ad9020
Reset button/link on the reset password page. Fixes #5418
2013-10-27 11:50:18 +01:00
Dmitriy Zaporozhets
2cd3d42181
Use gitlab_config intead of Gitlab.config.gitlab in views
2013-10-17 22:11:41 +03:00
Perry Faro
96ae1a8099
Add check if the signup setting is enabled. fixes #4832
2013-09-27 11:56:30 +02:00
Dmitriy Zaporozhets
7984d3ca00
Minor UI fixes for login page
2013-08-12 12:38:30 +03:00
Dmitriy Zaporozhets
36fd4de825
Replace page_title with page-title. Correct margin for some blocks/layouts
2013-07-13 08:45:48 +03:00
Dmitriy Zaporozhets
7e4ee824ab
Better name for sign in tab
2013-06-21 09:19:31 +03:00
Dmitriy Zaporozhets
1ecdfb46a4
Fix spell error in sing in
2013-06-21 08:51:15 +03:00
Dmitriy Zaporozhets
5a2111526d
New logo/color for login screen
2013-06-20 11:32:59 +03:00
Dmitriy Zaporozhets
7a53215d75
Hide sign-in bottom block if no providers
2013-06-13 10:42:45 +03:00
Dmitriy Zaporozhets
a3645b5b4d
Restyle login page for LDAP/regular login
2013-05-24 19:43:47 +03:00
Dmitriy Zaporozhets
7069fac317
Add custom sing-in text & google analytics
2013-05-08 21:03:36 +03:00
Andrey Kumanyaev
67ccc8b52a
Replace old hashes with new 1.9 ruby hashes (rebase)
2013-05-05 18:01:10 +04:00
David Greaves and Dmitriy Zaporozhets
40b949abab
Change text_field to :login from :email in line with 9d92433a7c to allow login as admin or non-ldap user when ldap is enabled
...
Also change haml style in line with that commit
2013-04-26 12:26:39 +03:00
Dmitriy Zaporozhets
9d92433a7c
login with both email or username
2013-03-25 16:10:14 +02:00
J. Francisco Raposerias
a40541c42d
add autofocus to username input
2013-03-04 17:54:26 -03:00
Dmitriy Zaporozhets
66121d6caa
Improve devise views
2013-02-07 13:20:33 +02:00
Dmitriy Zaporozhets
e2fb18a3ec
replace right with pull-right
2013-01-30 16:40:43 +02:00
Dmitriy Zaporozhets
033aa1a885
refactor buttons pt1
2013-01-29 22:18:19 +02:00
Marin Jankovski
296cdd591f
Add optional signup.
2013-01-18 11:57:31 +01:00
Alex Leutgöb
f2bf05066d
Add autofocus attribute to sign-in email field
2012-12-11 11:57:25 +01:00
Alex Leutgöb
8738eb2369
Change html input type to "email" on sign-in view
...
As long as the username is the user's email address it makes sense to use input="email" helper for the email field. This allows HTML5 capable (mobile) devices to bring up an email input keyboard instead of the default one.
2012-12-11 11:25:55 +01:00
Dmitriy Zaporozhets
784cb886cf
Sign in screen: removed hr, added clearfix
2012-11-07 17:49:52 +02:00
randx
9329dfbfc5
Show inline providers icons on login page
2012-09-12 19:01:52 +03:00
Dmitriy Zaporozhets
fa4150d47d
Cleanup after omniauth
2012-09-12 08:23:20 +03:00
Dmitriy Zaporozhets
486de8c3f4
Refactoring auth
2012-09-12 07:48:22 +03:00
Dmitriy Zaporozhets
621affecb5
Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master
...
Conflicts:
Gemfile.lock
app/helpers/application_helper.rb
app/views/devise/sessions/new.html.erb
db/schema.rb
2012-09-12 06:49:52 +03:00
Minoru NAKATA
a3d22297dc
fix haml template error for ldap login.
2012-09-10 20:40:20 +09:00
Dmitriy Zaporozhets
c7cfe3d83b
devise session templates to haml. Fix problem with missing message in commit
2012-09-03 08:15:07 +03:00
Florian Unglaub
a64aff2f1c
Omniauth Support
2012-08-17 15:20:55 +02:00
Robert Speicher
7754189187
Fully embrace Ruby 1.9 hash syntax
...
Didn't bother with files in db/, config/, or features/
2012-08-10 18:25:15 -04:00
jdamick
9a4e5a8bd5
removed dead code from the form
2012-06-18 11:51:17 -04:00
jdamick
848b5e99fc
moved the ldap login to its own partial and cleaned up the forms a little bit
2012-06-18 11:45:49 -04:00
jdamick
50dabb5452
customizing the user login screen for primarily ldap authentication
2012-06-18 11:45:49 -04:00
Dmitriy Zaporozhets
2587de74df
Minor fixes
2012-04-10 20:06:17 +03:00