home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
1923 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets e1fb2d4a13 Expand sidebar only for large devices 2015-01-17 23:24:03 -08:00
Dmitriy Zaporozhets 4fcc3d6b6b Fix broadcast message overflow 2015-01-16 19:23:07 -08:00
Jacob Vosmaer b79ada97bb Remove password strength indicator 
We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.
 2015-01-15 14:10:13 +01:00
Dmitriy Zaporozhets cad685e70b Refactor zen mode. Make it works in diffs 2015-01-15 00:15:12 -08:00
Dmitriy Zaporozhets 3333bd4608 Explicitly enable drag-n-drop for issue/mr/wiki markdown forms 2015-01-14 23:18:21 -08:00
Dmitriy Zaporozhets 23498337b1 Clone comment form on edit. Fixes bug with disappearing textarea or cancel of edit 2015-01-14 23:09:30 -08:00
Dmitriy Zaporozhets 4babc50eb7 Huge set of fixes for comments logic 2015-01-14 22:42:58 -08:00
Dmitriy Zaporozhets 80e784edb8 Fix image drag-n-drop to diff comments 2015-01-14 21:43:31 -08:00
Dmitriy Zaporozhets 8bc65f6d4b Fix anchors being hidden under fixed navbar issue 2015-01-14 19:39:10 -08:00
Dmitriy Zaporozhets c9bdc03bd9 Improve layout css 2015-01-14 18:42:25 -08:00
Dmitriy Zaporozhets 46ed6fb58f Revert "Fix anchor issue with fixed navbar" 
This reverts commit 204b3c121c.
 2015-01-14 17:22:36 -08:00
Dmitriy Zaporozhets 204b3c121c Fix anchor issue with fixed navbar 
When use anchors - conetent gets hidden under navbar. This commit fixes
with hack using margin+height combination
 2015-01-14 15:22:31 -08:00
Dmitriy Zaporozhets ff7f4a134e Revert "Scroll the readme anchors below the navbar." 
This reverts commit b1792d9e4c.
 2015-01-14 09:57:38 -08:00
Dmitriy Zaporozhets 55947addc3 Revert "When anchor is clicked set the correct condition." 
This reverts commit 5140bd8824.
 2015-01-14 09:56:33 -08:00
Marin Jankovski 5140bd8824 When anchor is clicked set the correct condition. 2015-01-13 13:14:32 +01:00
Marin Jankovski b1792d9e4c Scroll the readme anchors below the navbar. 2015-01-13 13:01:50 +01:00
Marin Jankovski 0a089661fd Rename the checkbox css class to prevent it from being overwritten by the same named bootstrap class. 2015-01-12 13:35:29 +01:00
Dmitriy Zaporozhets 9c03c1c545 Make automerge via satellite 2015-01-09 19:10:01 -08:00
Dmitriy Zaporozhets d02a22ba21 Redesign signin/singup pages 2015-01-07 17:07:36 -08:00
Dmitriy Zaporozhets 165199cb47 Merge branch 'event-last-push-styling-fix' into 'master' 
event-last-push styling fix

When viewing a fresh install of GitLab on a mobile device after a branch with a name of sufficient length, the broken styling can be seen as follows:

![Screen Shot 2015-01-05 at 9.37.32 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/9b3ca84f1a/Screen_Shot_2015-01-05_at_9.37.32_PM.png)

I modified the css for .event-last-push and .event-last-push-text to make it look correct:

![Screen Shot 2015-01-05 at 9.37.50 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/43d5a912b3/Screen_Shot_2015-01-05_at_9.37.50_PM.png)

As this is a purely css change, I don't believe it will break any tests. The only occurrence of .event-last-push* is in ./app/views/events/_event_last_push.html.haml

See merge request !279
 2015-01-06 17:54:29 +00:00
Dmitriy Zaporozhets 39865feb83 Merge branch 'forms-action-padding-fix' into 'master' 
Forms action padding fix

The padding on the forms action is not adjusted based on screen width:

![Screen Shot 2015-01-05 at 9.48.30 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/09aa26807e/Screen_Shot_2015-01-05_at_9.48.30_PM.png)

I added a media query for .forms-action at min-width: $screen-sm-min and moved the padding-left: 17% into it:

![Screen Shot 2015-01-05 at 9.48.35 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/8bbd8eef8c/Screen_Shot_2015-01-05_at_9.48.35_PM.png)

Full width padding remains as is:

![Screen Shot 2015-01-05 at 9.53.30 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/a6232959cb/Screen_Shot_2015-01-05_at_9.53.30_PM.png)

As this is a purely css change, I don't believe it will break any tests. form-actions occur everywhere there are form actions.

See merge request !280
 2015-01-06 17:53:47 +00:00
