home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
30,247 Commits 48 Branches 340 Tags
58bbf0e81ad32634e95f8bd8e7620b42657266d7
Commit Graph
41 Commits
Author SHA1 Message Date
Jacob SchatzandRobert Speicher 15160d973f Merge branch 'category-search-dropdown' into 'master' 
Show categorised search queries in the search autocomplete

Fixes #5885 

It works in 3 categories, Dashboard, Groups and Project.

## Dashboard context
![for-dashboard](/uploads/3a59f6ec008a972495597c8f2691c385/for-dashboard.png)

## Group context
![for-group](/uploads/f7aa413d56330a1d9b2e5562f95badf7/for-group.png)

## Project context
![for-project](/uploads/dabe04cf8758a056cf7b03da001ffd91/for-project.png)


## Screencast
![category-search-dropdown](/uploads/4d9513dcd6ccb6e24adefdf65f9bc778/category-search-dropdown.gif)



See merge request !4499
 2016-06-15 20:56:15 -04:00
Fatih AcetandJacob Schatz 415b032ba1 Prevent default disabled buttons and links. 2016-06-15 11:37:45 -04:00
Fatih Acet 13b32e74bc Fix project star tooltip on the fly. 
Introduced new util called updateTooltipTitle.
 2016-06-15 15:14:53 +03:00
Jacob Schatz dbc4f71868 Merge branch 'milestone-tooltip' into 'master' 
Add milestone expire date to the right sidebar

## What does this MR do?
Shows milestone expire date tooltip in the sidebar. It also shows the tooltip when sidebar is collapsed.

## Are there points in the code the reviewer needs to double check?
`common_utils.js.coffee` and `milestones_helper.rb` should be reviewed deeply.

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

## Screencast
![zngAcytBWq](/uploads/bd8514506aa5010aef9b081455ee90af/zngAcytBWq.gif)

See merge request !4448
 2016-06-09 22:10:51 +00:00
Alfredo Sumaran 6ae82d5707 Fix local timeago on user dashboard 2016-06-09 14:38:24 -05:00
Fatih Acet 329f6cb9b4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip 2016-06-08 18:48:20 +03:00
Fatih Acet 4f5ee68f09 Copy changes for milestone due dates. 2016-06-08 18:44:22 +03:00
Fatih Acet a18a586257 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip 2016-06-06 19:00:12 +03:00
Fatih AcetandZ.J. van de Weg 8dc1fa0d8d Updated MR notes. 2016-06-06 16:02:11 +02:00
Fatih Acet 91937d5b31 Added a new common util called $.timefor. 
It will use $.timeago behind the scene and it does the opposite of what $.timeago does.

$.timefor("Thu Jun 05 2016 23:40:39 GMT+0300 (EEST)") will return "3 days remaining".
 2016-06-03 00:00:48 +03:00
ZJ van de Weg cbd7801b3d Merge branch 'master' into awardables 2016-05-30 18:54:08 +02:00
Jacob Schatz 0cc060bc5f Merge branch 'issue-filter-name-options' into 'master' 
Issuable filtering improvements

This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests.

Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both. Fixes #4252 

Fixed issue with not being able to filter and sort issues without refreshing the page. Fixes #15269 

See merge request !3699
 2016-05-25 19:44:06 +00:00
ZJ van de Weg 7ae536002a Merge branch 'master' into awardables 2016-05-25 14:41:25 +02:00
Alfredo Sumaran ab96ca2bf1 Dropdown implementation 2016-05-20 15:58:36 -05:00
Phil Hughes fac08c3bcd Fixed up JS comments 2016-05-20 09:20:35 +01:00
Fatih Acet b40afae62c Add Gitlab namespace AwardEmoji. 2016-05-19 14:18:33 -05:00
Phil HughesandFatih Acet 0b45cf55dd Uses the same emoji-menu and just moves it around depending where it should be viewed 
# Conflicts:
#	app/assets/javascripts/awards_handler.coffee
#	app/assets/stylesheets/pages/notes.scss
#	app/helpers/issues_helper.rb
#	app/views/projects/notes/_note.html.haml
 2016-05-19 14:07:27 -05:00
