home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,014 Commits 48 Branches 340 Tags
a5208596f4fa66706674dfd87a8a28bfa3cd8b23
Commit Graph
10014 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets a5208596f4 Merge branch 'ui-improvements' into 'master' 
Ui improvements
 2014-06-03 14:26:00 +00:00
Dmitriy Zaporozhets ad432583a9 Improve UI/UX for create/edit group in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 16:40:50 +03:00
Dmitriy Zaporozhets 5b87a4dc51 Use same colors for disabled buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 16:22:52 +03:00
Dmitriy Zaporozhets d7960bca8d Merge branch 'ui-improvements' into 'master' 
Ui improvements
 2014-06-03 12:50:23 +00:00
Dmitriy Zaporozhets fe302d4cb6 New base colors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 15:47:57 +03:00
Dmitriy Zaporozhets 55ab7a2a95 Remove color-named css classes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 14:49:50 +03:00
Dmitriy Zaporozhets 729618c50f Merge branch 'ui-improvements' into 'master' 
Ui improvements
 2014-06-03 11:43:16 +00:00
Dmitriy Zaporozhets 95d61a094d Improve admin/projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 14:19:11 +03:00
Dmitriy Zaporozhets 4e55dd5f14 Change page-title font/color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 13:57:26 +03:00
Dmitriy Zaporozhets 4656ef957a Replace files icons with fontawesome 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 13:40:07 +03:00
Dmitriy Zaporozhets 31c963edb1 Improve admin/user form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 13:05:06 +03:00
Dmitriy Zaporozhets 67b0857d29 Merge branch 'revert-img-paste' into 'master' 
Revert img paste

Fixes #1307
 2014-06-03 10:00:30 +00:00
Dmitriy Zaporozhets fc43c4e7fa Restyle admin/user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 12:44:22 +03:00
Marin Jankovski a727d25eee Merge pull request #7062 from williamherry/fix_add_smtp_settings_to_gitignore 
add smtp_settings.rb to gitignore file
 2014-06-03 10:41:38 +02:00
Dmitriy Zaporozhets 3398e0a3d7 Revert "Implements and refactors clipboard feature for markdown." 
This reverts commit 2273234653.

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

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
 2014-06-03 10:56:40 +03:00
Dmitriy Zaporozhets 31fcac9ff9 Merge branch 'ui-improvements' into 'master' 
Ui improvements
 2014-06-03 07:50:18 +00:00
Dmitriy Zaporozhets 87e0fe6f76 Use big colorful pills for switch between MR tabs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 10:27:50 +03:00
Dmitriy Zaporozhets 7bb0551fd9 Improve small panels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 10:04:31 +03:00
Dmitriy Zaporozhets 636718adf0 Use padding like most of other bootstrap elements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 10:01:15 +03:00
Dmitriy Zaporozhets a54bef0a42 Merge pull request #6943 from jvanbaarsen/spec-fix 
Fix for failing specs
 2014-06-03 09:13:33 +03:00
Dmitriy Zaporozhets fc72f8e37c Merge branch 'performance-improvements' into 'master' 
Performance improvements

Fixes #1135
 2014-06-02 19:06:51 +00:00
Dmitriy Zaporozhets 5a064b0249 Get group members only if group not nil 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 21:25:01 +03:00
William Herry 3410aaf950 add smtp_settings.rb to gitignore file 2014-06-03 01:05:07 +08:00
Dmitriy Zaporozhets 144212fba2 Add members paginations to admin/project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 19:31:43 +03:00
Dmitriy Zaporozhets 9a4c8f7e41 Improve admin group page performance 
Add pagination for projects and members to /admin/groups/:group page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 18:58:00 +03:00
Dmitriy Zaporozhets 34cf3c4916 Merge branch 'developers-protected-branches' into 'master' 
Dont show new file link on protected branch for developers
 2014-06-02 14:40:37 +00:00
