summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Fixed issue with header overflowheader-overflow-small-devicesPhil Hughes2016-02-222-1/+1
| | | | Fixes #13492
* 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
| |
* | removed merge-request-no-votes css classPhil Hughes2016-02-221-3/+1
| |
* | Only show up or down votes icon on issue list if there are anyPhil Hughes2016-02-221-1/+1
| | | | | | | | Closes #13649
* | Merge branch 'tasks' into 'master' Douglas Barbosa Alexandre2016-02-221-0/+124
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Todos Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2425 Tasks: - Prepare database - [X] Create a new table (`todos`) - Tasks Queue view - [X] Add a number icon showing the number of todos on the top right next to the new and logout button that will redirect the user to the todos page - [X] Add a chronological list of todos, with the 'Todos' tab active by default - [X] Add a 'Done' button to each todo - [x] Add filters (project, author, type, and action) - Todos generation - [X] When user issue/mr is assgined to someone - [x] When user is mentioned on (issues/mr's/comments) - Mark todo as `done` - [X] When clicks on the 'Done' button - [X] When edit issue/mr - [X] When left/edit a comment - [X] When reassign issue/mr - [X] When add/remove labels to issue/mr - [X] When issue/mr is closed - [X] When mr is merged - [X] When added an emoji - [X] When changed the issue/mr milestone * Screenshot: ![Screenshot_2016-02-20_12.45.57](/uploads/4b2554b1bde25aed3347e1ae41e8e0c0/Screenshot_2016-02-20_12.45.57.png) See merge request !2817
| * | Rename Tasks to TodosDouglas Barbosa Alexandre2016-02-201-13/+13
| | |
| * | Create a pending task when a user is mentioned on a noteDouglas Barbosa Alexandre2016-02-201-0/+24
| | |
| * | Add pending tasks badge on top right next to the new and logout buttonDouglas Barbosa Alexandre2016-02-201-0/+10
| | |
| * | Add tasks queue list pageDouglas Barbosa Alexandre2016-02-201-0/+90
| | |
* | | Merge branch 'award-emoji-retina' into 'master' Jacob Schatz2016-02-203-0/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Award emoji supports retina displays Based on discussion in !2800 There is now a retina spritesheet for emojis. It is 2mb, don't know how big an issue that is. Before: ![Screen_Shot_2016-02-19_at_11.07.25](/uploads/ea412579bcaddfd13fce67bf583de61b/Screen_Shot_2016-02-19_at_11.07.25.png) After: ![Screen_Shot_2016-02-19_at_11.07.36](/uploads/9d44c6278ba31987bad03dc1f46edd8b/Screen_Shot_2016-02-19_at_11.07.36.png) Also updated the rake task to make the @2x spritesheet https://gitlab.com/snippets/15348 cc\ @rspeicher @vsizov See merge request !2891
| * | updated retina media query based on ↵award-emoji-retinaPhil Hughes2016-02-191-4/+6
| | | | | | | | | | | | https://css-tricks.com/snippets/css/retina-display-media-query/
| * | Lowercase webkit prefixPhil Hughes2016-02-191-1/+1
| | |
| * | Crushed file size of emoji spritesheetsPhil Hughes2016-02-192-0/+0
| | |
| * | Award emoji supports retina displaysPhil Hughes2016-02-193-0/+8
| | |
* | | Merge branch 'visibletrap/gitlab-ce-label'Douwe Maan2016-02-191-1/+1
|\ \ \
| * | | Label description and Label rowTap2016-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | - Add label description - Show label row when filtering issues or merge requests by label
* | | | Merge branch 'issue_3276' into 'master' Jacob Schatz2016-02-192-0/+67
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Labels should be visible in milestone view Closes #3276 See merge request !2599
| * | | | More styling updates.issue_3276Rubén Dávila2016-02-171-6/+8
| | | | |
| * | | | Decrease padding of labels for Milestone's issues tab.Rubén Dávila2016-02-171-8/+2
| | | | | | | | | | | | | | | | | | | | * Also get rid of no longer required CSS.
| * | | | Some refactor for CSS after code review.Rubén Dávila2016-02-031-19/+24
| | | | |
| * | | | Adjust label height on Issues tab.Rubén Dávila2016-02-021-1/+1
| | | | |
| * | | | Remove gray background from detail.Rubén Dávila2016-02-021-0/+5
| | | | |
| * | | | Adjust Issues tab to new design.Rubén Dávila2016-02-021-0/+20
| | | | |
| * | | | Show buttons based on current tab.Rubén Dávila2016-02-022-1/+11
| | | | |
| * | | | Align Milestone's issue counter.Rubén Dávila2016-02-022-4/+7
| | | | |
| * | | | Add little spacing between milestone stats.Rubén Dávila2016-02-021-0/+8
| | | | |
| * | | | Show labels in Issues tab.Rubén Dávila2016-02-021-0/+12
| | | | |
| * | | | Add elpased time.Rubén Dávila2016-02-021-0/+4
| | | | |
| * | | | Add labels tab to milestone detail view.Rubén Dávila2016-02-021-0/+4
| | | | |
* | | | | Some updates from last code review.Rubén Dávila2016-02-191-6/+0
| | | | |
* | | | | Reuser revert commit modal in MR detail page.Rubén Dávila2016-02-191-0/+8
| | | | |
* | | | | Merge branch 'issue_11872' into 'master' Jacob Schatz2016-02-191-12/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Put project visibility icon next to title Fixes #11872 See merge request !2885
| * | | | Move visibility icon next to project titleissue_11872Alfredo Sumaran2016-02-181-12/+7
| | | | |
* | | | | Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-192-1269/+1723
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
| * | | | Update Emoji sprite and its SCSS for new stylesrs-emojiRobert Speicher2016-02-172-1269/+1723
| | | | |
* | | | | Uses cross browser niceScroll to do scrolling on sidebar.Jacob Schatz2016-02-182-16/+2
| |_|_|/ |/| | |
* | | | Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan2016-02-172-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to see and sort on vote count from Issues and MR lists Fixes #3763 * Sort options ![Sort Options](/uploads/df6543d574d4df8bf7e4496a876e2930/sort.png) * Most popular ![Most popular](/uploads/bb92cc2fbef7b6b806dcdf8c52778fdd/most-popular.png) * Least popular ![Least popular](/uploads/7988ed451922c81dc228419b5edbd7cd/least-popular.png) See merge request !2781
| * | | | Add ability to see and sort on vote count from Issues and MR listssee-and-sort-on-vote-count-mr-issuesDouglas Barbosa Alexandre2016-02-172-3/+3
| | |_|/ | |/| |
* | | | Fix double scrollbar issuesJacob Schatz2016-02-171-0/+16
|/ / /
* | | Merge branch 'issue_13359' into 'master' Jacob Schatz2016-02-171-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents floated button group on issues view Issue #13359 ![screenshot](/uploads/962ac4f3f1f3d6ef87f7152c09090801/screenshot.jpg) See merge request !2826
| * | | Wrap issue details to prevent content misalignmentissue_13359Alfredo Sumaran2016-02-161-0/+4
| | | |
| * | | Prevent author name to split into multiple linesAlfredo Sumaran2016-02-151-1/+1
| | | |
| * | | Prevent split time into multiple lines for better readingAlfredo Sumaran2016-02-151-0/+4
| | | |
* | | | Merge branch 'bugfix/jschatz1/sidebar-fixes-13215' into 'master' Jacob Schatz2016-02-161-0/+25
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sidebar fixes Fixes #13215 * when editing a dropdown, but not changing anything you end up in an ugly state * the hover-over state for the subscribe and other buttons are veeery subtle * the collapse button needs some sort of hover-over state * the reference gets shortened. It always got shortened. Not an issue with this in particular. * the minimized sidebar is not functional. The copy button doesn't do anything * looks all funky in safari (not for me) See merge request !2736
| * | | Make copy button in collapsed sidebar work.bugfix/jschatz1/sidebar-fixes-13215Jacob Schatz2016-02-051-0/+13
| | | |
View Lorry Controller Status