summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Add JS style changes.feature/jschatz1/issuable-date-positioningJacob Schatz2016-02-051-2/+4
| | | | Thanks @rspeicher
* Edited time ago location change.Jacob Schatz2016-02-055-50/+62
| | | | | | Change edited icon to word. Change edited text color to gray cc/ @creamzy
* Merge branch 'fix-double-page' into 'master' Dmitriy Zaporozhets2016-02-053-3/+1
|\ | | | | | | | | | | | | | | | | | | Fix double paging ![Screen_Shot_2016-02-05_at_10.27.34_AM](/uploads/a21ad6c47ddecad29d377497ee2a167d/Screen_Shot_2016-02-05_at_10.27.34_AM.png) ![Screen_Shot_2016-02-05_at_10.27.44_AM](/uploads/3badb423df25f009886138c65cfe8347/Screen_Shot_2016-02-05_at_10.27.44_AM.png) See merge request !2727
| * Fix double pagingJosh Frye2016-02-053-3/+1
| |
* | Merge branch 'improve-broadcast-messages' into 'master' Dmitriy Zaporozhets2016-02-052-2/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | Improve admin broadcast messages page * Show latest broadcast messages first on admin page * Use nice looking pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #13211 cc @rspeicher @DouweM See merge request !2725
| * Improve admin broadcast messages pageDmitriy Zaporozhets2016-02-052-2/+2
| | | | | | | | | | | | | | * Show latest broadcast messages first on admin page * Use nice looking pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'paginate-dashboard-projects' into 'master' Dmitriy Zaporozhets2016-02-0515-33/+91
|\ \ | |/ |/| | | | | | | | | 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-052-7/+11
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Implement changes from MR feedbackJosh Frye2016-02-045-16/+16
| |
| * Remove js lineJosh Frye2016-02-041-1/+0
| |
| * Various filter fixesJosh Frye2016-02-0418-62/+90
| |
| * Delay filter until user stops typingJosh Frye2016-02-046-26/+33
| |
| * Paginate + ajax filter dashboard projectsJosh Frye2016-02-0410-46/+67
| |
| * Page project list on dashboardJosh Frye2016-02-041-0/+2
| |
* | Remove project-issuable-filter from admin builds page :)improve-nav-controlsDmitriy Zaporozhets2016-02-052-21/+9
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Re-use top-are css component for issues/mr pagesDmitriy Zaporozhets2016-02-059-80/+75
| | | | | | | | 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>
* | Merge branch 'list-padding' into 'master' Dmitriy Zaporozhets2016-02-0510-26/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New padding for lists * improve consistency for list padding * reduce padding for project/group/events lists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #12511 cc @jschatz1 @skyruler @creamzy See merge request !2715
| * | 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 'rymai/gitlab-ce-3007-fix-mr-label-links' into 'master' Rémy Coutable2016-02-053-6/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix label links for a merge request pointing to issues list _Originally opened at !2150._ --- I have added a type parameter to the `link_to_label` helper method that is set to `'merge_request'` when in the context of a merge request. I have also improved the specs to actually test the output of the method instead of its implementation. Fixes #3007. See merge request !2700
| * | | Allow link_to_label to take an optional type argrymai/gitlab-ce-3007-fix-mr-label-linksRémy Coutable2016-02-043-6/+13
| |/ / | | | | | | | | | | | | | | | You can set type: :merge_request to create a link to merge request lists instead of issues list. Accept both Symbol & String as type argument for the link_to_label helper
* | | Merge branch 'search-on-groups-is-ugly' into 'master' Dmitriy Zaporozhets2016-02-042-13/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Change placeholder text to just 'search' Fixes #13168 ![Screen_Shot_2016-02-04_at_12.30.16_PM](/uploads/ca3c5549abeedce99d693606135d7428/Screen_Shot_2016-02-04_at_12.30.16_PM.png) See merge request !2711
| * | Change placeholder text to just 'search'search-on-groups-is-uglyJacob Schatz2016-02-042-13/+1
| |/
* | 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