home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,538 Commits 48 Branches 340 Tags
5a1706791e46fd69a67fcdebfc384a702b00a7ff
Commit Graph
172 Commits
Author SHA1 Message Date
Jacob Schatz f225c2a005 Merge branch 'improve_more_buttons' into 'master' 
Improve admin area button style

A lot of the buttons in the top right in the admin area were too big. This makes those the new `btn-nr` size which seems to look nice.

## User buttons

### Current

![Screen_Shot_2016-01-08_at_2.29.30_PM](/uploads/8920d4a67ff4a20617e5b4d319ba154e/Screen_Shot_2016-01-08_at_2.29.30_PM.png)

### New

![Screen_Shot_2016-01-08_at_2.29.21_PM](/uploads/494741f6e92592ff2c60683f399bb1c1/Screen_Shot_2016-01-08_at_2.29.21_PM.png)

## Project edit button

### Current

![Screen_Shot_2016-01-08_at_2.29.59_PM](/uploads/09a2f8fddc45120510dd10758ce33c51/Screen_Shot_2016-01-08_at_2.29.59_PM.png)

### New ![Screen_Shot_2016-01-08_at_2.30.14_PM](/uploads/93a72a7c42b1974643b1e9ffd3ec8511/Screen_Shot_2016-01-08_at_2.30.14_PM.png)

## Label button

### Current

![Screen_Shot_2016-01-08_at_2.38.09_PM](/uploads/9cff790e1a4e2d650487c9765d0235a4/Screen_Shot_2016-01-08_at_2.38.09_PM.png)

### New

![Screen_Shot_2016-01-08_at_2.38.31_PM](/uploads/9462ff2393249eb762dc7cb92605c733/Screen_Shot_2016-01-08_at_2.38.31_PM.png)

cc/ @jschatz1 @creamzy @skyruler 

See merge request !2351
 2016-01-12 17:36:01 +00:00
Stan Hu 75123458ee Add user's last used IP addresses to admin page 
This would help admins figure out from where spam is originating.
 2016-01-12 00:59:29 -08:00
Drew Blessing 97022c414e Improve admin area button style 2016-01-11 09:11:40 -06:00
Robert Speicher fa36749bce Add two custom Date/Time conversion formats 2016-01-07 20:01:08 -05:00
Robert Speicher 59305715e9 Remove stamp gem 
Closes #5908
 2016-01-07 16:28:33 -05:00
Robert Speicher bf249550d0 number_with_delimiter most of the things 2015-12-31 20:04:23 -05:00
Douwe Maan 0520cd7164 Merge branch 'master' into ui/form-consistency 2015-12-03 13:21:19 +01:00
Douwe Maan ed74fa73e2 Use consistent casing for page titles 2015-12-02 14:41:54 +01:00
Andrew Tomaka daca985a6e Prevent impersonation if blocked 2015-12-02 08:07:29 -05:00
Stan Hu 36bde0fcb1 Fix Error 500 when viewing user's personal projects from admin page 
This is a regression introduced in 4d7f00f.

Closes #3680
 2015-11-25 14:00:35 -08:00
Alex Jordan 3300db70ff Rewrite HTTP links to force TLS, where possible 2015-11-16 16:50:05 -08:00
James Newton 3bb626f91c refactor login as to be impersonation with better login/logout 
Modifies the existing "login as" feature to be called impersonation, as
well as keeping track of who is impersonating to revert back to that
user without having to log out.
 2015-10-29 11:00:17 +01:00
Dmitriy Zaporozhets 7c85ebf6dc Partly implement new UI for user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-16 13:24:28 +02:00
Yorick Peterse 9496356367 Re-use User objects for avatar_icon where possible 
This removes the need for running an extra SQL query in these cases.
 2015-10-15 12:05:01 +02:00
Dmitriy Zaporozhets 4624e9e728 Merge branch 'spellcheck_false' into 'master' 
Add spellcheck=false to certain input fields

https://dev.gitlab.org/gitlab/gitlabhq/issues/2563

