1187 Commits
Author SHA1 Message Date
Jacob SchatzandRobert Speicher 5c7de4358e Merge branch 'issue_15434' into 'master'
Fixes XSS injection

REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15434

**Without the fix**

![xss1](/uploads/0a7b0b15fb87066965a7c73f1dbaa815/xss1.gif)


**With the fix**

![xss2](/uploads/473cfa0aa80656f24c58aebf1fd97fff/xss2.gif)


See merge request !1952
2016-04-25 16:01:36 -04:00
Rémy Coutable f8e220b6ff Fix "Show all" link behavior
Fixes #14168
2016-03-10 15:32:17 +01:00
Rémy Coutable 1c3d8aaeef Merge branch 'shortcuts-help' into 'master'
Fix help keyboard shortcut for relative URL setups

Fixes gitlab-org/gitlab-ce#12751

See merge request !3016
2016-03-02 10:46:52 +01:00
Jacob SchatzandRémy Coutable b0864a9f5d Merge branch 'feature/jschatz1/sidebar-sizing' into 'master'
Sidebar overlaps content when screen is below 1200px.

When screen is below 1200px, the sidebar overlaps.
When screen is above 1200px, the sidebar pushes content out.
z-index change to make sure hamburger stays on top.
Fixes #12717
![screensize](/uploads/9a21fa06d583a49d6ebbf1ada34c6792/screensize.gif)

![screensize-small](/uploads/7c25f46e962248a40840562a01c83f8f/screensize-small.gif)

Also sorry I couldn't get the collapse button in the screen cap. It's there.

See merge request !2620
2016-02-26 16:46:27 +01:00
Rémy Coutable c89ee575bd Merge branch 'bugfix/jschatz1/missing-project-button' into 'master'
Fix group projects styles

Makes new project button visible when no projects are available.
Fixes #13193

![Screen_Shot_2016-02-04_at_1.08.27_PM](/uploads/36be9d5892506e7d1abcf4eb2a622e12/Screen_Shot_2016-02-04_at_1.08.27_PM.png)

![Screen_Shot_2016-02-04_at_1.07.48_PM](/uploads/fa257a1965017ff1274572dc66fccf90/Screen_Shot_2016-02-04_at_1.07.48_PM.png)

![Screen_Shot_2016-02-04_at_1.07.28_PM](/uploads/326f6fdac24b56e8408efd0d11dc2805/Screen_Shot_2016-02-04_at_1.07.28_PM.png)

cc @creamzy @skyruler

See merge request !2714
2016-02-24 12:03:09 +01:00
Jacob SchatzandRémy Coutable dd94a4f780 Merge branch 'dz-small-ui-fixes' into 'master'
Set of UI fixes

* Improve wiki pages
* Improve profile pages

cc @skyruler

See merge request !2758
2016-02-23 16:53:26 +01:00
Jacob SchatzandRémy Coutable 1f368f2bc3 Merge branch 'milestone-drag-empty-list' into 'master'
Issues can be dragged & dropped into empty milestone lists

This is also possible with MRs. Also fixed an issue where MRs weren't sortable

Fixes #13668

![milestone](/uploads/aada0f48ce8b1407cce920eef3f4d5f3/milestone.gif)

See merge request !2935
2016-02-23 14:08:29 +01:00
Jacob SchatzandRémy Coutable 29ad1cedef Merge branch 'issue_13463' into 'master'
Fix Side-by-side view after loading diff results

Fixes #13463

See merge request !2880
2016-02-23 11:29:18 +01:00
Jacob SchatzandRémy Coutable 610a4f918c Merge branch 'issue_3276' into 'master'
Labels should be visible in milestone view

Closes #3276 

See merge request !2599
2016-02-19 20:56:00 +01:00
Dmitriy ZaporozhetsandRémy Coutable 7655891972 Merge branch 'bugfix/jschatz1/sidebar-fixes/02-18-16' into 'master'
Uses cross browser niceScroll to do scrolling on sidebar.

Fixes: #13544 

Firefox does not support `-webkit-scrollbar` and there is no alternative for FF. So for example Gmail falls back to no fancy scrollbar. Stuck with jQuery, which is a good solution, since we already use it. 

This also leaves the default scrollbar as is. 

![Screen_Shot_2016-02-18_at_11.02.26_AM](/uploads/1184f06b71a8d9097ef1e3450a0c0ab3/Screen_Shot_2016-02-18_at_11.02.26_AM.png)

Also fixes horz scroll issue: 

![Screen_Shot_2016-02-18_at_11.09.56_AM](/uploads/63e9a8e824cac69a2745dd4dd84d1dfb/Screen_Shot_2016-02-18_at_11.09.56_AM.png)

cc @creamzy @dzaporozhets 

See merge request !2873
2016-02-18 17:57:06 +01:00
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