summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into minimize-on-diffAlfredo Sumaran2016-02-248-18/+64
|\
| * Merge branch 'activity-tabs-single-select' into 'master' Jacob Schatz2016-02-241-13/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Treats activity tabs as single select Fixes #8092 ![activity-tabs](/uploads/1fb4d9233492252cfd93c74579e97514/activity-tabs.gif) See merge request !2940
| | * changed bind to on for activity link click eventactivity-tabs-single-selectPhil Hughes2016-02-241-1/+1
| | |
| | * Treats activity tabs as single selectPhil Hughes2016-02-241-13/+5
| | | | | | | | | | | | Fixes #8092
| * | Merge branch 'bugfix/jschatz1/missing-project-button' into 'master' Rémy Coutable2016-02-241-0/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Initialize navigation shortcuts on project's files pagebugfix/jschatz1/missing-project-buttonAlfredo Sumaran2016-02-231-0/+1
| | |
| * | Merge branch 'issue_13301_emoji-menu' into 'master' Robert Speicher2016-02-241-3/+13
| |\ \ | | |/ | |/| | | | | | | | | | | | | Load award emoji picker with ajax request Fixes #13301. See merge request !2888
| | * Create EmojisControllerAnnabel Dunstone2016-02-221-1/+1
| | |
| | * Add timeout for ajax call in award emoji steps; update focus in award pickerAnnabel Dunstone2016-02-191-1/+2
| | |
| | * Load award emoji picker with ajax requestAnnabel Dunstone2016-02-181-2/+11
| | |
| * | Add "e" shortcut to edit issuableissue_13510Alfredo Sumaran2016-02-231-0/+8
| | |
| * | Merge branch 'dz-small-ui-fixes' into 'master' Jacob Schatz2016-02-231-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set of UI fixes * Improve wiki pages * Improve profile pages cc @skyruler See merge request !2758
| | * | Set of small improvements to wiki frontendDmitriy Zaporozhets2016-02-071-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'files-view-row-click' into 'master' Jacob Schatz2016-02-231-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Correctly checks if tree view is on screenPhil Hughes2016-02-231-1/+1
| | | | |
| | * | | Fixes issue with file view rows not clickable on project main viewfiles-view-row-clickPhil Hughes2016-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Issues can be dragged & dropped into empty milestone listsPhil Hughes2016-02-231-9/+21
| |/ / / | | | | | | | | | | | | | | | | | | | | This is also possible with MRs. Also fixed an issue where MRs weren't sortable Fixes #13668
| * | | Merge branch 'blame-line-link' into 'master' Jacob Schatz2016-02-221-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added line links to blame table Closes #4119 See merge request !2915
| | * | | Added line links to blame tableblame-line-linkPhil Hughes2016-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | Closes #4119
| * | | | Merge branch 'issue_13463' into 'master' Jacob Schatz2016-02-221-0/+8
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fix Side-by-side view after loading diff results Fixes #13463 See merge request !2880
| | * | | Update button selectorissue_13463Alfredo Sumaran2016-02-191-1/+1
| | | | |
| | * | | Change method name for consistencyAlfredo Sumaran2016-02-191-2/+2
| | | | |
| | * | | Make diff view name getter less error proneAlfredo Sumaran2016-02-191-4/+2
| | | | |
| | * | | Add commentAlfredo Sumaran2016-02-191-0/+2
| | | | |
| | * | | Expand view container if diff mode is set to paralellsAlfredo Sumaran2016-02-181-0/+8
| | | |/ | | |/|
| * | | Merge branch 'issue_3276' into 'master' Jacob Schatz2016-02-191-0/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Labels should be visible in milestone view Closes #3276 See merge request !2599
| | * | | Show buttons based on current tab.Rubén Dávila2016-02-021-0/+10
| | | | |
| * | | | Uses cross browser niceScroll to do scrolling on sidebar.Jacob Schatz2016-02-181-0/+2
| | |/ / | |/| |
* | | | Shrink on diff viewJacob Schatz2016-02-171-0/+10
|/ / / | | | | | | | | | | | | | | | Shrinks when navigating to diff view. Shrinks when refreshing on diff view. Expandable at anytime.
* | | Fix duplicate "me" in tooltip of the "thumbsup" awards EmojiStan Hu2016-02-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'fix-explore-filter' into 'master' Dmitriy Zaporozhets2016-02-103-20/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add ajax filtering to all paged project lists. Fixes #13182 See merge request !2728
| * | | Cleanup to use one selectorfix-explore-filterJosh Frye2016-02-091-4/+4
| | | |
| * | | More specific selectorsJosh Frye2016-02-091-4/+4
| | | |
| * | | MR feedbackJosh Frye2016-02-091-5/+2
| | | |
| * | | Starred, All, and Trending on explore are paged also group projects. Need ↵Josh Frye2016-02-093-4/+6
| | | | | | | | | | | | | | | | ajax filter.
| * | | JS FixesJosh Frye2016-02-092-14/+15
| | | |
| * | | Fix explore filter. Fixes #13182Josh Frye2016-02-092-16/+21
| | | |
* | | | Merge branch 'fix-logo-rasterization' into 'master' Robert Speicher2016-02-091-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Prevent rasterization artefacts in the logo, and simplify markup.Aaron Hamilton2016-02-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdownRobert Speicher2016-02-062-13/+22
|/ / / | | | | | | | | | Closes #11853
* | | Merge branch 'feature/jschatz1/sidebar-features' into 'master' Dmitriy Zaporozhets2016-02-051-0/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Add `j` and `k` shortcutsJacob Schatz2016-02-051-0/+19
| | |/ | |/|
* | | Merge branch 'rrott/gitlab-ce-logo-issue-11867' into 'master'Robert Speicher2016-02-051-0/+5
|\ \ \ | |/ / |/| | | | | | | | | | | Fixes for issue with poor logo transition animation on Safari See merge request !2690
| * | fixed issue with poor logo transition animation on safariRoman Rott2016-02-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Add JS style changes.feature/jschatz1/issuable-date-positioningJacob Schatz2016-02-051-2/+4
| | | | | | | | | | | | Thanks @rspeicher
* | | Edited time ago location change.Jacob Schatz2016-02-051-40/+47
| | | | | | | | | | | | | | | | | | Change edited icon to word. Change edited text color to gray cc/ @creamzy
* | | Merge branch 'paginate-dashboard-projects' into 'master' Dmitriy Zaporozhets2016-02-053-6/+31
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Page project list on dashboard See merge request !2689
| * | Frontend changes from MR feedbackpaginate-dashboard-projectsJosh Frye2016-02-051-3/+4
| | |
| * | Remove js lineJosh Frye2016-02-041-1/+0
| | |
| * | Various filter fixesJosh Frye2016-02-045-33/+49
| | |