home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
73 Commits
Author SHA1 Message Date
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
Jacob Schatz 509bc3fbe4 Sidebar collapse update issue 2016-03-30 07:26:34 -04:00
Alfredo Sumaran a41f5f59cb Merge branch 'master' into issue_3400_port 
# Conflicts:
#	app/assets/javascripts/gl_dropdown.js.coffee
 2016-03-29 10:48:39 -05:00
Phil Hughes 35b3c7096d Fixed multiselect 2016-03-29 12:17:22 +01:00
Phil Hughes 7ff6af19cc Dropdown bug fixes 
Added back upcoming to milestone filter
Fixed bug that would cause the currently selected value to disappear on filters
Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past
 2016-03-29 11:57:04 +01:00
Jacob Schatz 53a831124e Edit button leaves modal open 
Add user avatar to user selection
 2016-03-25 09:54:05 -04:00
Jacob Schatz 42389ea8d2 Fix features until tests pass. 
Milestones needed a none selector
Assignee needed unassign.
 2016-03-25 09:54:05 -04:00
Jacob Schatz 6f48cb8609 Fix broken functionality in sidebar after merge. 
Added nice animations too.
 2016-03-25 09:48:12 -04:00
Jacob Schatz 8c1e3c77cd Add multi select stay open functionality 2016-03-25 08:10:25 -04:00
Jacob Schatz 22aef62808 New dropdowns work on merge requests too! 2016-03-25 08:07:57 -04:00
Jacob Schatz d17b549935 Make remove multi and remove single work. 
Make add single and add multi work properly.
Multiple inputs for multiselect
 2016-03-25 08:07:57 -04:00
Jacob Schatz c81b261374 Fix bugs with select dropdown and multiselection 2016-03-25 08:07:57 -04:00
Jacob Schatz ed517c5ab7 Removes bugs with selection. 
Adds deselect still a WIP.
 2016-03-25 08:07:57 -04:00
Jacob Schatz 024dc8073e Add milestone sidebar update via JSON 2016-03-25 08:04:57 -04:00
Jacob Schatz 16ba5eb4d8 Updates sidebar milestone to use new dropdowns 2016-03-25 08:03:16 -04:00
Alfredo Sumaran 9d51f86694 Makes autocomplete dropdown look the same as others 2016-03-25 01:55:46 -05:00
Alfredo Sumaran 69166b226f Add separator as a line divider 2016-03-24 17:13:09 -05:00
Alfredo Sumaran 187f1c41aa Add param to skip enterCallback 2016-03-23 22:07:07 -05:00
Alfredo Sumaran d7350dea6a Make sure we are looking inside dropdpown wrapper 2016-03-23 19:45:00 -05:00
Alfredo Sumaran 98e2273030 Fix input reference 2016-03-23 19:44:24 -05:00
Alfredo Sumaran 8f2587c2ee Pass proper input element 2016-03-23 19:43:57 -05:00
Alfredo Sumaran 0dff7b4444 Merge branch 'master' into issue_3400_port 
# Conflicts:
#	app/assets/javascripts/gl_dropdown.js.coffee
 2016-03-23 18:49:49 -05:00
Phil Hughes fee01133ea Changed colour of no matching results bg 
Highlights first row when filtering
 2016-03-23 10:40:07 +00:00
Phil Hughes 8d147219cd Added clear button to dropdown filter 2016-03-23 10:37:33 +00:00
Alfredo Sumaran fb0d20c553 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_3400_port 2016-03-21 12:09:52 -05:00
Alfredo Sumaran 9008457a8d Save instance and avoid multiple instantiation 2016-03-18 21:43:26 -05:00
Alfredo Sumaran 3898bffd62 Code improvements 2016-03-18 17:35:26 -05:00
Alfredo SumaranandJacob Schatz cdd7e1855e Fixes failing spec 2016-03-18 14:06:51 -04:00