home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,616 Commits 48 Branches 340 Tags
eaad236b452fe24969ec83e72f95e6a8fcf0c8a4
Commit Graph
1154 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 34edb3abe7 Merge branch 'feature/jschatz1/issuable-sidebar' into 'master' 
Implement new design for issue and merge request right sidebar

Fixes #3981 



See merge request !2645
 2016-02-04 18:01:29 +00:00
Jacob Schatz f25ba6e03c Resize sidebar on initial page refresh. 2016-02-04 08:50:25 -05:00
Jacob Schatz e0efdc4bf7 Make size changes based on screen resize. 2016-02-03 20:35:26 -05:00
Dmitriy Zaporozhets de6f2884ea Sort projects by last activity for project switcher in header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-03 23:27:00 +01:00
Jacob Schatz 1731f45e2b Merge branch 'attach-file-cursor-position' into 'master' 
Adds the markdown link at the cursor poisition

When writing a comment and then dropping an image it will correctly add the image markdown link at the cursor position

![drop-image-markdown](/uploads/52f41e38faca48c9ee01a02a75ec71be/drop-image-markdown.gif)

Tested in Chrome & Firefox and both working fine 👍 

Fixes #12822 

cc. @jschatz1 

See merge request !2648
 2016-02-03 19:56:45 +00:00
Jacob Schatz 599e554ad4 Sidebar works after sidebar ajax calls. 2016-02-02 19:42:19 -05:00
Jacob Schatz c4c919e59d Merge branch 'title-projects-dropdown' into 'master' 
Added dropdown to list all projects on project header

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4212

When clicking the current project name, it shows a dropdown menu with a list of all projects for that group or user.

When closed:

![Screen_Shot_2016-01-14_at_19.17.44](/uploads/a7258ba388dba238fc2f0468711fc729/Screen_Shot_2016-01-14_at_19.17.44.png)

When open:

![Screen_Shot_2016-01-14_at_19.17.51](/uploads/716533d9eb44b123c5fdff36a4740489/Screen_Shot_2016-01-14_at_19.17.51.png)


cc. @jschatz1

See merge request !2438
 2016-02-02 22:15:40 +00:00
Robert Speicher 933834c4a6 Allow manual resize of js-autosize textareas 
First, the autosize library was being too controlling and removed the
`resize` property from any elements to which it was attached, removing
the drag handle.

Second, we detect when the user manually resizes an autosize textarea,
and then remove the autosize behavior from it and increase its
max-height.

This should allow for the best of both worlds.

Closes #12832
 2016-02-01 17:00:03 -05:00
Phil Hughes 56b0c46bf6 added tests 2016-01-30 16:01:50 +00:00
Phil Hughes ad7ec74458 removed private method naming 2016-01-30 16:01:50 +00:00
Phil Hughes d34928ca58 remove period from function call 2016-01-30 16:01:49 +00:00
Phil Hughes a5267d0fbd selecting project in dropdown takes user to the correct project 2016-01-30 16:01:49 +00:00
Phil Hughes 81e7086fec uses AJAX to select the projects 2016-01-30 16:01:49 +00:00
Phil Hughes 76534e776e Keeps cursor at the correct place after changing text in dropzone 2016-01-29 15:55:31 +00:00
Phil Hughes 1b97872793 Auto-focus emoji award search field 
Closes #12621
 2016-01-29 12:15:58 +00:00
Phil Hughes fc334e72f4 Adds the markdown link at the cursor poisition 
When writing a comment and then dropping an image it will correctly add the image markdown link at the cursor position

Fixes #12822
 2016-01-29 10:28:05 +00:00
Jacob Schatz 9c2bd8b70e Sidebar collapse and expand work with whole page. 2016-01-28 18:26:47 -05:00
Dmitriy Zaporozhets 88e16c3d19 Merge branch 'issue_2406' into 'master' 
Show list of forks for a given Project

Closes #2406

See merge request !2376
 2016-01-28 16:58:38 +00:00
Dmitriy Zaporozhets 6748520de6 Merge branch 'feature/jschatz1/instant-issuable-history' into 'master' 
Adds feature: Ajax Close/Open updates discussion automatically

Triggers jQuery event <br/>
Fixes #5544

See merge request !2610
 2016-01-28 13:05:50 +00:00
Jacob Schatz f64e35069e Add js to expand and contract side menu 2016-01-27 23:47:37 -05:00
Jacob Schatz 087abdf7fd New right side gutter design. 
[WIP]
 2016-01-27 17:38:19 -05:00
Dmitriy Zaporozhets 4dea268215 Merge branch 'rs-require-jquery-ui' into 'master' 
Limit jquery-ui requires to what we actually use



See merge request !2274
 2016-01-27 19:14:20 +00:00
Jacob Schatz ed8256a28b Adds comment about event listener 2016-01-26 00:28:27 -05:00
Jacob Schatz 55e031a0d0 Adds feature: Ajax Close/Open updates discussion automatically 
Triggers jQuery event
Fixes #5544
 2016-01-26 00:25:41 -05:00
Jacob Schatz 28aa715811 Clicks the edit button instead of opening the dropdown 
Fixes #2307
 2016-01-25 22:38:15 -05:00
