Commit Graph
311 Commits
Author SHA1 Message Date
Douglas Barbosa Alexandre 9a44d6977a Merge branch 'master' into decouple-member-notification 2016-04-11 10:34:49 -03:00
Dmitriy Zaporozhets 5999fec7a3 Merge branch 'rs-form_errors' into 'master'
Standardize the way we check for and display form errors

- Some views had a "Close" button. We've removed this, because we don't
  want users accidentally hiding the validation errors and not knowing
  what needs to be fixed.
- Some views used `li`, some used `p`, some used `span`. We've
  standardized on `li`.
- Some views only showed the first error. We've standardized on showing
  all of them.
- Some views added an `#error_explanation` div, which we've made
  standard.

See merge request !3531
2016-04-11 12:01:50 +00:00
Douglas Barbosa Alexandre 7afeace354 Merge branch 'master' into decouple-member-notification 2016-04-08 15:48:09 -03:00
Robert Speicher 7a2370f740 Standardize the way we check for and display form errors
- Some views had a "Close" button. We've removed this, because we don't
  want users accidentally hiding the validation errors and not knowing
  what needs to be fixed.
- Some views used `li`, some used `p`, some used `span`. We've
  standardized on `li`.
- Some views only showed the first error. We've standardized on showing
  all of them.
- Some views added an `#error_explanation` div, which we've made
  standard.
2016-04-04 21:37:07 -04:00
Jacob Schatz 6713600793 Merge branch 'remove-2fa-status' into 'master'
Remove 2FA status on enable page

The 2FA status on the enabling page is useless, since it always is `disabled`. A user is enabling 2FA, so he already knows that it is disabled.

### Before

![Screenshot_2016-03-29_12.41.27](/uploads/4800a13a82f176077a11ecaf13ed0cb1/Screenshot_2016-03-29_12.41.27.png)

### After
![Screenshot_2016-03-29_12.40.55](/uploads/a77e8acd7cf99190bbd6bd340542ad10/Screenshot_2016-03-29_12.40.55.png)

See merge request !3436
2016-04-04 23:14:04 +00:00
Dmitriy Zaporozhets 26631f9981 Change how notification settings in profile are rendered and updated
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 729fe42bff Improve project notification settings explanation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 359157c097 Introduce NotificationSetting to user interface
* visiting project will create notification setting if missing
* change notification setting per project even without membership
* use notification settings instead of membership on profile page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Phil Hughes 0a7974e584 Fixed issue with notification settings not saving
Closes #14736
2016-03-30 08:40:44 +01:00
Robert Schilling a1597d22ae Remove 2FA status on enable page 2016-03-29 12:41:54 +02:00
Phil Hughes 6a5b3a5c8f Shows password form when signed in with linked account
Closes #14379
2016-03-24 11:22:44 +00:00
Alfredo Sumaran a42b2c388d Merge branch 'master' into issue_7959 2016-03-22 11:13:27 -05:00
Robert Schilling f9b942259c Remove duplicated ago 2016-03-21 19:11:32 +01:00
Alfredo Sumaran bc70597908 Fix failing spec 2016-03-17 14:30:38 -05:00
Alfredo Sumaran 7216ce97f7 Add modal dialog 2016-03-17 09:48:47 -05:00
Rémy Coutable 5c1f6f8cfc Merge branch 'revert-avatar-cropping' into 'master'
Revert the avatar cropping feature

Reverts !2951 since the added 'mini_magick' dependency should be replaced by client-side croppping

See merge request !3223
2016-03-15 15:53:42 +00:00
Robert Speicher 90e91e28e4 Merge branch 'application-settings' into 'master'
Applications tab on profile settings

Closes #13855