Wanfung Joshua Lee 252443893c removing padding on form-actions when in mobile size [ci skip] 2015-01-05 21:48:04 -08:00
Wanfung Joshua Lee 33a5106857 fix event-last-push message's styling on mobile [ci skip] 2015-01-05 21:36:58 -08:00
Wanfung Joshua Lee 3d7519016f fix the wacky dashboard intro icon styling [ci skip] 2015-01-05 20:04:53 -08:00
Dmitriy Zaporozhets 252e4fd996 Merge pull request #8489 from yglukhov/wiki-md-preview 
Markdown preview in wiki
 2015-01-03 11:05:42 +02:00
Dmitriy Zaporozhets 6e217bd55c Improve accept mr widget UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 17:28:34 +02:00
Dmitriy Zaporozhets 0930086bea Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 16:38:27 +02:00
Dmitriy Zaporozhets 5d2e637c17 Group selectbox js 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:48 +02:00
Dmitriy Zaporozhets 27ee0fc57b Helper for ajax group selectbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:47 +02:00
Dmitriy Zaporozhets 95cd5b275a Prevent content overflow for notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 22:59:08 +02:00
Dmitriy Zaporozhets a0c4fa3174 Use same font size for all sidenav items 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 19:11:34 +02:00
yglukhov 91a3a7a6a0 Markdown preview in wiki 2014-12-29 17:07:00 +02:00
Marin Jankovski e005d4191a Merge branch 'master' into developer_can_push_to_protected_branches_option 2014-12-29 15:39:03 +01:00
Marin Jankovski 42fb42aed4 Merge branch 'master' into developer_can_push_to_protected_branches_option 
Conflicts:
	db/schema.rb
 2014-12-29 09:30:55 +01:00
Dmitriy Zaporozhets 3d3c7e743f Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq into vicvega-check_browser_version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	app/assets/stylesheets/generic/common.scss
 2014-12-28 22:13:31 +02:00
Dmitriy Zaporozhets afccd3245a Merge branch 'ui-fixes' into 'master' 
Ui fixes

Fixes the ui bugs described in #925.

Also added the suggestion to keep the header at the top of the page.

Fixes #925

Some before/after screenshots:

- Border doesn't reach bottom on smaller pages
  - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5096094d94/Screenshot_from_2014-12-27_19_49_24.png)
  - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/551c1924e4/Screenshot_from_2014-12-27_19_51_43.png)

- Ability to always scroll 48px (visible by the scrollbar)
  - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/ea591bf7b3/Screenshot_from_2014-12-27_19_53_41.png)
  - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/97df62b40d/Screenshot_from_2014-12-27_19_53_17.png)

- Mobile sidebar icons off screen (Visible by the scrollbar on the after picture)
  - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/b6d9a4d076/Screenshot_from_2014-12-27_19_49_05.png)
  - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/fc52ac31ba/Screenshot_from_2014-12-27_19_48_16.png)

- Header fixed at top
  - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5d74dc1ea5/Screenshot_from_2014-12-27_19_59_28.png)
  - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/57c4c3ea7d/Screenshot_from_2014-12-27_20_00_05.png)

See merge request !269
 2014-12-28 19:48:29 +00:00
Stephan van Leeuwen 6342bc2994 Changed header to stay at the top of the page. 2014-12-27 20:08:29 +01:00
Marin Jankovski 78865a0c99 Move styling to css. 2014-12-26 17:16:38 +01:00
Marin Jankovski 9fd061807e Update on the correct checkbox. 2014-12-26 15:55:58 +01:00
Marin Jankovski 16ebeedef2 Update branch status with ajax call. 2014-12-26 15:37:04 +01:00
Stephan van Leeuwen 071ad02c02 Updated mobile sidebar to allow scrolling 2014-12-26 15:29:19 +01:00
Stephan van Leeuwen 1b6ebd1717 Updated sidebar style to span the whole height. 2014-12-26 15:29:02 +01:00
Dmitriy Zaporozhets 573d554c69 set z-index for navbar and sidebar explicitly 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 14:34:50 +02:00
Dmitriy Zaporozhets f1c39763c9 Fix UI for no-ssh-key message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 14:25:37 +02:00
Dmitriy Zaporozhets 038161f4e0 Make nprogress color to red 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 14:19:54 +02:00
Dmitriy Zaporozhets e3951019f5 Put nprogress spinner to bottom left position 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 14:19:30 +02:00
Dmitriy Zaporozhets f9ece12e87 Merge branch 'master' into oauth2_provider 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/nav/_profile.html.haml
 2014-12-25 18:48:15 +02:00
Dmitriy Zaporozhets 592e396869 Rework oauth2 feature 
* improve UI
* add authorization
* add separate page for oauth applications

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 18:35:04 +02:00
Dmitriy Zaporozhets 40ff1bc8ba Align sidebar navigation differently 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 15:55:23 +02:00
Dmitriy Zaporozhets 99e52c9ad0 Small UI imporovement for merge request accept widget and projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 14:58:43 +02:00