home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 05:26:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,605 Commits 48 Branches 340 Tags
1475cb9aaae75d37719c8eac92f9483bb2fde416
Commit Graph
2099 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 1475cb9aaa Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-07 11:24:21 -08:00
Dmitriy Zaporozhets be3edeb6a1 Small UI improvements after css refactoring 2015-03-07 10:35:17 -08:00
Dmitriy Zaporozhets e2b8025abe Increase input padding and fit issue form in laptop screen 2015-03-07 01:06:16 -08:00
Dmitriy Zaporozhets 4f3d704845 Move mixins and bootstrap css to base directory 2015-03-07 00:29:25 -08:00
Dmitriy Zaporozhets 433b4c76fc Apply some styles from flatly theme 2015-03-07 00:28:53 -08:00
Robert Schilling 0f66b32965 Merge branch 'master' into 'master' 
Fix editor in IE producing errors #1096

IE seems to handle form submission oddly. It gets fired twice - once from javascript and once from the form click, producing 2 identical requests and causing #1096.

Similar issues: http://stackoverflow.com/questions/14373800

Returning false from the click event seems to fix it and shouldn't cause any side-effects.

See merge request !366
 2015-03-07 08:00:57 +00:00
Dmitriy Zaporozhets 887cf5c710 Better name for pages css dir 2015-03-06 21:40:23 -08:00
Dmitriy Zaporozhets ceb8f9dfeb Remove custom css for panels and navs 2015-03-06 21:15:15 -08:00
Dmitriy Zaporozhets 3cbc0b1c6d Cleanup css variables 2015-03-06 20:02:34 -08:00
Dmitriy Zaporozhets cd73b26e07 Refactor gitlab css state colors 2015-03-06 19:02:12 -08:00
Dmitriy Zaporozhets 3bfd53149c Replace bs-callout with alert 2015-03-06 18:36:22 -08:00
Dmitriy Zaporozhets b14d21e174 Use bootstrap buttons with custom colors instead of own css 2015-03-06 02:18:53 -08:00
Dmitriy Zaporozhets 8b53d9efe6 Fix bug with active tab remembering (saving cookie with different path) 2015-03-06 01:41:47 -08:00
Dmitriy Zaporozhets 65105ff3bb Improve projects list 
* Add search filtering for group projects
* Show all user projects on dashboard
* Refactor projects list into one view
* Hide big list of projects with 'Show all' button
 2015-03-04 17:22:55 -08:00
unknown 6fd0600685 Bugfix #1096 2015-03-04 22:05:15 +02:00
Marin Jankovski 8be36a2c0f Merge branch 'autosave-new-issuables' into 'master' 
Autosave title and description of new issues/MRs.

Closes #2048.

See merge request !1595
 2015-03-04 06:38:55 +00:00
Douwe Maan 3102454a56 Don't show Unassigned in user select when searching. 2015-03-03 13:52:13 +01:00
Dmitriy Zaporozhets 27e7534470 Merge pull request #8829 from ZeoAlliance/merge_request_diff_view_fix 
[bugfix] Merge request diff view behaviour fix
 2015-03-02 14:28:21 -08:00
Marin Jankovski 5bf492fe1f Merge branch 'filter_icons_btn' into 'master' 
Filter icons look like proper buttons

The filter icons (Push events, Merge events, Comments, Team) now have a border
that signifies they can be pushed. This not only keeps it in line with the rest
of the application buttons, but it makes it more obvious, especially for the
Merge events button with a checkbox icon.

Fixes #1993

See merge request !1576
 2015-02-26 19:44:46 +00:00
Dmitriy Zaporozhets 386178aedf Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-26 09:36:43 -08:00
Dmitriy Zaporozhets faae454424 Merge pull request #8869 from tsigo/rs-issue-867 
Allow mass-unassigning of issues
 2015-02-26 09:04:23 -08:00
Marin Jankovski 449cf43a55 Add z index for diff header so sticky header stays on top on diff comments. 2015-02-26 09:03:34 -08:00
Dmitriy Zaporozhets 7fef8456e8 Merge branch 'small-fixes' into 'master' 
Small fixes

Fixes #2062 and #2061

See merge request !1601
 2015-02-26 06:31:50 +00:00