Robert Speicher 05697adb42 Limit jquery-ui requires to what we actually use 
This commit is a smoke test to run CI and see if we get back any JS
errors.
 2016-01-25 18:42:45 -08:00
Robert Speicher 68ad3180b3 Merge branch 'note-highlighting' into 'master' 
Highlight note code and edit preview

More highlighting fixes! Highlighting wasn't applied all the way for
code in notes, diff notes diffs and diff preview (on the file edit page).

The CSS changes further unify the styling for file-content highlighting,
diff highlighting and note code highlighting.

See merge request !2594
 2016-01-25 23:43:44 +00:00
Douwe Maan 40d2daed89 Highlight note code and edit preview 2016-01-25 11:42:47 +01:00
Jacob Schatz d3f24a2221 Adds base64 background search icon. 
All inputs of type `search` will have the gray background
and search icon centered.
Because the search magnifier is a bg image,
I had to hide it with `[value=""]`.
I added a little javascript to make sure each input always has it's
own value.
 2016-01-24 20:20:03 -05:00
Robert Speicher d668266306 Merge branch 'rs-no-minified-js' 
Don't vendor minified JS

Fixes #4031

See merge request !2494
 2016-01-23 17:45:39 -08:00
Dmitriy Zaporozhets 56b527093d Merge branch 'fix-comment-on-diff-ajax-loading' 2016-01-22 10:20:19 -08:00
Grzegorz Bizon 66b0927bb5 Move build artifacts javascripts into separate file 2016-01-21 15:51:44 +01:00
Rémy Coutable dfdf189135 Fix indentation of methods chaining in Coffee 
[ci skip]
 2016-01-20 23:24:13 +01:00
Rémy Coutable 8a829c9738 Merge remote-tracking branch 'origin/master' into fix-comment-on-diff-ajax-loading 2016-01-20 22:42:07 +01:00
Rémy Coutable 12da27090f Address some JS coding-style and HTML semantic issues 
- Replace 'rel' attributes with 'data' or 'id' attributes
- Style jQuery methods chaining according to Jacob's guidelines
- Rename a method
 2016-01-20 22:39:32 +01:00
Dmitriy Zaporozhets 7c01a91bb7 Merge branch 'awardemoji-tooltip-shows-people-multiple-times' into 'master' 
Fixes tooltip doesn't duplicate the "me" name.

Checks that "me" is not in the array of names in tooltip

![emojilist](/uploads/20b1a39cda194358f9730ec3c6b86acb/emojilist.gif)

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/7978


See merge request !2454
 2016-01-20 17:50:00 +00:00
Dmitriy Zaporozhets 5ad60c5dda Merge branch 'secret-shortcut-feature' into 'master' 
Adds "t" as a shortcut for find file anywhere



See merge request !2507
 2016-01-20 16:39:43 +00:00
Rubén Dávila f0b7dcba30 Add ability to filter by namespace. #2406 2016-01-20 00:14:58 -05:00
Douglas Barbosa Alexandre e9fb875588 Don't vendor minified fuzzaldrin-plus 
This version was compiled to use in the browser through Browserify.
More info or how to compile a new version:
https://gitlab.com/dbalexandre/fuzzaldrin-plus-browserify
 2016-01-20 01:25:22 -02:00
Douglas Barbosa Alexandre e202564a3a Don't vendor minified jQuery.nicescroll 2016-01-20 01:25:22 -02:00
Douglas Barbosa Alexandre f3c33b3303 Don't vendor minified g.bar.js 2016-01-20 01:25:22 -02:00
Douglas Barbosa Alexandre 37d3728dc5 Don't vendor minified g.raphael.js 2016-01-20 01:25:22 -02:00
Robert SpeicherandDouglas Barbosa Alexandre 2922dfce79 Don't vendor minified Chart.js 
The filename is titlecased because that's how it came from the vendor,
and we're not touching it.
 2016-01-20 01:25:22 -02:00
Jacob Schatz e5cbd5885a Fixes issue where other emoji (not thumbup/thumbdown) were not removed 2016-01-19 15:43:04 -05:00
Jacob Schatz 34564296d0 Adds t as a shortcut for find file anywhere 2016-01-19 14:25:27 -05:00
Rémy Coutable 491c2248c0 Fix diff comments loaded by AJAX to load comment with diff in discussion tab 
This commits also fixes two minor issues:
- Ensure notes that the current user is not allowed to see are not
  returned in the AJAX notes loading
- Ensure the notes counter badge is decremented of 1 instead of 2
 2016-01-19 18:22:01 +01:00
Phil Hughes 2821306a74 when starring a project it correctly increase the star count 
This is instead of increasing star & fork count

Fixed #11396
 2016-01-19 16:48:53 +00:00
Jacob Schatz c426a571db Fix the situation where the user has named themselves "me" 
Stopped looking for existing user since remove functionality is fixed.
 2016-01-18 19:27:59 -05:00
Jacob Schatz c298068c45 Fix underlying issue with emoji reactions 
Issue was: blank space was rendering
as a element in an array of authors.
Element was being used by `join`.
Original fix !2450 was trying to remove the space after it happened.
This checks properly for it and only moves forward if it does not exist.
Also removes "me" upon unchecking emoji.
 2016-01-18 15:40:48 -05:00
Jacob Schatz 419bff801b Removing initial ,. 2016-01-18 13:37:26 -05:00