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,414 Commits 48 Branches 340 Tags
ca823065a905f8c19b2003a67e79831ba1ceff2e
Commit Graph
1564 Commits
Author SHA1 Message Date
Annabel Dunstone f9014e4ec6 Use meta key to open todo in new tab 2016-04-08 09:46:32 -07:00
Jacob Schatz f2b7cd4435 Revert "Merge branch 'new-navigation-prototype' into 'master'" 
This reverts merge request !3494
 2016-04-07 21:20:16 +00:00
Jacob Schatz b471c76bcb Reset MR opts 2016-04-06 21:46:12 -04: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
Alfredo Sumaran d1ad639010 Do not fire blur event when clicking a suggestion 2016-04-06 14:28:15 -05:00
Jacob Schatz 452d1d4a8c Merge branch 'dropdown-enter-select-fix' into 'master' 
Fixed issue with enter key not selecting correct value in dropdown



See merge request !3563
 2016-04-06 19:16:23 +00:00
Alfredo Sumaran 5f4ce722c0 Display clear button only if input has a value 2016-04-06 13:55:49 -05:00
Alfredo Sumaran ee87d15cf4 Change approach, do not use timeouts 2016-04-06 13:23:18 -05:00
Jacob Schatz 77e178b5e1 Merge branch 'fix_missing_filters_on_status_tab_change' into 'master' 
Fix missing filters on status tab when user swithches to another state

closes #14769 

![fixi](/uploads/7733ec714b70b2157104af4b039953c3/fixi.gif)

See merge request !3482
 2016-04-06 17:21:25 +00: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 2446f853bd Merge branch 'close-issue-bug' into 'master' 
Fix data check in update issue response



See merge request !3548
 2016-04-05 20:48:00 +00: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
Jacob Schatz 4258589d95 Merge branch 'note-form-design' into 'master' 
Notes form design update

Part of #3401

See merge request !3442
 2016-04-05 19:34:16 +00:00
Annabel Dunstone 33faf219aa Fix data check in update issue response 2016-04-05 11:43:30 -07: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
Jacob Schatz 2fb0ef51d6 Merge branch 'fix-award-emoji-menu' into 'master' 
Fix award emoji picker for relative_url

MR !2888 caused a regression where the emoji picker does not load when
using relative_url, because the path for the controller was hardcoded.

See merge request !3493
 2016-04-04 19:47:15 +00:00
Phil Hughes f62d7d261b Removed console.log from notes 2016-04-04 10:49:08 +01:00
Phil Hughes 1f50833430 Updated tests 2016-04-04 10:48:49 +01:00
Phil Hughes 3b4c4dd7b3 Logged out box 2016-04-04 10:48:49 +01:00
Phil Hughes 0581df2971 Discussion form 2016-04-04 10:48:49 +01:00
Phil Hughes f0d2f370cc Removed css code that isnt used 2016-04-04 10:48:49 +01:00
Phil Hughes af3284d98b Focus style for comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 3c2b0e7572 Added toolbar to comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 0331fa3f3d Restyling on elements in comment form 2016-04-04 10:48:49 +01:00
Phil Hughes b7f0b22b9f Started refactoring of note form 2016-04-04 10:48:49 +01:00
Douwe Maan fee7ad8627 Merge branch 'build-updates' into 'master' 
Build updates

Fixes #10851 

![build-updates](/uploads/52e09e679ca457f3d818f9a12fd8382b/build-updates.gif)


See merge request !2604
 2016-04-03 13:22:27 +00:00
Arinde Eniola db8836ca84 attach the utitlity function to the global scope with some changes 2016-04-02 16:58:35 +01:00
Arinde Eniola 261c8e765f fix missing filters on status tab when user swithches to another state 2016-04-02 16:58:35 +01:00
Dmitriy Zaporozhets 03f2dd90ec Hide sidebar completely when collapsed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 19:32:39 +02:00
Sandra Freihofer bb2214bd64 Fix award emoji picker for relative_url 
MR !2888 caused a regression where the emoji picker does not load when
using relative_url, because the path for the controller was hardcoded.
 2016-04-01 16:20:29 +02: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 824fecb728 Bring back search context when chosing the same project/group 2016-03-31 19:31:01 -05: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
Annabel Dunstone f79687ea97 Clear .todo listener 2016-03-30 12:28:57 -05:00
Annabel Dunstone 0591a7820b Change window.location to use turbolinks 2016-03-30 12:28:57 -05:00
Annabel Dunstone 51031a68f7 Make entire todo row clickable 2016-03-30 12:28:57 -05:00
Jacob Schatz b4ce4e6f06 Remove console logs 2016-03-30 07:26:34 -04:00
Jacob Schatz a121ee51bf Off the event initially 2016-03-30 07:26:34 -04:00