See merge request !1559
 2015-10-12 14:29:29 +00:00
Valery Sizov d805c5dbb3 Add spellcheck=false to certain input fields 2015-10-12 12:54:54 +03:00
Jerry LukinsandJerry Lukins 78de79d779 Persist filters when sorting on user admin page 2015-10-10 09:04:45 -04:00
Pavel Forkert 82eeb5e284 Remove stuff from previous UI 2015-09-24 16:38:52 +03:00
Pavel Forkert eb9528b8b9 Move login button to user page, switched to POST method 2015-09-24 16:34:04 +03:00
Pavel Forkert 83347954fc Add option to admin area to sign in as a specific user 
Closes #2291
 2015-09-24 16:14:16 +03:00
Hannes Rosenögger 3a4c5986fb clarify confirmation text on user deletion. 2015-09-21 22:05:13 +02:00
Valery Sizov e58e75aa88 Fix: User search feature in admin area does not respect filters 2015-08-13 17:51:20 +03:00
Stan Hu 0c1ccda43f Add "Confirm user" button in user admin page 
Closes #2116
Closes https://github.com/gitlabhq/gitlabhq/issues/9502
 2015-08-05 00:35:53 -07:00
Robert Speicher db8f4c0606 Add a button to Admin::Users#show to disable 2FA for that user 2015-07-10 17:18:33 -04:00
Stan Hu 3e738e3b9a Add support for unlocking users in admin settings 
Closes https://github.com/gitlabhq/gitlabhq/issues/9381
 2015-07-02 04:22:51 -07:00
Dmitriy Zaporozhets 8c6cbd4306 Merge branch 'master' into admin-edit-identities 2015-06-23 12:09:45 +02:00
Dmitriy Zaporozhets 1beb0dbe56 Fix admin identities code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-23 10:26:50 +02:00
Dmitriy Zaporozhets 73e003013f Merge branch 'master' into admin-edit-identities 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/admin/users/show.html.haml
 2015-06-22 18:00:11 +02:00
Dmitriy Zaporozhets 3fe3cbf222 Fix indendity test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 17:52:22 +02:00
Dmitriy Zaporozhets cc04c5b828 Refactor admin user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 17:12:20 +02:00
Robert Speicher 516b4c1248 Allow Admin to filter users by 2FA status 2015-06-19 16:35:53 -04:00
Robert Speicher 22dd2240a6 Add 2FA status to Admin::Users#show 2015-06-19 15:04:47 -04:00
Dmitriy Zaporozhets d059c69db7 Move identities list to own controller action 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 15:29:53 +02:00
Dmitriy Zaporozhets 228da2dd28 Admin can see and remove user identities 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 15:29:52 +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
Douwe Maan ae09c2a6db Capitalize "X" in "New X". 2015-04-30 21:33:02 +02:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Sullivan SENECHAL f28f5e49f6 Fix wrong placement of show-aside link 2015-04-27 00:43:02 +02:00
Douwe Maan 2a1d4255da Correctly render invite members without user. 2015-04-14 12:07:33 +02:00
Douwe Maan 99f995755e Use group_member instead of users_group or membership. 2015-03-15 13:49:41 +01:00
Dmitriy Zaporozhets 30ca451fd4 Refactor buttons 2015-03-14 00:29:32 -07:00
Dmitriy Zaporozhets de629b4835 Blocking user does not remove him/her from project/groups but show blocked label 2015-03-09 19:02:30 -07:00
Dmitriy Zaporozhets dd24c3d4b9 Improve user block/unblock UI in admin area 2015-03-09 13:02:06 -07:00
Dmitriy Zaporozhets be3edeb6a1 Small UI improvements after css refactoring 2015-03-07 10:35:17 -08:00
Dmitriy Zaporozhets f43c0429c2 Improve admin projects and users pages for mobile devices 2015-02-24 21:31:54 -08:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9 
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
 2015-02-14 11:09:23 -07:00
Dmitriy Zaporozhets bbca6a0abd Refactor sorting in project 2015-02-05 19:15:05 -08:00
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