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
23,875 Commits 48 Branches 340 Tags
24fa458615f4c77eedd8176f905d51a2df87515a
Commit Graph
1177 Commits
Author SHA1 Message Date
Stan Hu 7ffcc5a17b Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji 
Steps to reproduce:

1. Go to a MR or issue
2. Click on "thumbsup" Emoji 3 times
3. Observe the tooltip becomes "me, me"

Closes #13374, #12788
 2016-02-13 02:02:05 -08:00
Dmitriy Zaporozhets 22808a2221 Merge branch 'fix-explore-filter' into 'master' 
Add ajax filtering to all paged project lists. Fixes #13182



See merge request !2728
 2016-02-10 08:31:36 +00:00
Josh Frye cf8a74be5f Cleanup to use one selector 2016-02-09 20:21:47 -05:00
Josh Frye 929b53c6f2 More specific selectors 2016-02-09 18:01:32 -05:00
Robert Speicher 94feb4da9d Merge branch 'fix-logo-rasterization' into 'master' 
Prevent rasterization artifacts in the logo, and simplify markup.

 - Remove sketch-namespaced attributes.
 - Remove unused groups, and cancel out unnecessary transforms.
 - Use overlap to avoid rasterization artifacts in the logo.
 - Remove viewBox parameter and define paths in their final form.

See merge request !2741
 2016-02-09 21:07:54 +00:00
Josh Frye 120dca0f35 MR feedback 2016-02-09 10:10:41 -05:00
Josh Frye 30e022a2fe Starred, All, and Trending on explore are paged also group projects. Need ajax filter. 2016-02-09 10:10:41 -05:00
Josh Frye 0dc64a8ce1 JS Fixes 2016-02-09 10:10:41 -05:00
Josh Frye dd1a683c64 Fix explore filter. Fixes #13182 2016-02-09 10:10:41 -05:00
Aaron Hamilton 9eba0eaac3 Prevent rasterization artefacts in the logo, and simplify markup. 
- Remove sketch-namespaced attributes.
 - Remove unused groups, and cancel out unnecessary transforms.
 - Use overlap to avoid rasterization artefacts in the logo.
 - Extend comment for `#logo` click event handler, as it's a non-obvious hack for Safari.
 - Remove viewBox parameter and define paths in their final form.
 2016-02-08 04:25:50 +00:00
Robert Speicher 89b3ddd609 Allow limited Markdown in Broadcast Messages 
Closes #11853
 2016-02-06 14:30:07 -05:00
Dmitriy Zaporozhets 26f3cc41fc Merge branch 'feature/jschatz1/sidebar-features' into 'master' 
Feature/jschatz1/sidebar features

* Changes sidebar width (290px).
* Makes shortcuts for <kbd>j</kbd> and <kbd>k</kbd> keys for next and previous issues.

![Screen_Shot_2016-02-05_at_3.06.22_PM](/uploads/8590be43dc1b9feffd4f32b4e8cb7790/Screen_Shot_2016-02-05_at_3.06.22_PM.png)

cc/ @dzaporozhets 

See merge request !2734
 2016-02-05 20:57:45 +00:00
Robert Speicher ec55d89cf8 Merge branch 'rrott/gitlab-ce-logo-issue-11867' into 'master' 
Fixes for issue with poor logo transition animation on Safari

See merge request !2690
 2016-02-05 15:12:56 -05:00
Roman RottandRobert Speicher 9cc321ca17 fixed issue with poor logo transition animation on safari 
updates after code review: moved coffee code to appropriate file, updated css to not use js-prefixed selectors

Updated comments and Changelog

Removed duplicate line in changelog
 2016-02-05 15:11:46 -05:00
Jacob Schatz 4a878e1dfa Add j and k shortcuts 2016-02-05 14:40:50 -05:00
Jacob Schatz 2e8fe0bdb2 Add JS style changes. 
Thanks @rspeicher
 2016-02-05 11:31:13 -05:00
Jacob Schatz 80812a5d46 Edited time ago location change. 
Change edited icon to word.
Change edited text color to gray
cc/ @creamzy
 2016-02-05 11:31:13 -05:00
Dmitriy Zaporozhets 9bf85c01a9 Merge branch 'paginate-dashboard-projects' into 'master' 
Page project list on dashboard



See merge request !2689
 2016-02-05 15:02:47 +00:00
Josh Frye f1102b3373 Frontend changes from MR feedback 2016-02-05 09:05:52 -05:00
Josh Frye 74a4ff6143 Remove js line 2016-02-04 13:24:43 -05:00
Josh Frye 2ad094132d Various filter fixes 2016-02-04 13:03:41 -05:00
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
Josh Frye 2c871ca196 Delay filter until user stops typing 2016-02-04 11:40:19 -05:00
Josh Frye 7522ac0b3c Paginate + ajax filter dashboard projects 2016-02-04 11:40:19 -05: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