home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,615 Commits 48 Branches 340 Tags
bed263f0fe3aa8485b3f07318c00a6164ca6f927
Commit Graph
9132 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets e0da2c3523 Merge branch 'ui-improvements' into 'master' 
Ui improvements

* fix project home page when activity set as default
* style commits, branches and tags pages to new style
* render flash message outside of content block
* style group pages

See merge request !1255
 2015-09-07 14:17:00 +00:00
Valery Sizov 954dd7ce87 Merge branch 'crowd' into 'master' 
Crowd integration

https://dev.gitlab.org/gitlab/gitlabhq/issues/2217

See merge request !1228
 2015-09-07 11:20:03 +00:00
Dmitriy Zaporozhets 700a342e0d Restyle group pages. Merge header with page title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-07 13:18:11 +02:00
Dmitriy Zaporozhets dad163b7ee Style project milestones page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-07 12:52:53 +02:00
Dmitriy Zaporozhets 0fbd6244ec Merge branch 'annotate-models' into 'master' 
Re-annotate models

See merge request !1253
 2015-09-07 09:58:51 +00:00
Dmitriy Zaporozhets 11f815ac1e Render flash message out of content block 2015-09-07 11:58:19 +02:00
Dmitriy Zaporozhets aa6d29f0a7 Style commits, branches and tags pages to match new UI 2015-09-07 11:44:00 +02:00
Douwe Maan 662cf2cef4 Merge branch 'fix-wiki-page-history' into 'master' 
Fix broken Wiki Page History

This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes.

Closes #2104

Closes #1751

Closes #1592

Closes https://github.com/gitlabhq/gitlabhq/issues/9399

See merge request !1232
 2015-09-07 09:27:48 +00:00
Douwe Maan b9df499860 Merge branch 'rs-dev-issue-2466' into 'master' 
Remove style attribute from textarea during ZenMode activation

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466

Closes https://github.com/gitlabhq/gitlabhq/issues/8963

See merge request !1248
 2015-09-07 09:20:00 +00:00
Dmitriy Zaporozhets 6c1d5c5c9c Fix project page with activity as default home page 2015-09-07 11:10:40 +02:00
Stan Hu d7812a95cf Re-annotate models 2015-09-06 07:48:48 -07:00
Robert Speicher 38f1d571fe Remove style attribute from textarea during ZenMode activation 
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466
 2015-09-04 18:01:36 -04:00
Robert Speicher cc22a2640f Add syntax highlight scheme to notes rendered client-side 2015-09-04 17:07:24 -04:00
Dmitriy Zaporozhets 50f76ae0ea Merge branch 'ui-improvements' into 'master' 
Style project home page

Also make header more compact

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com

See merge request !1246
 2015-09-04 20:22:36 +00:00
Dmitriy Zaporozhets 9793c3460f Make project page and header more compact 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 21:36:56 +02:00
Dmitriy Zaporozhets ac6dfbd91c Make header and sidebar avatar more compact 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 21:21:31 +02:00
Stan Hu e8bbc83771 Merge pull request #9598 from darkrasid/master 
Add image content-type header in raw download
 2015-09-04 07:49:01 -07:00
Dmitriy Zaporozhets 670544c8fa Style project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 16:14:16 +02:00
Dmitriy Zaporozhets bc6706fd6a REmove icons from milestone filters 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 15:28:04 +02:00
Dmitriy Zaporozhets 43394f0a30 Dont render merge request target branch in list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 15:23:21 +02:00
Dmitriy Zaporozhets 147f95b753 Apply new style for issues, merge requests and milestone pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 15:22:33 +02:00
Dmitriy Zaporozhets cf36509a34 Style dashboard milestones page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 15:00:50 +02:00
Dmitriy Zaporozhets 0362a0f0d7 Fix stars align 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 14:57:11 +02:00
Dmitriy Zaporozhets 8301836b42 Small ui improvements to activity feed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 11:56:32 +02:00
Dmitriy Zaporozhets af6f739f35 Fix fonts for assets 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 11:40:15 +02:00
Dmitriy Zaporozhets dc86a91979 Event feed use gl-padding var 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 11:31:48 +02:00
Dmitriy Zaporozhets c13ef89862 Make UI more compact 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 11:17:25 +02:00
Dmitriy Zaporozhets 16e6913e00 Add awesome font SourceSansPro 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 11:17:07 +02:00
pilsner 4144c59941 add Content-Type header of raw image file 
Add Content-Type header to fix a bug which IE can't show image in
markdown when the image is from raw.

	modified:   CHANGELOG
	modified:   app/controllers/projects/raw_controller.rb
	modified:   spec/controllers/projects/raw_controller_spec.rb
 2015-09-04 13:06:02 +09:00
Dmitriy Zaporozhets c2a9e6ea67 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 22:15:21 +02:00
Dmitriy Zaporozhets 0145e8ea21 Set page title based on content in dashboard area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 21:53:55 +02:00
Dmitriy Zaporozhets b008273883 Fix even feed title overflow 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 21:36:03 +02:00
Dmitriy Zaporozhets d0a580273a Replace obvious tooltips. Fix line-height for top nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 19:41:06 +02:00
Dmitriy Zaporozhets ce9cb516a1 Fix tab toggle on activity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 19:27:13 +02:00
Dmitriy Zaporozhets 211e775039 Improve explore proojects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 19:08:43 +02:00
Dmitriy Zaporozhets b7427faa49 Improve starred and trending pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 19:07:23 +02:00
Dmitriy Zaporozhets 1c8ec154a9 Refactor colors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 18:48:35 +02:00
Dmitriy Zaporozhets 89df4a7922 New UI for explore groups and trending pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 18:19:31 +02:00
Dmitriy Zaporozhets 0195b085a1 Style groups page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 17:21:48 +02:00
Dmitriy Zaporozhets aeeb31d6b7 Change some base colors in UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 15:46:13 +02:00
Dmitriy Zaporozhets 6d651a0260 Increase use of variables in css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 15:09:55 +02:00
Dmitriy Zaporozhets 1d6a65a2ab Improve paddings and set new colors for links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 14:43:31 +02:00
Dmitriy Zaporozhets 7f045a6b4a Apply new font size and padding 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 14:24:27 +02:00
Dmitriy Zaporozhets 63ba17c4db Redesign activity feed on dashboard and project pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 13:46:11 +02:00
Dmitriy Zaporozhets 59d9dc4408 Reduce margin under projects filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 10:24:10 +02:00
Dmitriy Zaporozhets 6fb7311e6e Fix home page for mobile devices 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 22:28:40 +02:00
Dmitriy Zaporozhets d0cfa4651c Avoid horizontal scroll in sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 21:57:33 +02:00
Dmitriy Zaporozhets c5786649c9 Keep header fluid for big res 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 21:57:33 +02:00
Dmitriy Zaporozhets 418dd5ebf8 Collapse sidebar button at the bottom 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 21:57:33 +02:00
Dmitriy Zaporozhets b879407695 Fix collapsed sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 21:57:33 +02:00