summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* New padding for listslist-paddingDmitriy Zaporozhets2016-02-0410-26/+15
| | | | | | | * improve consistency for list padding * reduce padding for project/group/events lists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'fuzzy-file-search-menu-shortcut-placement' into 'master' Dmitriy Zaporozhets2016-02-041-4/+4
|\ | | | | | | | | | | | | | | | | | | Puts shortcut key in the right place. Fixes #13192 ![Screen_Shot_2016-02-04_at_11.51.15_AM](/uploads/a10dc24b4a836199351ba98fca266695/Screen_Shot_2016-02-04_at_11.51.15_AM.png) See merge request !2710
| * Puts shortcut key in the right place.fuzzy-file-search-menu-shortcut-placementJacob Schatz2016-02-041-4/+4
| |
* | Merge branch 'feature/jschatz1/issuable-sidebar' into 'master' Dmitriy Zaporozhets2016-02-0418-115/+463
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Implement new design for issue and merge request right sidebar Fixes #3981 See merge request !2645
| * | Properly link to the right issue or merge requestfeature/jschatz1/issuable-sidebarJacob Schatz2016-02-042-2/+22
| | |
| * | 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
| | |
| * | Issue sidebar bug fix.Jacob Schatz2016-02-032-5/+3
| | | | | | | | | | | | Thanks @rspeicher.
| * | Fix sidebar replacement for issues & MRsJacob Schatz2016-02-031-1/+1
| | |
| * | Sidebar works after sidebar ajax calls.Jacob Schatz2016-02-026-9/+10
| | |
| * | Added correct colors and styles from antetype mockup.Jacob Schatz2016-02-024-11/+12
| | |
| * | Add ajax calls to return JSONJacob Schatz2016-01-306-5/+14
| | | | | | | | | | | | | | | Fix subtitles on minimize. Fix styles for show.
| * | Add detail to collapsed iconsJacob Schatz2016-01-284-3/+44
| | |
| * | Fix icon centering on collapsed viewJacob Schatz2016-01-281-7/+6
| | |
| * | Sidebar collapse and expand work with whole page.Jacob Schatz2016-01-287-17/+108
| | |
| * | Add icon when collapsed.Jacob Schatz2016-01-282-2/+26
| | | | | | | | | | | | Hide and show icons in collapse and expanded mode.
| * | Add js to expand and contract side menuJacob Schatz2016-01-274-14/+39
| | |
| * | Adds prev/next buttons to top areaJacob Schatz2016-01-273-4/+33
| | |
| * | New right side gutter design.Jacob Schatz2016-01-2710-97/+155
| | | | | | | | | | | | [WIP]
* | | Merge remote-tracking branch 'origin/rs-database-info'Dmitriy Zaporozhets2016-02-041-0/+5
|\ \ \
| * | | Display database type and version in Administration dashboardrs-database-infoRobert Speicher2016-02-021-0/+5
| | | | | | | | | | | | | | | | Closes #12900
* | | | Merge branch 'rs-backport-ldap-2fa' into 'master' Dmitriy Zaporozhets2016-02-042-28/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support Two-factor Authentication for LDAP users Closes #12653 See merge request !2688
| * | | | Support Two-factor Authentication for LDAP usersrs-backport-ldap-2faRobert Speicher2016-02-032-28/+32
| | | | | | | | | | | | | | | | | | | | Closes #12653
* | | | | Merge branch 'better-search-autocomplete'Dmitriy Zaporozhets2016-02-041-2/+2
|\ \ \ \ \
| * | | | | In search autocomplete show only groups and projects you are member ofbetter-search-autocompleteDmitriy Zaporozhets2016-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For big instances search autocomplet is flooded with groups you have no access to and insternal/public projects you don't care. It affects way how easily you can go to group/project you are actually member of Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'disable-remove-source-branch' into 'master' Douwe Maan2016-02-041-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide remove source branch button when new commit is added to branch Fixes #3339 This MR hides the 'Remove source branch' button when a new commit is added to the source branch /cc @DouweM See merge request !2701
| * | | | | Hide remove source branch button when new commit is added to branchZeger-Jan van de Weg2016-02-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3339 This MR hides the 'Remove source branch' button when a new commit is added to the source branch
* | | | | | Sort projects by last activity for new issue dropdownnew-issue-projects-sortDmitriy Zaporozhets2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating new issue from dashboard page I want to see projects sorted by last activity instead of ID Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'wipMergeSpacing' into 'master' Douwe Maan2016-02-041-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No space required after WIP identifier Fixes #2426 Currently, the WIP: (or any other variation) prefix of a merge request title must include a trailing space for it to be recognized as a work in progress and prevent merging. To resolve this, I added an or pattern to the regexp to look for any one of the three possible delimiters ':', ']', or ' '. This way the trailing space isn't required but it still won't mark any titles beginning with wip as work in progress (e.g. "Wipwap"). See merge request !1876
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into wipMergeSpacingTed Hogan2015-12-29546-5570/+8205
| |\ \ \ \ \
| * | | | | | No space required after WIP identifierTed Hogan2015-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified changelog
* | | | | | | Merge branch 'sort-projects-dropdown' into 'master' Dmitriy Zaporozhets2016-02-043-3/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort projects by last activity for project switcher in header Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #13172 See merge request !2692
| * | | | | | | Satisfy rubocopDmitriy Zaporozhets2016-02-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Sort projects by last activity for project switcher in headersort-projects-dropdownDmitriy Zaporozhets2016-02-033-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'master' into use-top-areaDmitriy Zaporozhets2016-02-0317-54/+47
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Merge branch 'dashboard-sort-dropdown' into 'master' Dmitriy Zaporozhets2016-02-0310-38/+39
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0310-38/+39
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | 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
| | | | | | | |
| | * | | | | | Adds the markdown link at the cursor poisitionPhil Hughes2016-01-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When writing a comment and then dropping an image it will correctly add the image markdown link at the cursor position Fixes #12822
| * | | | | | | Merge branch 'remove-useless-text-tips' into 'master' Jacob Schatz2016-02-034-12/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove useless text tips on commonly used pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2687
| | * | | | | | | Remove useless text tips on commonly used pagesDmitriy Zaporozhets2016-02-034-12/+0
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix missing space between fork and star iconsui-fixesDmitriy Zaporozhets2016-02-032-2/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Use top-area component for top page navigation for pages that contains list ↵Dmitriy Zaporozhets2016-02-038-57/+78
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of items Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'improve-groups-list' into 'master' Jacob Schatz2016-02-0310-160/+179
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve UI consistency between projects and groups lists * add group description to the list * move new group button to top nav * move projects/users count icons to the right Fixes #3939 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2677
| * | | | | | Use right margin for componened other than button for top navDmitriy Zaporozhets2016-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Tried to align form input vertically with other elements for top navDmitriy Zaporozhets2016-02-032-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Make nav-controls responsive and hide on extra small screensDmitriy Zaporozhets2016-02-032-16/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Refactor nav controls section (search and new project/group btn)Dmitriy Zaporozhets2016-02-037-140/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>