summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | Merge branch 'rs-broadcast-markdown' into 'master' Douwe Maan2016-02-093-13/+32
|\ \ | |/ |/| | | | | | | | | Allow limited Markdown in Broadcast Messages Closes #11853 See merge request !2695
| * Allow limited Markdown in Broadcast Messagesrs-broadcast-markdownRobert Speicher2016-02-063-13/+32
| | | | | | | | Closes #11853
* | Merge branch 'project-title-dropdown-toggle-button' into 'master' Jacob Schatz2016-02-051-0/+9
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Changed the project switcher dropdown toggle Moved the positioning of the dropdown to be more aligned with the title Closes #13219 and #13214 cc. @jschatz1 @dzaporozhets See merge request !2733
| * Changed the project switcher dropdown togglePhil Hughes2016-02-051-0/+9
| | | | | | | | | | | | Moved the positioning of the dropdown to be more aligned with the title Closes #13219 and #13214
* | Merge branch 'feature/jschatz1/sidebar-features' into 'master' Dmitriy Zaporozhets2016-02-052-2/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Changes sidebar widthfeature/jschatz1/sidebar-featuresJacob Schatz2016-02-051-2/+2
| | |
| * | Add `j` and `k` shortcutsJacob Schatz2016-02-051-0/+19
| |/
* | Merge branch 'rrott/gitlab-ce-logo-issue-11867' into 'master'Robert Speicher2016-02-052-1/+19
|\ \ | |/ |/| | | | | | | 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-052-1/+19
| | | | | | | | | | | | | | | | 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-052-40/+53
| | | | | | | | | | | | 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
| | |
| * | Fix project filter form renderingDmitriy Zaporozhets2016-02-051-0/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove js lineJosh Frye2016-02-041-1/+0
| | |
| * | Various filter fixesJosh Frye2016-02-045-33/+49
| | |
| * | Delay filter until user stops typingJosh Frye2016-02-044-24/+31
| | |
| * | Paginate + ajax filter dashboard projectsJosh Frye2016-02-041-12/+14
| | |
* | | Remove project-issuable-filter from admin builds page :)improve-nav-controlsDmitriy Zaporozhets2016-02-051-14/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Add support for inline form in nav-controls componentDmitriy Zaporozhets2016-02-051-0/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | New padding for listslist-paddingDmitriy Zaporozhets2016-02-047-21/+10
| |/ |/| | | | | | | | | | | * improve consistency for list padding * reduce padding for project/group/events lists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'feature/jschatz1/issuable-sidebar' into 'master' Dmitriy Zaporozhets2016-02-048-27/+232
|\ \ | |/ |/| | | | | | | | | | | | | Implement new design for issue and merge request right sidebar Fixes #3981 See merge request !2645
| * Resize sidebar on initial page refresh.Jacob Schatz2016-02-041-2/+10
| |
| * Make size changes based on screen resize.Jacob Schatz2016-02-032-0/+37
| |
| * Fixes sidebar width.Jacob Schatz2016-02-032-4/+11
| |
| * Sidebar works after sidebar ajax calls.Jacob Schatz2016-02-023-3/+4
| |
| * Added correct colors and styles from antetype mockup.Jacob Schatz2016-02-024-11/+12
| |
| * Add ajax calls to return JSONJacob Schatz2016-01-302-1/+10
| | | | | | | | | | Fix subtitles on minimize. Fix styles for show.
| * Add detail to collapsed iconsJacob Schatz2016-01-281-1/+24
| |
| * Fix icon centering on collapsed viewJacob Schatz2016-01-281-7/+6
| |
| * Sidebar collapse and expand work with whole page.Jacob Schatz2016-01-283-8/+41
| |
| * Add icon when collapsed.Jacob Schatz2016-01-281-0/+22
| | | | | | | | Hide and show icons in collapse and expanded mode.
| * Add js to expand and contract side menuJacob Schatz2016-01-272-4/+30
| |
| * Adds prev/next buttons to top areaJacob Schatz2016-01-272-1/+26
| |
| * New right side gutter design.Jacob Schatz2016-01-274-13/+27
| | | | | | | | [WIP]
* | Sort projects by last activity for project switcher in headersort-projects-dropdownDmitriy Zaporozhets2016-02-032-2/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'dashboard-sort-dropdown' into 'master' Dmitriy Zaporozhets2016-02-031-8/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add sort dropdown to dashboard projects page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> First step to improve projects page. Related to !2568 and #3968 See merge request !2691
| * | Add sort dropdown to dashboard projects pagedashboard-sort-dropdownDmitriy Zaporozhets2016-02-031-8/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'attach-file-cursor-position' into 'master' Jacob Schatz2016-02-031-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 :thumbsup: Fixes #12822 cc. @jschatz1 See merge request !2648
| * | | Keeps cursor at the correct place after changing text in dropzonePhil Hughes2016-01-291-7/+2
| | | |
View Lorry Controller Status