summaryrefslogtreecommitdiff
path: root/app/views/layouts
Commit message (Collapse)AuthorAgeFilesLines
* Fix header for anonymous users toofluid-fixed-layoutDmitriy Zaporozhets2015-08-261-6/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Align header with content containerDmitriy Zaporozhets2015-08-262-6/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Limit content width for big screens except certain pagesDmitriy Zaporozhets2015-08-262-13/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Re-use project partial for rendering explore projectsDmitriy Zaporozhets2015-08-251-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Dashboard activity as separate pageDmitriy Zaporozhets2015-08-251-1/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' into reply-by-emailDouwe Maan2015-08-206-63/+46
|\
| * Rebuild navigation for dashboardDmitriy Zaporozhets2015-08-205-65/+38
| | | | | | | | | | | | | | | | | | | | * projects from explore page are available from dashboard * use dashboard sidebar for both logged in and not users * move explroe projects under projects tab * move explore groups under groups tab * move public snippets under snippets tab Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Refactor sidebar navigation for dashboardDmitriy Zaporozhets2015-08-202-12/+22
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add "Reply to this email directly" to notification footer.Douwe Maan2015-08-191-1/+5
|/
* Merge branch 'cache-events' into 'master' Robert Speicher2015-08-092-1/+27
|\ | | | | | | | | | | | | | | | | | | | | | | | | Cache all events Use CSS to determine if the current user needs to see "Congratulations! Tweet about it" by project creation events and "Create Merge Request" by push events. Implemented as described here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/911#note_1559710 Addresses #2054, in part. cc @dzaporozhets See merge request !1103
| * Use display: inline where appropriatecache-eventsDouwe Maan2015-08-061-0/+8
| |
| * Cache all eventsDouwe Maan2015-08-062-1/+19
| |
* | Add abuse report management in admin areaDmitriy Zaporozhets2015-08-061-0/+7
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use mdash to prevent breaking html emails.Marin Jankovski2015-07-221-1/+1
|
* Add nice scroll for sidebarDmitriy Zaporozhets2015-07-141-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Hide icon for bact-to-location menu in sidebarDmitriy Zaporozhets2015-07-135-6/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rs-issue-1908' into 'master'Dmitriy Zaporozhets2015-07-131-2/+17
|\ | | | | | | | | | | | | | | | | | | Add Safari/iOS and Windows 8 logo information Now that we've got our :fire: new logo, let's spread it around a bit more! Closes #1908 See merge request !944
| * Update msapplication-TileColor valuers-issue-1908Robert Speicher2015-07-101-1/+1
| |
| * Add Windows 8 pinned site tile meta tagsRobert Speicher2015-07-091-0/+4
| |
| * Add Safari/iOS versions of the logoRobert Speicher2015-07-091-2/+13
| |
* | Better name for group tabhierarchical-navigationDmitriy Zaporozhets2015-07-101-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Make left menu more hierarchical and less contextual by adding back item at topDmitriy Zaporozhets2015-07-103-0/+31
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add shortcut for project activity pageDmitriy Zaporozhets2015-07-081-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Move project activity to separate tab. Add more features to project home pageDmitriy Zaporozhets2015-07-071-1/+6
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Audit log for user authenticationValery Sizov2015-07-061-3/+3
|
* Fix consistency issue in sidebars of Project and Group Settings.Nicolas2015-06-246-25/+33
| | | | Fixes #2277.
* Merge branch 'animation-sidebar' into 'master'Dmitriy Zaporozhets2015-06-232-2/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Animation of Sidebar (video in here) Edited the CSS of header and sidebar; added a new div of gitlab-logo-container to the html to make things easier. The transition-duration is set to 0.3s and when the nav bar expands, it opens up over the text, essentially revealing hidden text. [animation-sidebar-2.mov](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b15996a256d6bed03a19c68549d116e4/animation-sidebar-2.mov) /cc @JobV @nicolas2 See merge request !849
| * Edited the CSS of header and sidebar; added a new class of logo-container to ↵Darby2015-06-192-2/+4
| | | | | | | | the html to make things easier
* | Replace old logo with new onenew-logoDmitriy Zaporozhets2015-06-191-1/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Bootlint: Add missing `type` attribute for buttonsRobert Speicher2015-06-161-1/+1
|
* Merge branch 'header_layout_issue' into 'master'Douwe Maan2015-06-162-5/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix layout issue in header title truncation. @douwe Thanks for reviewing this fix for the issue mentioned in https://dev.gitlab.org/gitlab/gitlabhq/issues/2314#note_48539. **BEFORE** ![before](https://dev.gitlab.org/gitlab/gitlabhq/uploads/4ffb35f77155a92c64cfe36c66987eb0/before.gif) **AFTER** ![after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2bb2d0c4a93164f6d47e24cdcb9a106b/after.gif) See merge request !1867
| * Fix layout issue in header title truncation.Nicolas2015-06-162-5/+4
| |
* | Merge branch 'applications_form' into 'master'Douwe Maan2015-06-161-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix UI issues in Applications form @douwe Thanks for reviewing this small fix. --- Before: ![application_form_before](https://dev.gitlab.org/gitlab/gitlabhq/uploads/11fbee17ad6a4c9456cd7d6cba5ae429/application_form_before.png) --- After: ![application_form_after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/0c64214ccda6c77095f468fcb8c748f3/application_form_after.png) See merge request !1859
| * Highlight Applications nav item when validation fails.Nicolas2015-06-141-1/+1
| |
* | Account for RootController for dashboard navigation and Dispatch JSRobert Speicher2015-06-131-1/+1
| |
* | Add RootControllerRobert Speicher2015-06-131-1/+1
| | | | | | | | | | | | This controller is now the target for `root_url`. It sub-classes DashboardController so we can render the old default without a redirect if the user hasn't customized their dashboard location.
* | Fix a few remaining references to the old Theme names/IDsRobert Speicher2015-06-131-1/+1
| |
* | Add PreferencesHelper moduleRobert Speicher2015-06-132-4/+4
| | | | | | | | | | | | | | Consolidates the helpers related to user preferences. Renames `app_theme` to `user_application_theme` to better explain what it is.
* | Add Profiles::PreferencesControllerRobert Speicher2015-06-131-3/+4
|/
* Fix alignment of Project Settings nav icons.Nicolas2015-06-101-5/+5
|
* Merge branch 'move_project_members_link' into 'master'Dmitriy Zaporozhets2015-06-092-5/+7
|\ | | | | | | | | | | | | | | Move Project Members link from Settings to main menu. Addresses #2278. See merge request !1846
| * Move Project Members link from Settings to main menu.Nicolas2015-06-092-5/+7
| | | | | | | | Addresses #2278.
* | Move page-specific JS out of head and into body.Douwe Maan2015-06-093-4/+5
|/
* Fix header for mobilesDmitriy Zaporozhets2015-06-081-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move logout buttom to top right cornerDmitriy Zaporozhets2015-06-082-6/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'warn-about-referenced-users' into 'master'Dmitriy Zaporozhets2015-06-054-4/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show warning when a comment will add 10 or more people to the discussion. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2054 New issue: ![Screen_Shot_2015-06-02_at_14.48.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6771ff8748b9b548a9f0f32a5a8b9bb1/Screen_Shot_2015-06-02_at_14.48.46.png) New comment: ![Screen_Shot_2015-06-02_at_14.48.51](https://gitlab.com/gitlab-org/gitlab-ce/uploads/25ec5f06490e1e6b36e453e055a7b403/Screen_Shot_2015-06-02_at_14.48.51.png) See merge request !754
| * Show warning when a comment will add 10 or more people to the discussion.Douwe Maan2015-06-054-4/+12
| |
* | Fix empty headerDmitriy Zaporozhets2015-06-051-1/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* improve navbar collapse for mobile viewsDmitriy Zaporozhets2015-06-011-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor header viewsDmitriy Zaporozhets2015-06-017-27/+18
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status