Dmitriy Zaporozhets d514833a15 Dont show new file link on protected branch for developers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 16:18:16 +03:00
Dmitriy Zaporozhets 2c46b35b10 Merge branch 'profile-personal-projects' into 'master' 
Show only personal projects on user page

When I visit user profile page I see all projects he have access too (if i can also access same projects).
That means I see a list of hundreds projects if he joined several groups. ![Screenshot 2014-05-30 18.24.43](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/5209c0cb01/Screenshot_2014-05-30_18.24.43.png)

It inefficient because:

* Slow page load if a lot of projects
* Hard to find his personal projects

I propose to replace it with `Personal projects` list.

It has next advantages:

* we don't load huge useless list of projects
* I can see if user have personal projects I have access to
* faster page load. We don't load all projects from all groups where user invited

![Screenshot 2014-05-30 18.20.29](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/8a5d02a00d/Screenshot_2014-05-30_18.20.29.png)

Partly fixes #1135
 2014-06-02 12:31:50 +00:00
Dmitriy Zaporozhets 28cc199128 Merge branch 'ui-colors' into 'master' 
Refactoring ui colors
 2014-06-02 12:31:38 +00:00
Dmitriy Zaporozhets c7f8bb4c9b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-02 14:52:42 +03:00
Dmitriy Zaporozhets f9dd140280 Merge branch 'add_noreferrer_to_all_links' into 'master' 
Add nofollow to all external links

Fixes #1224
 2014-06-02 11:52:03 +00:00
Dmitriy Zaporozhets 0d475208ac Merge branch 'updater_location' into 'master' 
Updater one liner based on location

Fixes #1303
 2014-06-02 11:51:16 +00:00
Dmitriy Zaporozhets 133d231f87 Use link_color var more often 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 14:21:12 +03:00
Dmitriy Zaporozhets 33ff53d915 Fix syntax error 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 14:13:35 +03:00
Dmitriy Zaporozhets 6854be80a8 Refactor scss variables. Use darker color for links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 14:12:46 +03:00
Dmitriy Zaporozhets e9de569458 Fix tests for user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 13:43:07 +03:00
Marin Jankovski c8460c4731 Update the one-liner. 2014-06-02 09:48:55 +02:00
Marin Jankovski 379299ad18 Add bash one liner in updater doc due to change of updater location. 2014-06-02 09:39:43 +02:00
Dmitriy Zaporozhets 3f972e0e53 Merge pull request #7053 from jvanbaarsen/removed_support_email 
Removed the Support Email setting
 2014-06-01 14:41:31 +03:00
Dmitriy Zaporozhets 660585caa4 Merge branch 'bump-gitlab-shell' into 'master' 
Bump gitlab shell

Use gitlab-shell v1.9.5

Fixes #1300
 2014-05-31 14:25:08 +00:00
Dmitriy Zaporozhets 94b0f1b2bb Bump gitlab-shell version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-31 15:57:22 +03:00
Dmitriy Zaporozhets 5d6f5be060 New colors for success/warning/primary 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-31 14:48:33 +03:00
Dmitriy Zaporozhets e53f4a4ea5 Use same color vars for primary/warning styles 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-31 14:24:04 +03:00
Dmitriy Zaporozhets 8beb7c886e Different UI colors for archive project and remove project 
Since remove is more danger in compare to archive it good to have them
in different colors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-31 14:21:13 +03:00
Dmitriy Zaporozhets c2c43e6aa1 Small ui improvements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-31 14:00:23 +03:00
Dmitriy Zaporozhets 1a97db413b Simplify issue-box style 2014-05-31 00:41:11 +03:00
Jeroen van Baarsen 3351f15af6 Put back the travis information 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-05-30 23:34:52 +02:00
Jeroen van Baarsen 2314438925 Fix for failing specs 2014-05-30 23:19:50 +02:00
Dmitriy Zaporozhets e02aec6627 Use var colors for panels 2014-05-31 00:13:15 +03:00
Dmitriy Zaporozhets 5ba00d950b Add old ui-box style to panels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-30 23:43:53 +03:00