home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
31,704 Commits 48 Branches 340 Tags
6ce25e7b4caa9e94de74378729178c7060d640b2
Commit Graph
58 Commits
Author SHA1 Message Date
Phil Hughes bf5d28ea8d Fixed markdown buttons in FF 2016-07-05 11:54:49 +01:00
Phil Hughes 4678e22b5f Markdown toolbar inserts code blocks 
Closes #19173
 2016-06-27 16:12:03 +01:00
Connor Shea 4cca9a3e0f Reorganize the lib directory. 2016-06-23 10:55:40 -06:00
Connor Shea 7ce0968a52 Re-implement page-specific JS in a better way. 
This makes larger libraries more cacheable and will allow us to use SRI with the dynamically included libraries.
 2016-06-23 10:33:38 -06:00
Phil Hughes 4140c4622f Made markdown buttons work on all markdown textareas 
Selecting multiple rows & a list correctly creates the selected text into a list
 2016-06-17 11:52:22 +01:00
Phil Hughes d5b331b76b Improved design 
Updated JS to remove undo manager - instead let the browser handle it all
 2016-06-17 11:52:22 +01:00
Jacob SchatzandPhil Hughes 7717cb727f Move buttons to upper right. 2016-06-17 11:52:22 +01:00
Jacob SchatzandPhil Hughes 5eeccafca4 Proper class jquery selector for off. 2016-06-17 11:52:22 +01:00
Jacob SchatzandPhil Hughes 1c3da0f72e No need to add bold for the class selector for removing events 2016-06-17 11:52:22 +01:00
Jacob SchatzandPhil Hughes 118a42ce7f Remove console.log 2016-06-17 11:52:22 +01:00
Jacob SchatzandPhil Hughes 4ba2632c81 Add undo history once they click the enter or backspace key 2016-06-17 11:52:22 +01:00
Jacob SchatzandPhil Hughes ad1d55eb9c Add redo state 2016-06-17 11:52:22 +01:00
Jacob SchatzandPhil Hughes 3e7770aae1 Overwrite undo history 2016-06-17 11:52:22 +01:00
Jacob SchatzandPhil Hughes 0fd56975ea Initial markdown ez buttons 2016-06-17 11:52:22 +01:00
Fatih Acet fe125f8dc9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown 
# Conflicts:
#	app/assets/javascripts/lib/common_utils.js.coffee
 2016-06-16 02:04:09 +03: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
Fatih Acet d9e3a6a068 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown 
# Conflicts:
#	app/assets/javascripts/lib/common_utils.js.coffee
 2016-06-10 01:36:54 +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 7df512d5a2 Add new utils. 2016-06-09 04:21:50 +03: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 b13f6fa99d Added a common util to get project slug. 2016-06-07 04:10:47 +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