home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
30,223 Commits 48 Branches 340 Tags
ac7cea308467709413f7a67b9e95fd0a0e2dcafe
Commit Graph
100 Commits
Author SHA1 Message Date
Jacob SchatzandRobert Speicher bb5eec45fc Merge branch '18536_status_dropdown_label' into 'master' 
Set button label when picking an option from status dropdown

## What does this MR do?
Fixes an issue with the status dropdown. It was not setting up the correct label after picking an option

## What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18536

## Screenshots (if relevant)

**Previous**

![status-select-previous](/uploads/7c6adbd6c5ba2660dc39a762d53d3b68/status-select-previous.gif)

**After**

![status-select](/uploads/91483efed8fbd63a79a01c9ca2154b74/status-select.gif)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- [ ] Tests
  - [ ] Added for this feature/bug
  - [x] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4771
 2016-06-23 22:10:07 +00:00
Jacob SchatzandRobert Speicher 3f75371956 Merge branch 'ref-dropdown-jquery-objects' into 'master' 
Use jQuery objects in ref dropdown

## What does this MR do?

Keeps the behaviour the same as the ref dropdown, however it now uses jQuery objects to handle the HTML creation instead of passing strings around. It pretty much worked out the box so not much was changed in the dropdowns themselves. Will be easy to transfer this over to other dropdown menus as well.

cc. @jschatz1 @rspeicher @DouweM 

Do we want this to go into a patch release?

See merge request !4850
 2016-06-23 22:08:52 +00:00
Jacob SchatzandRobert Speicher 16b4218791 Merge branch 'async-refs-dropdown' into 'master' 
Refs dropdown is now loaded async

## What does this MR do?

The refs dropdown is loaded async so not to block the page.

## What are the relevant issue numbers?

Part of #18202

## Screenshots (if relevant)

![Screen_Shot_2016-06-07_at_14.41.21](/uploads/8fea12655f96fe7f7008a32677bff037/Screen_Shot_2016-06-07_at_14.41.21.png)

See merge request !4508
 2016-06-21 11:51:23 -04:00
Jacob SchatzandRobert Speicher 13fa884ee4 Merge branch '18714_bulk_assign_labels_icon' into 'master' 
Fixes item icon state when for issues that have the same labels assigned

## What does this MR do?
Previously if all issues had the same labels the dropdown was showing the labels with indeterminate stated which is wrong. This MR fixes that and shows the correct state.

## What are the relevant issue numbers?
Fixes #18714

## Screenshots (if relevant)

**Before**

![label-before](/uploads/c65aa051e773dfea898a0d19767d6ade/label-before.gif)

**After**

![label](/uploads/73fd657d104d1081e189e0a9547d483b/label.gif)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- [ ] Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4721
 2016-06-20 12:02:02 -04:00
Phil Hughes d3ff691d76 Fixed issue with dropdown toggle not updating 
Added tests
 2016-06-08 11:45:17 +01:00
Alfredo Sumaran 22b8b9a7f3 Address feedback 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 5ea0165175 Enhancements 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 0be26a47f2 Do not trigger keyup event if we are persisting state 
Triggering keyup will re-render the dropdown which is not needed when option persistWhenHide is true
 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 9df4da4bc0 Remove unneeded call to keyup event 
This was re-rendering the dropdown unnecessarily
 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 5d7445198f Only filter asynchronously if option remote is true. 
We need to update the results right away when we do bulk assignment.
 2016-06-03 17:14:23 -05:00
Alfredo Sumaran d8aaf018ac Handle unchecking of indeterminate items 2016-06-03 17:11:41 -05:00
Alfredo Sumaran 6974d970b4 typo 2016-06-03 17:10:20 -05:00
Alfredo Sumaran 4ab6bfcef5 Set indeterminated items 2016-06-03 17:10:20 -05:00
Phil HughesandJacob Schatz 317cfcbd4d Fixed issue with search autocomplete not allow arrow key navigation 
Closes #15649
 2016-06-03 12:48:49 -04:00
Jacob Schatz 98b1daf32d Merge branch 'dropdown-enter-select' into 'master' 
Fixed issue with enter key selecting wrong option in dropdown

If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0

![labels](/uploads/eb29924109947fd63fea32e21471f05a/labels.gif)

Closes #17630

See merge request !4210
 2016-05-21 00:11:18 +00:00
Alfredo Sumaran ab96ca2bf1 Dropdown implementation 2016-05-20 15:58:36 -05:00
Alfredo Sumaran 1f5fcb638d Dropdown implementation 2016-05-20 15:58:36 -05:00
Phil Hughes 9f60a2eda2 Fixed issue with enter key selecting wrong option in dropdown 
If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0

Closes #17630
 2016-05-20 08:50:42 +01:00
Phil Hughes df0cdc8cb4 Escape key closes the dropdown 
Fixes #15432
 2016-04-26 09:06:22 +01:00
Alfredo Sumaran 7e0ef892f4 Merge remote-tracking branch 'origin/master' into label-dropdown-fix 2016-04-20 17:10:10 -05:00
Jacob Schatz 692c35e6f4 Merge branch 'multi-filter-labels' into 'master' 
Mutliple label filter

Fixes #989 

See merge request !3438
 2016-04-20 19:18:32 +00:00
Alfredo Sumaran 7b6fe0e259 Merge remote-tracking branch 'origin/master' into label-dropdown-fix 
# Conflicts:
#	app/views/shared/issuable/_sidebar.html.haml
 2016-04-20 11:40:55 -05:00
Phil Hughes 439a72803b Any label & no label out weigh other labels - these two will clear previously selected labels 
Fixed issue with no label not working correctly
 2016-04-20 17:23:10 +01:00
