Commit Graph
348 Commits
Author SHA1 Message Date
Marin Jankovski 607ea7c6e5 Share the key table between admin and profile resources. 2014-12-30 11:01:30 +01:00
Marin Jankovski 82829ed49e Move user key manipulation in admin section to a separate controller. 2014-12-30 10:15:11 +01:00
Marin Jankovski f0085d034b Reuse show page for user keys. 2014-12-29 17:09:39 +01:00
Marin Jankovski 492f3a4779 Add user key actions to admins. 2014-12-29 17:07:23 +01:00
Dmitriy Zaporozhets 1f2628fe21 Allow Group path to be changed at the same time as name
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-22 15:02:47 +02:00
Dmitriy Zaporozhets e1f1e062a8 Merge branch 'multi_provider' into 'master'
Supporting for multiple omniauth provider for the same user

fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/1721

and https://dev.gitlab.org/gitlab/gitlabhq/issues/1760

See merge request !1296
2014-12-04 16:03:04 +00:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Dmitriy Zaporozhets d80a59c7b1 Create helper for sort drowdown option names
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-04 12:10:38 +02:00
Dmitriy Zaporozhets b23b78ada1 Merge pull request #7866 from cirosantilli/input-button-to-tag
Use button type=submit instead of input.
2014-10-28 12:11:15 +02:00
Dmitriy Zaporozhets f4178f9601 Merge pull request #8005 from cirosantilli/settings-to-gitlab-config
Use Gitlab.config instead of Settings everywhere
2014-10-27 19:18:48 +02:00
Dmitriy Zaporozhets ee068e76f3 Merge pull request #7961 from cirosantilli/dry-log-file-names
Factor admin logs [failure unrelated]
2014-10-21 11:59:41 +03:00
Dmitriy Zaporozhets fb5c1dd8f0 Merge pull request #8113 from cirosantilli/factor-group-forms
Factor group forms
2014-10-21 11:39:41 +03:00
Robert Schilling 11656fd423 Merge pull request #8111 from cirosantilli/dry-group-avatar-button
Factor choose group avatar button
2014-10-21 08:25:09 +02:00
Ciro Santilli 3a47ed979a Factor group forms 2014-10-21 00:25:44 +02:00
Ciro Santilli 01db264ffc Factor choose group avatar button 2014-10-20 23:57:46 +02:00
Ciro Santilli f7d01f2067 Factor group tips 2014-10-20 23:43:51 +02:00
Dmitriy Zaporozhets 2064a14724 Add tests for remove group member feature in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-20 13:18:07 +03:00
Dmitriy Zaporozhets f50c0e5af1 Fix group user removal from admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-20 12:59:16 +03:00
Ciro Santilli 39c66c822e Use Gitlab.config instead of Settings everywhere 2014-10-15 23:01:31 +02:00
Valery Sizov 4e0da2325b Admin: user sorting 2014-10-13 16:07:57 +03:00
Ciro Santilli 9bebacd692 Dry admin logs. 2014-10-06 00:14:46 +02:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Marin Jankovski f74dba8c42 Merge pull request #7595 from bbodenmiller/patch-4
add sign-in count
2014-10-03 10:23:26 +02:00
Dmitriy Zaporozhets 929678899d Fix 500 error on admin user page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-02 17:15:09 +03:00
Ciro Santilli 6294033024 Use button type=submit instead of input. 2014-10-01 11:12:56 +02:00
Ciro Santilli 0cdef83dc8 Remove type submit from button_tag since default. 2014-09-26 16:52:36 +02:00
Dmitriy Zaporozhets bdbadebe3e Fix adminarea and emails for new membership logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-15 10:57:02 +03:00
Dmitriy Zaporozhets 8210d81381 Replace old references of users_project & users_group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 19:51:54 +03:00
Dmitriy Zaporozhets c69b8e0459 Huge replace of old users_project and users_group references
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 19:32:51 +03:00
Dmitriy Zaporozhets de6f4c3135 Merge pull request #7596 from bbodenmiller/patch-5
add current sign-in date
2014-09-08 09:37:21 +03:00
Ben Bodenmiller f818218359 add current sign-in date
add current sign-in date to admin section profile view
2014-08-24 23:52:31 -07:00
Ben Bodenmiller 92160789aa add sign-in count
add sign-in count to admin section profile view
2014-08-24 23:47:19 -07:00
Ben Bodenmiller c1eee5968f Monthly active users -> Active users last 30 days
Clarify what `Monthly active users` means by changing to `Active users last 30 days`.
2014-08-24 22:42:46 -07:00
Marin Jankovski c0a95947bc Update the note for admin user. 2014-07-17 14:03:17 +02:00
Marin Jankovski d12c1e90f8 Test secondary user email removal. 2014-06-23 10:39:56 +02:00
Marin Jankovski 37425618bc Add option for admin to remove users secondary emails. 2014-06-23 09:45:26 +02:00
Dmitriy Zaporozhets ad432583a9 Improve UI/UX for create/edit group in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-03 16:40:50 +03:00
Dmitriy Zaporozhets 95d61a094d Improve admin/projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-03 14:19:11 +03:00
Dmitriy Zaporozhets 31c963edb1 Improve admin/user form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-03 13:05:06 +03:00
Dmitriy Zaporozhets fc43c4e7fa Restyle admin/user page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-03 12:44:22 +03:00
Dmitriy Zaporozhets 144212fba2 Add members paginations to admin/project page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-02 19:31:43 +03:00
Dmitriy Zaporozhets 9a4c8f7e41 Improve admin group page performance
Add pagination for projects and members to /admin/groups/:group page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-02 18:58:00 +03:00
Dmitriy Zaporozhets 4c51619de3 Use more logic class names for buttons in panel headings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 19:42:49 +03:00
Dmitriy Zaporozhets a2b3eb134a Move from ui-box to panels
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 18:57:27 +03:00
Dmitriy Zaporozhets 38ff5d1ab9 Replace ui-box title with panel-heading
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 18:43:21 +03:00
Dmitriy Zaporozhets 6dcbe1b43c Replace ui-box with panel.panel-default
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 18:42:44 +03:00
Marin Jankovski f79a300417 Replace existing links to help pages with the new ones. 2014-05-29 08:58:15 +02:00
Dmitriy Zaporozhets 9eb7fe6d06 Fix admin user errors ui
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-20 16:21:30 +03:00
Dmitriy Zaporozhets c608a5dcea Add sort dropdown for admin projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 17:02:57 +03:00
Drew Blessing 4618ec8791 Fix unclear text in broadcast message view. 2014-04-25 15:31:30 -05:00