Dmitriy Zaporozhets e27f5aef46 Fix sticky diff header 2015-02-25 22:17:46 -08:00
Robert Speicher e53dd7526f Allow mass-unassigning of issues 
Fixes #867

[ci skip]
 2015-02-25 23:57:23 -05:00
Dmitriy Zaporozhets c254cb03d8 Fix affix for issue and merge request with image in description 2015-02-25 20:00:28 -08:00
Dmitriy Zaporozhets 0d884ff2b1 Merge branch 'extend_markdown_upload' into 'master' 
Generalizes image upload in drag and drop in markdown to all files

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger.

- [x] Rebase on master when !1553 is merged in

See merge request !1530
 2015-02-25 23:36:03 +00:00
Dmitriy Zaporozhets a52529f9b6 Merge branch 'bitbucket-import' 
Conflicts:
	app/views/import/gitorious/status.html.haml
	db/schema.rb
 2015-02-25 09:21:45 -08:00
Douwe Maan 87da9185ff Autosave title and description of new issues/MRs. 2015-02-25 12:52:37 +01:00
Douwe Maan 5f7a3e1bbd Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/controllers/files_controller.rb
 2015-02-25 11:59:25 +01:00
Dmitriy Zaporozhets a30a56634d Merge branch 'refactor-header' into 'master' 
UI: refactor header css

See merge request !1591
 2015-02-25 07:56:28 +00:00
Dmitriy Zaporozhets ee343661e1 Get rid of black logo 2015-02-24 23:17:11 -08:00
Dmitriy Zaporozhets 6e559be6c6 Refactor header logo and setup expectation on it size 2015-02-24 22:58:47 -08:00
Dmitriy Zaporozhets 1faf3676aa Refactor gitlab themes css 2015-02-24 22:19:14 -08:00
Dmitriy Zaporozhets 6fe057cc7b Fix header avatar size 2015-02-24 21:40:47 -08:00
Dmitriy Zaporozhets f43c0429c2 Improve admin projects and users pages for mobile devices 2015-02-24 21:31:54 -08:00
Dmitriy Zaporozhets 53784fb637 Merge branch 'master' into 'master' 
Updated Gitorious import icons

See merge request !353
 2015-02-24 21:17:11 +00:00
Sabba Petri 7f200b7d18 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into sidebar_state_toggle 2015-02-24 09:41:10 -08:00
Sabba Petri ea31726781 Added a margin and a couple styles 
Added a background, rather than an outline, which should reduce
clutter on the screen.
 2015-02-24 09:06:59 -08:00
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
 2015-02-24 14:54:39 +01:00
Marcin Kulik f6add983d3 Use proper Gitorious icons on import pages 2015-02-24 09:42:07 +00:00
Dmitriy Zaporozhets 5e2098feb4 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-23 23:50:18 -08:00
Dmitriy Zaporozhets 93447c4b14 Merge pull request #8760 from yglukhov/diff-sticky-headers 
Diff headers made sticky
 2015-02-23 23:50:07 -08:00
Dmitriy Zaporozhets 8b9348e80d Merge branch 'improve-sidebar' into 'master' 
Improve sidebar menu for project settings

See merge request !1582
 2015-02-24 07:46:03 +00:00
Dmitriy Zaporozhets 64ca07c3b9 Better readme title 2015-02-23 21:27:41 -08:00
Dmitriy Zaporozhets 12589d3390 Improve sidebar menu for project settings 2015-02-23 18:43:39 -08:00
Dmitriy Zaporozhets 8601c502e8 Merge branch 'fix-commit-zen-mode' into 'master' 
Fix ZenMode on commit show and milestone edit pages.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1110

See merge request !1557
 2015-02-24 02:02:44 +00:00
Sabba Petri b3fd0ca04d Toggle sidebar button more obvious 
The toggle is now at the top of the sidebar because it is not noticeable
near the bottom. By placing it at the top, users will immediately know that
they can have more space if they desire versus on the bottom, they will have
to search for it and that's not desired.

Fixes #2044
 2015-02-23 14:27:52 -08:00
Sabba Petri 0e1d31a734 Git Clone btn more apparent 
Added a faint background to the button to show that it is in an
active state for the user. White background is often hard to tell
if something is being pushed, so adding a "shadow" makes it a bit
easier to tell. Fixes #1998
 2015-02-23 13:52:02 -08:00