Phil Hughes d1b2e7b440 Trigger filtering after ajax is complete in dropdown 
Closes #15186
 2016-04-19 10:26:07 +01:00
Alfredo Sumaran 5c7181b514 Add is-link attribute to know if a menu item should not be stopped 2016-04-18 14:37:18 -05:00
Phil Hughes ea71145418 Fixed issue with multi select not working with arrow keys 2016-04-18 16:45:49 +01:00
Alfredo Sumaran 0556d661e0 Fix Label dropdown and organize code 
# Conflicts:
#	app/assets/javascripts/labels_select.js.coffee
 2016-04-15 12:24:15 -05:00
Phil HughesandJacob Schatz dca50ac1d4 Project dropdown in header uses new dropdown 2016-04-12 13:10:43 -04:00
Jacob Schatz 69a8bf367c Merge branch 'mr-ui-update' into 'master' 
Updated UI for new merge request

Closes #2540 

![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png)

![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png)

See merge request !3228
 2016-04-11 11:25:40 +00:00
Phil Hughes 643fe43d78 Addressed feedback 
Removed important from css
 2016-04-11 09:43:59 +01:00
Jacob Schatz b6d5fcd477 Merge branch 'issue_14800' into 'master' 
Search Design fixes

Closes #14800 

- Use colors according to design
- Fix width of search input


![Screen_Shot_2016-04-05_at_11.12.33_AM](/uploads/83681ccd90a1a1542c056fd6dbc974d0/Screen_Shot_2016-04-05_at_11.12.33_AM.png)

![Screen_Shot_2016-04-05_at_11.11.54_AM](/uploads/f7557bea2ae055f3550b89751fd7d371/Screen_Shot_2016-04-05_at_11.11.54_AM.png)

See merge request !3475
 2016-04-06 21:26:56 +00:00
Phil Hughes beab104da8 Filters by text on element 2016-04-06 11:08:40 +01:00
Phil Hughes b310058998 Use new dropdowns for MR compare 2016-04-06 11:08:40 +01:00
Phil Hughes d6f276eacf Fixed issue with enter key not selecting correct value in dropdown 2016-04-06 10:05:39 +01:00
Alfredo Sumaran 7baebd3220 Do not create input if fieldName is not defined 2016-04-05 19:18:34 -05:00
Jacob Schatz a1c794c591 Merge branch 'dropdown-arrow-support' into 'master' 
Dropdown arrow support

When the dropdown is open, you can scroll through the list of items with the up & down arrow keys. When an item is focused, the enter triggers the click event for that row.

Closes #14455

See merge request !3385
 2016-04-05 19:41:22 +00:00
Phil Hughes 8e3f5ebaa0 CS multiline 2016-04-05 09:07:40 +01:00
Alfredo Sumaran 51b8b8711b Merge branch 'master' into issue_14800 
# Conflicts:
#	app/assets/stylesheets/framework/variables.scss
 2016-04-04 20:06:29 -05:00
Rémy Coutable de1c81645c Merge branch 'filter-dropdown-bug' into 'master' 
Fixes issue with dropdowns not selecting values

Fixes issue with dropdowns not selecting when navigating between tabs

Closes #14813

See merge request !3478
 2016-04-01 08:49:27 +00:00
Alfredo Sumaran ab42560ea6 Return selected object if toggleLabel option is not defined 2016-03-31 19:28:41 -05:00
Alfredo Sumaran ff676333d0 Add current element and event as params to clicked callback 2016-03-31 19:28:17 -05:00
Alfredo Sumaran e3a9830507 Skip default behaviour if we are clicking a result for the same location 2016-03-31 15:29:14 -05:00
Phil Hughes cc79eedb85 Fixes issue with dropdowns not selecting values 
Fixes issue with dropdowns not selecting when navigating between tabs

Closes #14813
 2016-03-31 20:19:59 +01:00
Phil Hughes f76066b9fb Fixed issue based on feedback 2016-03-31 16:26:11 +01:00
Phil Hughes a103fcb7cb Moved back some css classes 2016-03-31 16:25:41 +01:00
Phil Hughes 29872c3905 Enter triggers the currently highlighted element click 2016-03-31 16:25:41 +01:00
Phil Hughes 858eee9ee8 Correctly scrolls the dropdown up & down with arrow keys 2016-03-31 16:24:33 +01:00
Phil Hughes b244317a38 Scrolls the dropdown content down 2016-03-31 16:24:33 +01:00
Phil Hughes 0e290a8401 Started arrow key movement on dropdowns 2016-03-31 16:24:33 +01:00
Jacob Schatz 403b7fe11a Merge branch 'issue_3400_port' into 'master' 
Location aware search

Closes #3400 #14217

Introduces suggestion grouping on the search box and adds the ability to the user to remove the location to search on.


**Notes**
- Suggestions are now grouped by category.
- Suggestions are displayed when no location is set.
  - Would be great to provide suggestions for the specified location which could be a project or group.
- A location is set from the server for projects/groups related urls.

**Default Apparence**

![](/uploads/9fad1a354fb0e4b13cfd36698c061ab4/default.gif)

**When location badge is present**

![](/uploads/ddc6379f407061e188f9f4a7a9a8c9b8/location-badge.gif)

**Suggestions**

![suggestions](/uploads/2df288e00ad496b31a1a2efc2a4a9f6d/suggestions.gif)

**Suggestions when location badge is present**

![](/uploads/f6ef09d3aed124179ab4e228b848486e/location-present-suggestions.gif)

Closes #3400 

See merge request !3212
 2016-03-31 11:33:17 +00:00