summaryrefslogtreecommitdiff
path: root/app/views/layouts
Commit message (Collapse)AuthorAgeFilesLines
* Clarify navigation labels for Project Settings and Group Settings.nav-settingsDouwe Maan2015-05-252-2/+2
|
* Fix nav and layout for TwoFactorAuthsControllerRobert Speicher2015-05-091-1/+1
|
* Fix project description and avatar alignmentDmitriy Zaporozhets2015-05-051-1/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove project dropdown and fix db sche,aDmitriy Zaporozhets2015-05-051-5/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Reorganize elements in project sidebarDmitriy Zaporozhets2015-05-051-0/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add helpers for header title and sidebar, and move setting those from ↵Douwe Maan2015-05-0111-21/+52
| | | | controllers to layouts.
* Fix snippest sidebar when signed out.Douwe Maan2015-04-301-5/+6
|
* Add a page title to every page.Douwe Maan2015-04-3020-177/+157
|
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-04-301-5/+1
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/layouts/_head_panel.html.haml
| * Merge branch 'search-layout' into 'master'Dmitriy Zaporozhets2015-04-292-7/+4
| |\ | | | | | | | | | | | | | | | | | | | | | Improvements to search layout Improve search layout to match new UI style and make it more mobile-firendly See merge request !585
| | * Move search categories (projects, issues etc) below search field. Instead ↵Dmitriy Zaporozhets2015-04-294-80/+1
| | | | | | | | | | | | | | | | | | use sidebar for dashbaord nav Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Continue refactoring and restyle of search layoutDmitriy Zaporozhets2015-04-283-31/+32
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Draft improvements to search layoutDmitriy Zaporozhets2015-04-285-6/+81
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix .container position on navbar (reloaded)Sullivan SENECHAL2015-04-293-62/+59
|/ /
* | Revert "Fix '.container or .container-fluid should be the first child inside ↵Dmitriy Zaporozhets2015-04-291-2/+2
|/ | | | | | of a .navbar' issue" This reverts commit 570594a469fe481060d312d9d90980c5f9289e2f.
* Merge pull request #9208 from Soullivaneuh/container-classJeroen van Baarsen2015-04-271-2/+2
|\ | | | | Fix .container position on navbar
| * Fix '.container or .container-fluid should be the first child inside of a ↵Sullivan SENECHAL2015-04-261-2/+2
| | | | | | | | .navbar' issue
* | Merge pull request #9207 from Soullivaneuh/x-ua-compatibleJeroen van Baarsen2015-04-271-0/+1
|\ \ | | | | | | Fix missing X-UA-Compatible meta tag
| * | Fix "`<head>` is missing X-UA-Compatible `<meta>` tag that disables old IE ↵Sullivan SENECHAL2015-04-261-0/+1
| |/ | | | | | | compatibility modes"
* | Place the logo's tooltip dynamicallyrs-minor-stylesRobert Speicher2015-04-251-1/+1
| | | | | | | | | | When collapsed it's on the right like everything else, when expanded it's on the bottom.
* | Add data-placement attributes for all sidebar linksRobert Speicher2015-04-257-54/+54
| |
* | Add collapsed navbar links to the default tooltip selectorRobert Speicher2015-04-251-4/+0
| |
* | Remove the `has_bottom_tooltip` classRobert Speicher2015-04-251-10/+10
| | | | | | | | | | | | | | | | | | Bootstrap's tooltip JS can read the placement from a `data-placement` attribute. Further, when we supply the `selector` option to `tooltip`, tooltips will be added to any dynamically-added elements matching the selector, without us having to re-call the `tooltip` method.
* | Items with tooltips don't need a 'data-original-title' attributeRobert Speicher2015-04-251-22/+21
|/ | | | Bootstrap's tooltip JS just uses the `title` attribute.
* Merge branch 'atom-feeds-everywhere' into 'master'Dmitriy Zaporozhets2015-04-241-10/+3
|\ | | | | | | | | | | Add project activity atom feed and show atom feed buttons everywhere where applicable. See merge request !555
| * Add atom link tag to every page that has one.Douwe Maan2015-04-231-10/+3
| |
* | Use fixed width icons in all nav sidebarsRobert Speicher2015-04-237-55/+54
|/
* Merge branch 'rs-rails-env-predicates' into 'master'Dmitriy Zaporozhets2015-04-231-1/+1
|\ | | | | | | | | | | Fix two places where we should be using `Rails.env.development?` See merge request !550
| * Fix two places where we should be using `Rails.env.development?`rs-rails-env-predicatesRobert Speicher2015-04-201-1/+1
| |
* | Dont render dashbaord nav if user is not signed inDmitriy Zaporozhets2015-04-231-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | For navless pages render dashboard navDmitriy Zaporozhets2015-04-224-25/+21
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix wording and remove duplicate linkDmitriy Zaporozhets2015-04-221-2/+2
| |
* | Start applying new layout to snippets pagesDmitriy Zaporozhets2015-04-222-0/+17
| |
* | Add gitlab logo on login pageDmitriy Zaporozhets2015-04-221-0/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Restyle explore page to sidebar layoutDmitriy Zaporozhets2015-04-222-20/+20
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | No need in empty head panel on login pageDmitriy Zaporozhets2015-04-221-1/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix toggle of sidebarDmitriy Zaporozhets2015-04-222-2/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | New colorful design of sidebarDmitriy Zaporozhets2015-04-211-0/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #9075 from Soullivaneuh/bootlintDmitriy Zaporozhets2015-04-202-0/+5
|\ | | | | Bootlint integration
| * Bootlint integrationSullivan SENECHAL2015-04-012-0/+5
| |
* | Merge branch 'invitation' into 'master'Dmitriy Zaporozhets2015-04-152-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to be invited. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2058. The "Add members" panes for both Group Members and Project Members have gained a line of text by the People field. ![Screen_Shot_2015-04-10_at_14.14.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fe990e65eccd9203d7324b492941362b/Screen_Shot_2015-04-10_at_14.14.32.png) Entering an email address that is not already a member will give you the option to invite them. ![Screen_Shot_2015-04-10_at_14.14.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d6b0d4571ea90f2a2e4af8f5b336e8e1/Screen_Shot_2015-04-10_at_14.14.48.png) Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members. ![Screen_Shot_2015-04-10_at_14.15.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a618e5ec292d79578b16400dca6d4cfe/Screen_Shot_2015-04-10_at_14.15.09.png) The invited member will be shown in the members list as such. The access level can be changed, and the invite can be revoked by deleting the member. ![Screen_Shot_2015-04-10_at_14.15.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3695b9a6778d367b275115747579b46e/Screen_Shot_2015-04-10_at_14.15.19.png) The invited user will receive an email with an "Accept invitation" link. ![Screen_Shot_2015-04-10_at_14.17.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/730121888153117d83c3cd0e4f5c90f6/Screen_Shot_2015-04-10_at_14.17.52.png) If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice. ![Screen_Shot_2015-04-10_at_14.18.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1a26a5fa13321e7ef77ed8b538c8557d/Screen_Shot_2015-04-10_at_14.18.12.png) Signing in or signing up will redirect them back to the invite detail page, where they can actually accept the invitation, which will update the member record in question to point to the user in question. ![Screen_Shot_2015-04-10_at_14.18.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7ac33085463a99b8cfa6baa13bfa1235/Screen_Shot_2015-04-10_at_14.18.48.png) Accepting the invitation will redirect them to the group (or project) with an appropriate notice. ![Screen_Shot_2015-04-10_at_14.18.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7bf02a2e3bea589a11df401c23e68648/Screen_Shot_2015-04-10_at_14.18.58.png) As currently, they will also receive this information by email. ![Screen_Shot_2015-04-10_at_14.24.00](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b44a342068433a268c0a06ed9e791ffa/Screen_Shot_2015-04-10_at_14.24.00.png) At the same time, the person who initially invited the email address is sent a notification as well, so they know of the new member and to tell them what name the user signed up with. ![Screen_Shot_2015-04-10_at_14.19.07](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b29fea128186f938ec76bd7dec016b83/Screen_Shot_2015-04-10_at_14.19.07.png) The member row on the Members page will now have been updated with the new user account. ![Screen_Shot_2015-04-10_at_14.19.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cf503d3d1679614e03acec2e946a28c3/Screen_Shot_2015-04-10_at_14.19.23.png) See merge request !500
| * | Use "Sign out" instead of "Logout" for consistency.Douwe Maan2015-04-141-1/+1
| | |
| * | Rename manage_group ability to admin_group for consistency with project.Douwe Maan2015-04-141-1/+1
| | |
* | | Revert "Removed help link from sidebar"Dmitriy Zaporozhets2015-04-151-0/+5
|/ / | | | | | | This reverts commit 6fe26e3e468ae0b79e2e05b4d4dd608cd9bbcd94.
* | Merge branch 'remove-sidebar-help-link' into 'master'Hannes Rosenögger2015-04-131-5/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed help link from sidebar Closes #1349 I don't see the point in having two links on the page that will do the same thing. See merge request !483
| * | Removed help link from sidebarPhil Hughes2015-03-311-5/+0
| | |
* | | Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets2015-04-131-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow admin to create public deploy keys that are accessible to any project. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774. Project settings: ![Screen_Shot_2015-03-27_at_14.46.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01799ff912671ba6db3f828ea1aca1a6/Screen_Shot_2015-03-27_at_14.46.48.png) The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown. The list of projects below the public key has been changed to only show projects the user has access to. "Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys. Admin index: ![Screen_Shot_2015-03-27_at_14.47.06](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ea889d274cfd3f0694d47d602f4f3e94/Screen_Shot_2015-03-27_at_14.47.06.png) Admin detail page: ![Screen_Shot_2015-03-27_at_14.47.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8c8475e05bf6b497da3b9f1bc102329f/Screen_Shot_2015-03-27_at_14.47.16.png) Projects using the deploy key are listed on the left and can be disabled easily. See merge request !469
| * | | Allow admin to create public deploy keys that are accessible to any project.Douwe Maan2015-04-031-0/+5
| | |/ | |/|
* | | Merge branch 'emailsonpush-last-line' into 'master'Dmitriy Zaporozhets2015-04-071-2/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Fix final line in EmailsOnPush email diff being rendered as error. Fixes https://github.com/gitlabhq/gitlabhq/issues/8976 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2194. Pulls in gitlab_git 7.1.5, which includes https://gitlab.com/gitlab-org/gitlab_git/merge_requests/18. See merge request !480
| * | Move EmailsOnPush highlight CSS inline instead of being in every ↵Douwe Maan2015-03-311-2/+1
| |/ | | | | | | notification email.