home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,403 Commits 48 Branches 340 Tags
b2c641de219d3aba8f1fce758b2f05ca8233e2d6
Commit Graph
1214 Commits
Author SHA1 Message Date
Marin Jankovski b2c641de21 Fix syntax error in autosave coffeescript. 2016-02-26 13:22:35 +01:00
Jacob Schatz 856153d712 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-24 23:09:29 +00:00
Alfredo Sumaran ccabbaa9b3 Wait until listeners are set before triggering a 'click' event 2016-02-24 15:53:39 -05:00
Alfredo Sumaran 4d23af7507 Move script inside of MergeRequestTabs class 2016-02-24 15:39:56 -05:00
Alfredo Sumaran a4e522a889 Merge branch 'master' into minimize-on-diff 2016-02-24 14:06:55 -05:00
Jacob Schatz 89fc80beb5 Merge branch 'activity-tabs-single-select' into 'master' 
Treats activity tabs as single select

Fixes #8092

![activity-tabs](/uploads/1fb4d9233492252cfd93c74579e97514/activity-tabs.gif)

See merge request !2940
 2016-02-24 11:49:47 +00:00
Rémy Coutable d74cfe7db3 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 

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

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

# AFTER (no projects)
![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 10:58:05 +00:00
Phil Hughes 74d87db977 changed bind to on for activity link click event 2016-02-24 08:28:33 +00:00
Phil Hughes 30b56fb017 Treats activity tabs as single select 
Fixes #8092
 2016-02-24 08:28:33 +00:00
Robert Speicher dba47f680d Merge branch 'issue_13301_emoji-menu' into 'master' 
Load award emoji picker with ajax request

Fixes #13301.

See merge request !2888
 2016-02-24 02:50:45 +00:00
Alfredo Sumaran 798c220037 Initialize navigation shortcuts on project's files page 2016-02-23 20:17:16 -05:00
Alfredo Sumaran be0f97a6d4 Initialize navigation shortcuts on project's files page 2016-02-23 20:04:20 -05:00
Alfredo Sumaran a3713050f7 Ability to toggle sidebar on smaller screens 2016-02-23 15:28:21 -05:00
Alfredo Sumaran 13047483b3 Update scrollbars after toggle sidebar 2016-02-23 15:12:59 -05:00
Alfredo Sumaran 8129d1675f Add "e" shortcut to edit issuable 2016-02-23 11:28:23 -05:00
Jacob Schatz 1142b327e8 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 15:38:20 +00:00
Jacob Schatz 6263a3ca3c Merge branch 'files-view-row-click' into 'master' 
Fixes issue with file view rows not clickable on project main view

Fixed an issue where it would only load the first 25 commit data on project main view.

Stopped the file view sending 1 too many requests.

Fixes #3916

See merge request !2933
 2016-02-23 14:52:21 +00:00
Phil Hughes 01b965f6da Correctly checks if tree view is on screen 2016-02-23 13:41:03 +00:00
Phil Hughes 4eb67cdf42 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
 2016-02-23 10:44:27 +00:00
Phil Hughes d80205b755 Fixes issue with file view rows not clickable on project main view 
Fixed an issue where it would only load the first 25 commit data on project main view
Stopped the file view sending 1 too many requests

Fixes #3916
 2016-02-23 09:06:26 +00:00
Annabel Dunstone 7bb378b33d Create EmojisController 2016-02-22 20:16:00 -06:00
Jacob Schatz 54a5b8831a Merge branch 'blame-line-link' into 'master' 
Added line links to blame table

Closes #4119

See merge request !2915
 2016-02-22 20:29:38 +00:00
Jacob Schatz 5803a5308f Merge branch 'issue_13463' into 'master' 
Fix Side-by-side view after loading diff results

Fixes #13463

See merge request !2880
 2016-02-22 14:35:06 +00:00
Phil Hughes fbc578a7ec Added line links to blame table 
Closes #4119
 2016-02-22 14:09:13 +00:00
Alfredo Sumaran cd569a66ef Update button selector 2016-02-19 20:01:30 -05:00
Alfredo Sumaran 9a60bd54a5 Change method name for consistency 2016-02-19 16:34:20 -05:00
Alfredo Sumaran 27a0310f23 Make diff view name getter less error prone 2016-02-19 16:32:29 -05:00
Jacob Schatz de84fa365e Merge branch 'issue_3276' into 'master' 
Labels should be visible in milestone view

Closes #3276 

See merge request !2599
 2016-02-19 19:44:13 +00:00
Alfredo Sumaran ebceae3ead Add comment 2016-02-19 12:55:13 -05:00
Annabel Dunstone b80df08735 Add timeout for ajax call in award emoji steps; update focus in award picker 2016-02-19 07:32:20 -06:00
Annabel Dunstone 074fa8f2b9 Load award emoji picker with ajax request 2016-02-18 22:02:22 -06:00
Alfredo Sumaran 8dc78c6685 Expand view container if diff mode is set to paralells 2016-02-18 16:15:50 -05:00
Jacob Schatz 71795b9ae8 Uses cross browser niceScroll to do scrolling on sidebar. 2016-02-18 10:55:30 -05:00
Jacob Schatz 9f0a71f4fe Shrink on diff view 
Shrinks when navigating to diff view.
Shrinks when refreshing on diff view.
Expandable at anytime.
 2016-02-17 10:44:43 -05:00
Jacob SchatzandAlfredo Sumaran c37e5bc69d 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
 2016-02-16 12:27:45 -05: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
Dmitriy Zaporozhets 997a317b4c Set of small improvements to wiki frontend 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-07 17:57:28 +01: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