See merge request !3031
2016-03-15 14:33:14 +00:00
Rémy Coutable 1714883107 Revert "Merge branch 'avatar-cropping' into 'master' "
This reverts commit 01160fc061, reversing
changes made to 4bff9daf8b.
2016-03-15 14:55:40 +01:00
Robert Speicher 8f21e2ae40 Let oauth/applications#index handle the profiles#applications route
Previously we were doing all of kinds of code gymnastics and flash abuse
in order to work with a Doorkeeper controller but have it _appear_ at
the `/profile/applications` path. Fortunately we can just tell Rails to
use a different controller to handle that route, and we get the best of
both worlds.
2016-03-13 16:51:09 -04:00
Phil Hughes a9d97838a3 Added back 2fa configure later button 2016-03-11 09:51:07 +00:00
Phil Hughes 218f3e702a Moved 2fa into separate view 2016-03-11 09:51:07 +00:00
Phil Hughes c4baf2417f Fixed issue with 2fa not enabling
Added in disable button for 2fa
2016-03-11 09:51:07 +00:00
Phil Hughes d5f145bf8b Fixed failing tests 2016-03-11 09:51:07 +00:00
Phil Hughes f48f51ac7e Account settings
Closes #13854
2016-03-11 09:51:07 +00:00
Phil Hughes 9f673aa498 Removed page specific variables 2016-03-04 09:07:02 +00:00
Phil Hughes b03df1758b Moved scss values into variables
Fixed heading weight
2016-03-04 09:06:49 +00:00
Phil Hughes 33ba32e6cc Applications tab on profile settings
Closes #13855
2016-03-04 09:06:07 +00:00
Robert Speicher 70d2fde492 Restructure SSH key table partial rendering
Prior, we were double-checking `@keys.any?`, and unnecessarily assigning
`is_admin` in a view where it wasn't needed.
2016-03-03 16:14:00 -05:00
Robert Speicher 01b89ee8f1 Remove Profile::KeysController#new action 2016-03-03 16:13:59 -05:00
Robert Speicher 9db57bc65a Move SSH key JS to Profile CS class 2016-03-03 16:13:56 -05:00
Phil HughesandRobert Speicher 2c760487be SSH key ellipsis on mobile 2016-03-03 16:13:56 -05:00
Phil HughesandRobert Speicher 034ad4e201 Content link colour in profile settings 2016-03-03 16:13:56 -05:00
Phil HughesandRobert Speicher 1efe105415 SSH keys settings
Closes #13860
2016-03-03 16:13:55 -05:00
Jacob Schatz ba869ae50d Merge branch 'password-settings' into 'master'
Password settings page

Closes #13858 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ebb9b67d69daa8872d79626b85f99b52/password-settings.png)

See merge request !3033
2016-03-03 19:37:20 +00:00
Phil Hughes 7ea4948df7 Heading spacing 2016-03-03 08:40:12 +00:00
Phil Hughes c4b9905805 Emails settings
Closes #13857
2016-03-03 08:40:12 +00:00
Jacob Schatz b5738edade Merge branch 'notification-settings' into 'master'
Notifications settings UI

Closes #13859 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/125e8e3b14319b6cf95e9aa31659681a/notification-settings.png)

See merge request !3035
2016-03-02 20:00:55 +00:00
Jacob Schatz b8e5c62101 Merge branch 'preferences-view' into 'master'
Preferences view

Closes #13861 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/133ae7a1b4a0e931d5a6b19922eb2703/preferences-settings.png)

See merge request !3036
2016-03-02 19:57:35 +00:00
Phil Hughes 61c30061e7 audit log UI update
Closes #13862
2016-03-02 17:06:01 +00:00
Phil Hughes c6b36e3efd Preferences view
Closes #13861
2016-03-02 17:05:04 +00:00
Phil Hughes 6bd85ee6d0 Notifications settings UI
Closes #13859
2016-03-02 17:02:45 +00:00
Phil Hughes 8df4a70887 Heading spacing 2016-03-02 16:59:52 +00:00
Phil Hughes 67c6d98a1b Fixed failing password tests 2016-03-02 16:59:06 +00:00
Phil Hughes 3806c00822 Password settings page
Closes #13858
2016-03-02 16:59:06 +00:00
Phil Hughes 834eea0856 Profile settings
Closes #13853
2016-03-02 11:41:52 +00:00
Alfredo Sumaran af978cd5bc Merge branch 'master' into avatar-cropping 2016-02-23 16:52:43 -05:00
Johann Pardanaud bf6aa15512 Improve avatar cropping internals, based on suggestions made by @rspeicher on !2773 2016-02-17 18:35:16 +01:00
Johann Pardanaud 6d5808801f Fix #7959: Fix avatar stretching by providing a cropping feature 2016-02-09 22:26:50 +01:00
Dmitriy Zaporozhets 6a7f2b99c7 Set of small UI fixes to project and profile pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-07 17:20:12 +01:00
Robert Speicher d6ef6c634e Support Two-factor Authentication for LDAP users
Closes #12653
2016-02-03 13:31:12 -05:00