Phil Hughes 832d7fa3ce Issuable filtering improvements 
This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests.

Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both.
 2016-05-16 10:29:47 +01:00
Zeger-Jan van de Weg 2bbe781d8b revert front end changes 2016-05-11 22:58:01 +02:00
Zeger-Jan van de Weg 7e6dcf9cd0 Merge branch 'master' into awardables 2016-05-11 08:47:04 +02:00
Arinde EniolaandZeger-Jan van de Weg 4eb16290e4 move frontend logic from previous MR to new MR 2016-05-06 10:47:12 +02:00
Arinde Eniola 5cefd8ab76 some refactoring 2016-04-19 17:22:55 +01:00
Arinde Eniola 259970ca1b abstract code for removing or getting a param query string from url 2016-04-16 23:30:31 +01:00
Jacob Schatz 6745e58f8f Fix issue with labels not showing initially. 2016-04-13 18:25:39 -04:00
Jacob Schatz 42e0625dfb Filter by multiple labels with little animation. 2016-04-13 16:10:49 -04:00
Jacob Schatz 20418dc7da Merge branch 'issue_14206' into 'master' 
Fix datetimes on tooltips

Closes #14206 

Updates tooltip datetimes on `.timeago()` instances. 

**Inline notes**

![Screen_Shot_2016-04-07_at_1.25.12_PM](/uploads/2f55390a7e91dabf75e71fe3bda91849/Screen_Shot_2016-04-07_at_1.25.12_PM.png)

**Existing and new notes**

![Screen_Shot_2016-04-07_at_1.24.49_PM](/uploads/202bb7476738eb048f2d94abb68174e7/Screen_Shot_2016-04-07_at_1.24.49_PM.png)


**Issuable dates**

![Screen_Shot_2016-04-07_at_1.24.32_PM](/uploads/80fd5cc3c06fade0b1c615bc7b7611a8/Screen_Shot_2016-04-07_at_1.24.32_PM.png)

**Build dates**

![Screen_Shot_2016-04-07_at_1.25.02_PM](/uploads/832f43284005ea610a3ad54a49b97104/Screen_Shot_2016-04-07_at_1.25.02_PM.png)

See merge request !3497
 2016-04-12 19:28:55 +00:00
Alfredo Sumaran 38a4f5cec6 Rename method and initialize .timeago inside 2016-04-11 16:45:03 -05:00
Phil Hughes 552cde76fa Hides notification after X amount of seconds 2016-04-11 17:20:47 +01:00
Alfredo Sumaran b19ccdeed4 Add datetime_utility.js.coffee 2016-04-07 12:00:19 -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
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
Jacob Schatz 6f48cb8609 Fix broken functionality in sidebar after merge. 
Added nice animations too.
 2016-03-25 09:48:12 -04:00
Phil Hughes 3d6573fd71 Updated to fix issues risen during feedback 
Correctly updates the on-screen CI text feedback
 2016-03-18 11:08:03 +00:00
Phil Hughes fcba255153 Commit SHA comes from JSON 
Removed page refresh - instead clicking takes to the builds tab
 2016-03-18 10:26:48 +00:00
Jacob SchatzandPhil Hughes 1a482bfbc2 Removes name from file 
Changes `:not_found` to `nil`
 2016-03-18 10:26:48 +00:00
Jacob SchatzandPhil Hughes e33e0de24d Checks if Notification API exists before requesting permission. 2016-03-18 10:26:48 +00:00
Jacob SchatzandPhil Hughes e9c5e31281 Add icon as a opt for notifier 2016-03-18 10:26:48 +00:00
Jacob SchatzandPhil Hughes f7e2109905 Adds notifications API to MR page. 
When a build status changes a notification will popup.
Fixes #10851
 2016-03-18 10:26:48 +00:00
Dmitriy Zaporozhets 4403f71f45 added sanitize and linkify functions. Moved some js to lib/ 2013-03-19 15:54:58 +02:00