Patricio Cano
475bb00bde
Improved 2FA warning message about lost codes
2015-08-19 18:13:01 -05:00
Ben Bodenmiller
0f785bbc7e
ink to configured gravatar host on profile page
2015-08-05 00:48:16 -07:00
Job van der Voort
ae36842d45
Merge branch 'ssh-key-form' into 'master'
...
Switched the order of the SSH key form
Now it looks like this:

See merge request !1069
2015-07-30 09:26:56 +00:00
Darby
34c2867ca2
Switched the otder of the SSH key form
2015-07-29 12:59:50 -07:00
Douwe Maan
70a3c165a9
Allow custom label to be set for authentication providers.
2015-07-23 15:20:12 +02:00
Achilleas Pipinellis
bde2173b63
Fix link to 2fa help page. Closes #2055
2015-07-22 17:03:38 +03:00
Dmitriy Zaporozhets
5f34759ecb
Allow user to specify content he wants to see on project page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-13 18:24:15 +02:00
Ben Bodenmiller
9bb5249994
dont -> don't
...
Update "You dont have any authorized applications" to "You don't have any authorized applications"
2015-07-07 11:31:47 -07:00
Dmitriy Zaporozhets
f3590c83ea
Merge branch 'audit_log' into 'master'
...
Audit log for user authentication
https://dev.gitlab.org/gitlab/gitlabhq/issues/2318
See merge request !931
2015-07-06 10:09:53 +00:00
Valery Sizov
411829fdb5
Audit log for user authentication
2015-07-06 12:36:08 +03:00
Douwe Maan
cd5e79e98b
Correctly show anonymous authorized applications under Profile > Applications.
2015-07-02 11:53:31 +02:00
Robert Speicher
b6318297fc
Use User#two_factor_enabled instead of otp_required_for_login
2015-06-19 15:14:37 -04:00
Robert Speicher
7400cfc114
Bootlint: Use offset grid classes instead of empty divs
2015-06-16 13:32:32 -04:00
Robert Speicher
c0cb77e413
Remove redundant help text from custom dashboard selection
2015-06-13 17:59:13 -04:00
Robert Speicher
d0463d2c6a
Fix alignment of Behavior form; add documentation link
2015-06-13 17:59:13 -04:00
Robert Speicher
bf9dd4327e
Add feature specs for default dashboard preference
2015-06-13 17:59:12 -04:00
Robert Speicher
1eb9a02f21
Add a form field to customize the dashboard preference
2015-06-13 17:59:11 -04:00
Robert Speicher
35339bb11f
Update markup/styling for syntax highlight theme preference
2015-06-13 17:58:17 -04:00
Robert Speicher
0e21436aaf
Simplify the javascript behavior for Preference updating
2015-06-13 17:58:17 -04:00
Robert Speicher
8112f7550b
Add PreferencesHelper module
...
Consolidates the helpers related to user preferences.
Renames `app_theme` to `user_application_theme` to better explain what
it is.
2015-06-13 17:58:16 -04:00
Robert Speicher
844d72716e
Add Gitlab::Themes module; remove Gitlab::Theme
...
Now we can simply loop through all themes, among other things.
This also removes the `dark_theme` / `light_theme` classes and the
`theme_type` helper, since they weren't used anywhere.
2015-06-13 17:58:16 -04:00
Robert Speicher
0c0c31ff34
Move the "Design" templates and logic to Preferences
2015-06-13 17:58:16 -04:00
Robert Speicher
821fc4b034
Add Profiles::PreferencesController
2015-06-13 17:58:15 -04:00
Douwe Maan
e9c40a9c0f
Merge branch 'fix_typo_account_page' into 'master'
...
Fix typo on account page.
@douwe Thanks for reviewing this small fix.
See merge request !1854
2015-06-12 13:16:31 +00:00
Nicolas
c2087098be
Fix typo on account page.
2015-06-12 05:15:11 +02:00
Robert Speicher
e26eb1e162
Update grids for 2FA details
...
Also adds a link to the documentation.
2015-06-10 16:31:06 -04:00
Robert Speicher
793d9799b6
Show key fingerprint on DeployKeys#index
...
Also style all key fingerprints consistently across the app.
2015-06-03 18:03:04 -04:00
Stan Hu
a38dd9bd3a
Add "Resend confirmation e-mail" link in profile settings
...
Fixes https://github.com/gitlabhq/gitlabhq/issues/9274
2015-06-03 00:12:43 -07:00
Douwe Maan
96d6fdc27c
Add option to disallow users from registering any application to use GitLab as an OAuth provider
2015-05-29 13:29:16 +02:00
Dmitriy Zaporozhets
08a12f24b0
Make user settings account page nicer
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-28 20:36:47 +02:00
Dmitriy Zaporozhets
ce5928f4df
Merge branch 'profile-settings'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/profiles/accounts/show.html.haml
2015-05-28 16:31:38 +02:00
Dmitriy Zaporozhets
35d0d774a1
Prefer panels over fieldset when different forms
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-28 15:26:37 +02:00
Dmitriy Zaporozhets
47989d6037
Consistent header look for setting pages
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-28 14:54:05 +02:00
Dmitriy Zaporozhets
dcc9dc94d5
Re-organize profile settings titles and headers
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-28 14:44:38 +02:00
Dmitriy Zaporozhets
499154518a
You can not remove user if he/she is an only owner of group
...
To prevent loose of group data you need to transfer or remove group
first before you can remove user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-28 12:00:02 +02:00
Robert Speicher
e73ea12695
Add support for manually entering 2FA details
2015-05-23 15:04:40 -04:00
Dmitriy Zaporozhets
c2ee828c19
Merge branch 'omniauth-csrf' into 'master'
...
Protect OmniAuth request phase against CSRF.
Addresses #2268 .
See merge request !1793
2015-05-14 14:22:26 +00:00
Robert Speicher
3fb0fedd04
Autofocus the pin field on 2FA enable form
2015-05-09 17:32:49 -04:00
Robert Speicher
2ad1334d9e
Quotes, icon helper in profiles/accounts/show view
2015-05-09 17:32:24 -04:00
Robert Speicher
8eb577ae98
Improve copy for enabling 2FA
2015-05-09 17:32:09 -04:00
Robert Speicher
4fca1fc5ab
Update copy for generating new recovery codes
2015-05-09 17:32:09 -04:00
Robert Speicher
c891ef9337
Add page titles for two_factor_auths views
2015-05-09 17:32:08 -04:00
Robert Speicher
bd680999f9
Be consistent with what we call the 2FA feature
...
"Two-factor" vs. "2-Factor"
2015-05-09 17:31:39 -04:00
Robert Speicher
35b62facac
Update copy for recovery codes
2015-05-09 17:31:39 -04:00
Dmitriy Zaporozhets
8ae712ae28
Render 2fa recovery codes instead of downloading it
2015-05-09 17:31:39 -04:00
Dmitriy Zaporozhets
802fcd051f
Add support for backup codes
2015-05-09 17:31:37 -04:00
Dmitriy Zaporozhets
de9e1c3bad
Turn 2-factor authentication into 2 steps process. Disabled 2fa UI for ldap users since it is not supported
2015-05-09 17:31:10 -04:00
Dmitriy Zaporozhets
cde474a49f
Make 2 factor authentication work
2015-05-09 17:31:10 -04:00
Dmitriy Zaporozhets
ba7e2fd946
Create Two-factor authentication resource for user
2015-05-09 17:31:10 -04:00
Dmitriy Zaporozhets
4291e28af7
Merge branch 'change-primary-email' into 'master'
...
Allow primary email to be set to an email that you've already added.
Fixes gitlab-com/support-forum#106.
When the user sets their primary email to an email that they've already added to their account, this patch makes sure that secondary email record is destroyed, and a new email record is created for the old primary email. This is based on the assumption that in this case no email was meant to be deleted, but the user simply wanted to change which of their emails is primary.
See merge request !591
2015-05-03 11:00:51 +00:00