OSDN Git Service

wvm/gitlab.git
12 years agoMerge pull request #94 from SaitoWu/gitosis
Dmitriy Zaporozhets [Mon, 14 Nov 2011 17:02:09 +0000 (09:02 -0800)]
Merge pull request #94 from SaitoWu/gitosis

fix project new link

12 years agofix project new link
Saito [Mon, 14 Nov 2011 08:15:26 +0000 (16:15 +0800)]
fix project new link

12 years agoMerge remote-tracking branch 'origin/master' into network_graph
Valery Sizov [Sun, 13 Nov 2011 13:57:34 +0000 (15:57 +0200)]
Merge remote-tracking branch 'origin/master' into network_graph

Conflicts:
app/assets/stylesheets/projects.css.scss
lib/commit_ext.rb

12 years agoGraph: small refactoring
Valery Sizov [Sun, 13 Nov 2011 13:31:18 +0000 (15:31 +0200)]
Graph: small refactoring

12 years agoGraph: is done. v1
Valery Sizov [Sun, 13 Nov 2011 13:12:52 +0000 (15:12 +0200)]
Graph: is done. v1

12 years agoGraph: base implementation
Valery Sizov [Sun, 13 Nov 2011 11:58:45 +0000 (13:58 +0200)]
Graph: base implementation

12 years agoGraph: build json
Valery Sizov [Sat, 12 Nov 2011 22:30:51 +0000 (00:30 +0200)]
Graph: build json

12 years agoproject -> show refactor
Dmitriy Zaporozhets [Sat, 12 Nov 2011 14:28:14 +0000 (16:28 +0200)]
project -> show refactor

12 years agoproject avtivity page
Dmitriy Zaporozhets [Sat, 12 Nov 2011 14:19:34 +0000 (16:19 +0200)]
project avtivity page

12 years agoIssue #185 – Show branch name for commits on activities & dashboard pages
Dmitriy Zaporozhets [Sat, 12 Nov 2011 13:18:56 +0000 (15:18 +0200)]
Issue #185 – Show branch name for commits on activities & dashboard pages

12 years agocss refactor
Dmitriy Zaporozhets [Sat, 12 Nov 2011 12:45:32 +0000 (14:45 +0200)]
css refactor

12 years agocss refactor
Dmitriy Zaporozhets [Sat, 12 Nov 2011 11:04:43 +0000 (13:04 +0200)]
css refactor

12 years agotop panel -> search -> css
Dmitriy Zaporozhets [Sat, 12 Nov 2011 10:50:25 +0000 (12:50 +0200)]
top panel -> search -> css

12 years agorefactored top panel spec
Dmitriy Zaporozhets [Sat, 12 Nov 2011 10:42:05 +0000 (12:42 +0200)]
refactored top panel spec

12 years agosnippet table restyle
Dmitriy Zaporozhets [Sat, 12 Nov 2011 10:41:34 +0000 (12:41 +0200)]
snippet table restyle

12 years agoMerge pull request #91 from lukasberns/master
Dmitriy Zaporozhets [Sat, 12 Nov 2011 09:45:51 +0000 (01:45 -0800)]
Merge pull request #91 from lukasberns/master

Add support for custom SSH ports

12 years agoAdd support for custom SSH ports
lukasberns [Fri, 11 Nov 2011 23:30:42 +0000 (08:30 +0900)]
Add support for custom SSH ports

12 years agofixes css
Ricardo Rauch [Fri, 11 Nov 2011 20:04:18 +0000 (17:04 -0300)]
fixes css

12 years agoremove fluiod layout
gitlabhq [Fri, 11 Nov 2011 16:35:51 +0000 (11:35 -0500)]
remove fluiod layout

12 years agofix view mode selection
gitlabhq [Fri, 11 Nov 2011 16:04:32 +0000 (11:04 -0500)]
fix view mode selection

12 years agofixed layout as default
gitlabhq [Fri, 11 Nov 2011 15:57:16 +0000 (10:57 -0500)]
fixed layout as default

12 years agofixed link to issue from project dashboard
gitlabhq [Fri, 11 Nov 2011 15:45:44 +0000 (10:45 -0500)]
fixed link to issue from project dashboard

12 years agoadd fix code align
Dmitriy Zaporozhets [Fri, 11 Nov 2011 08:28:06 +0000 (10:28 +0200)]
add fix code align

12 years agorestored .git-url, truncate project name for thumb
Dmitriy Zaporozhets [Fri, 11 Nov 2011 07:36:01 +0000 (09:36 +0200)]
restored .git-url, truncate project name for thumb

12 years agoMerge pull request #88 from iamntz/master
Dmitriy Zaporozhets [Fri, 11 Nov 2011 07:28:57 +0000 (23:28 -0800)]
Merge pull request #88 from iamntz/master

small UI changes

12 years ago- added notification for users with no ssh key
Staicu Ionut [Fri, 11 Nov 2011 06:13:43 +0000 (08:13 +0200)]
- added notification for users with no ssh key
- moved project urls into input fields to avoid text expanding out of the box (on very long url)
- removed extra markup for header menu arrow (:before ftw!)
- small style changes on url inputs

12 years agocode pre fix
Ricardo Rauch [Fri, 11 Nov 2011 00:00:22 +0000 (21:00 -0300)]
code pre fix

12 years agoMerge branch 'master' of dev.gitlabhq.com:gitlabhq
Ricardo Rauch [Thu, 10 Nov 2011 23:42:18 +0000 (20:42 -0300)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq

12 years agofixing buttons
Ricardo Rauch [Thu, 10 Nov 2011 23:42:01 +0000 (20:42 -0300)]
fixing buttons

12 years agorefactoring project, commits controllers
Dmitriy Zaporozhets [Thu, 10 Nov 2011 23:28:26 +0000 (01:28 +0200)]
refactoring project, commits controllers

12 years agorefactor code: repository.rb
Dmitriy Zaporozhets [Thu, 10 Nov 2011 22:51:19 +0000 (00:51 +0200)]
refactor code: repository.rb

12 years agofixing errors style
Ricardo Rauch [Thu, 10 Nov 2011 22:42:34 +0000 (19:42 -0300)]
fixing errors style

12 years agonew layout for add project
Ricardo Rauch [Thu, 10 Nov 2011 22:24:44 +0000 (19:24 -0300)]
new layout for add project

12 years agoremoved br tag
Dmitriy Zaporozhets [Thu, 10 Nov 2011 22:22:04 +0000 (00:22 +0200)]
removed br tag

12 years agoannotated
Dmitriy Zaporozhets [Thu, 10 Nov 2011 22:08:20 +0000 (00:08 +0200)]
annotated

12 years agofix css
Ricardo Rauch [Thu, 10 Nov 2011 21:57:47 +0000 (18:57 -0300)]
fix css

12 years agoMerge branch 'master' of dev.gitlabhq.com:gitlabhq
Ricardo Rauch [Thu, 10 Nov 2011 21:57:27 +0000 (18:57 -0300)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq

12 years agofixing account box dropdown
Ricardo Rauch [Thu, 10 Nov 2011 21:55:55 +0000 (18:55 -0300)]
fixing account box dropdown

12 years agopreparing to 1.2
Dmitriy Zaporozhets [Thu, 10 Nov 2011 21:40:46 +0000 (23:40 +0200)]
preparing to 1.2

12 years agofixes css
Ricardo Rauch [Thu, 10 Nov 2011 21:15:47 +0000 (18:15 -0300)]
fixes css

12 years agoMerge pull request #85 from SaitoWu/hotfix
Dmitriy Zaporozhets [Thu, 10 Nov 2011 18:08:52 +0000 (10:08 -0800)]
Merge pull request #85 from SaitoWu/hotfix

chmod -x style.scss

12 years agochmod -x style.scss
Saito [Thu, 10 Nov 2011 08:24:11 +0000 (16:24 +0800)]
chmod -x style.scss

12 years agonotes should depends on user when destroy
Dmitriy Zaporozhets [Thu, 10 Nov 2011 07:46:04 +0000 (09:46 +0200)]
notes should depends on user when destroy

12 years ago1. Set Helvetica as primary font; 2. removed tabs
Dmitriy Zaporozhets [Wed, 9 Nov 2011 19:26:24 +0000 (21:26 +0200)]
1. Set Helvetica as primary font; 2. removed tabs

12 years agoShow commits as 'Commit' instead of 'Grit::Commit'
Ariejan de Vroom [Wed, 9 Nov 2011 15:59:51 +0000 (16:59 +0100)]
Show commits as 'Commit' instead of 'Grit::Commit'

Conflicts:

app/helpers/dashboard_helper.rb

12 years agoUse secure.gravatar.com when running over SSL
Ariejan de Vroom [Wed, 9 Nov 2011 14:15:21 +0000 (15:15 +0100)]
Use secure.gravatar.com when running over SSL

12 years agoMoved shoulda to the :test group in Gemfile. This prevennts `rake test`
Ariejan de Vroom [Wed, 9 Nov 2011 13:29:09 +0000 (14:29 +0100)]
Moved shoulda to the :test group in Gemfile. This prevennts `rake test`
from running after every other rake command.

12 years agoMerge branch 'dev'
Dmitriy Zaporozhets [Wed, 9 Nov 2011 18:32:56 +0000 (20:32 +0200)]
Merge branch 'dev'

12 years agoMerge branch 'master' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Wed, 9 Nov 2011 18:32:08 +0000 (20:32 +0200)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq

12 years agoMerge branch 'dev'
Dmitriy Zaporozhets [Wed, 9 Nov 2011 18:31:52 +0000 (20:31 +0200)]
Merge branch 'dev'

12 years agoMerge branch 'master' into dev
Dmitriy Zaporozhets [Wed, 9 Nov 2011 18:30:34 +0000 (20:30 +0200)]
Merge branch 'master' into dev

12 years agoMerge branch 'dev'
Dmitriy Zaporozhets [Wed, 9 Nov 2011 18:29:59 +0000 (20:29 +0200)]
Merge branch 'dev'

Conflicts:
app/helpers/dashboard_helper.rb

12 years agoMerge branch 'dev'
Dmitriy Zaporozhets [Wed, 9 Nov 2011 16:47:53 +0000 (18:47 +0200)]
Merge branch 'dev'

12 years agoMerge pull request #81 from ariejan/fix_for_dashboard_grit_commit
Dmitriy Zaporozhets [Wed, 9 Nov 2011 16:05:47 +0000 (08:05 -0800)]
Merge pull request #81 from ariejan/fix_for_dashboard_grit_commit

Show commits as 'Commit' instead of 'Grit::Commit'

12 years agoShow commits as 'Commit' instead of 'Grit::Commit'
Ariejan de Vroom [Wed, 9 Nov 2011 15:59:51 +0000 (16:59 +0100)]
Show commits as 'Commit' instead of 'Grit::Commit'

12 years agoMerge pull request #78 from ariejan/fix_gemfile_shoulda
Dmitriy Zaporozhets [Wed, 9 Nov 2011 14:24:27 +0000 (06:24 -0800)]
Merge pull request #78 from ariejan/fix_gemfile_shoulda

Moved shoulda to the :test group in Gemfile.

12 years agoMerge pull request #79 from ariejan/fix_https_gravatar
Dmitriy Zaporozhets [Wed, 9 Nov 2011 14:23:53 +0000 (06:23 -0800)]
Merge pull request #79 from ariejan/fix_https_gravatar

Use secure.gravatar.com when running over SSL

12 years agoUse secure.gravatar.com when running over SSL
Ariejan de Vroom [Wed, 9 Nov 2011 14:15:21 +0000 (15:15 +0100)]
Use secure.gravatar.com when running over SSL

12 years agofix elsif statement
Nihad Abbasov [Wed, 9 Nov 2011 13:53:15 +0000 (17:53 +0400)]
fix elsif statement

12 years agoMoved shoulda to the :test group in Gemfile. This prevennts `rake test`
Ariejan de Vroom [Wed, 9 Nov 2011 13:29:09 +0000 (14:29 +0100)]
Moved shoulda to the :test group in Gemfile. This prevennts `rake test`
from running after every other rake command.

12 years agodashboard beautify
gitlabhq [Wed, 9 Nov 2011 11:37:01 +0000 (06:37 -0500)]
dashboard beautify

12 years agoproject dashboard updated
Dmitriy Zaporozhets [Tue, 8 Nov 2011 23:56:10 +0000 (01:56 +0200)]
project dashboard updated

12 years agoMerge branch 'issue-184' into dev
Aleksei Kvitinskii [Tue, 8 Nov 2011 21:19:42 +0000 (23:19 +0200)]
Merge branch 'issue-184' into dev

Conflicts:
app/views/layouts/project.html.haml
app/views/projects/_form.html.haml

12 years agoimplemented cookie remember option for issue page filter
Aleksei Kvitinskii [Tue, 8 Nov 2011 21:02:57 +0000 (23:02 +0200)]
implemented cookie remember option for issue page filter

12 years agoMerge branch 'dev'
gitlabhq [Tue, 8 Nov 2011 17:26:28 +0000 (12:26 -0500)]
Merge branch 'dev'

12 years agoproject form fixed
gitlabhq [Tue, 8 Nov 2011 17:23:13 +0000 (12:23 -0500)]
project form fixed

12 years agofix typo
Aleksei Kvitinskii [Mon, 7 Nov 2011 22:02:50 +0000 (00:02 +0200)]
fix typo

12 years agoMerge branch 'dev'
Dmitriy Zaporozhets [Mon, 7 Nov 2011 21:22:25 +0000 (23:22 +0200)]
Merge branch 'dev'

12 years agorestored sortable ability
Dmitriy Zaporozhets [Mon, 7 Nov 2011 20:48:55 +0000 (22:48 +0200)]
restored sortable ability

12 years agoMerge branch 'issues_restyle' into dev
Dmitriy Zaporozhets [Mon, 7 Nov 2011 20:32:01 +0000 (22:32 +0200)]
Merge branch 'issues_restyle' into dev

12 years agofixed tests
Dmitriy Zaporozhets [Mon, 7 Nov 2011 20:31:51 +0000 (22:31 +0200)]
fixed tests

12 years agofix typo in the template
Aleksei Kvitinskii [Mon, 7 Nov 2011 19:39:24 +0000 (21:39 +0200)]
fix typo in the template

12 years agoMerge branch 'dev' into issue-184
Aleksei Kvitinskii [Mon, 7 Nov 2011 19:29:28 +0000 (21:29 +0200)]
Merge branch 'dev' into issue-184

Conflicts:
app/views/layouts/project.html.haml

12 years agoadd tags to admin project form
Aleksei Kvitinskii [Mon, 7 Nov 2011 18:38:54 +0000 (20:38 +0200)]
add tags to admin project form

12 years agocorrect padding in user, keys, password forms
Aleksei Kvitinskii [Mon, 7 Nov 2011 18:37:32 +0000 (20:37 +0200)]
correct padding in user, keys, password forms

12 years agocorrect padding in issue form and in profile form
Aleksei Kvitinskii [Mon, 7 Nov 2011 18:21:42 +0000 (20:21 +0200)]
correct padding in issue form and in profile form

12 years agoadd tag links to project page
Aleksei Kvitinskii [Mon, 7 Nov 2011 17:48:58 +0000 (19:48 +0200)]
add tag links to project page

12 years agoissues table header
gitlabhq [Mon, 7 Nov 2011 16:31:05 +0000 (11:31 -0500)]
issues table header

12 years agoissue restyle example
gitlabhq [Mon, 7 Nov 2011 15:55:16 +0000 (10:55 -0500)]
issue restyle example

12 years agoimplemented cookie remember option for issue page filter
Aleksei Kvitinskii [Mon, 7 Nov 2011 12:12:46 +0000 (14:12 +0200)]
implemented cookie remember option for issue page filter

12 years agomove tag path to the appropriate helper
Aleksei Kvitinskii [Mon, 7 Nov 2011 11:40:22 +0000 (13:40 +0200)]
move tag path to the appropriate helper

12 years agoMerge branch 'dev' into issue-184
Aleksei Kvitinskii [Mon, 7 Nov 2011 09:20:20 +0000 (11:20 +0200)]
Merge branch 'dev' into issue-184

12 years agolil css style
Dmitriy Zaporozhets [Sun, 6 Nov 2011 22:24:09 +0000 (00:24 +0200)]
lil css style

12 years agofixed duplicate on wall
Dmitriy Zaporozhets [Sun, 6 Nov 2011 21:32:37 +0000 (23:32 +0200)]
fixed duplicate on wall

12 years agoMerge branch 'dev' into gh_master
Dmitriy Zaporozhets [Sun, 6 Nov 2011 21:13:52 +0000 (23:13 +0200)]
Merge branch 'dev' into gh_master

12 years agoMerge branch 'master' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Sun, 6 Nov 2011 20:54:17 +0000 (22:54 +0200)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq

12 years agoMerge branch 'dev'
Dmitriy Zaporozhets [Sun, 6 Nov 2011 20:53:54 +0000 (22:53 +0200)]
Merge branch 'dev'

12 years agofixed 1click repo url selection
Dmitriy Zaporozhets [Sun, 6 Nov 2011 20:53:36 +0000 (22:53 +0200)]
fixed 1click repo url selection

12 years agoImproved commit author detection
Dmitriy Zaporozhets [Sun, 6 Nov 2011 20:38:08 +0000 (22:38 +0200)]
Improved commit author detection

12 years agolink to author on tree view item
Dmitriy Zaporozhets [Sun, 6 Nov 2011 20:21:48 +0000 (22:21 +0200)]
link to author on tree view item

12 years agofix small bug in top menu (buttons change height on press in chrome)
Aleksei Kvitinskii [Sun, 6 Nov 2011 19:43:34 +0000 (21:43 +0200)]
fix small bug in top menu (buttons change height on press in chrome)

12 years agofixed conflicts
Dmitriy Zaporozhets [Sun, 6 Nov 2011 19:12:23 +0000 (21:12 +0200)]
fixed conflicts

12 years agoMerge branch 'dev'
Dmitriy Zaporozhets [Sun, 6 Nov 2011 19:07:56 +0000 (21:07 +0200)]
Merge branch 'dev'

Conflicts:
app/assets/images/ajax-loader.gif
public/favicon.ico

12 years agocorrect html on project page
Aleksei Kvitinskii [Sun, 6 Nov 2011 18:48:21 +0000 (20:48 +0200)]
correct html on project page

12 years agocorrect html on project page
Aleksei Kvitinskii [Sun, 6 Nov 2011 18:48:21 +0000 (20:48 +0200)]
correct html on project page

12 years agoMerge branch 'dev' into issue-184
Aleksei Kvitinskii [Sun, 6 Nov 2011 17:22:25 +0000 (19:22 +0200)]
Merge branch 'dev' into issue-184

12 years agoMerge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev
Aleksei Kvitinskii [Sun, 6 Nov 2011 17:21:51 +0000 (19:21 +0200)]
Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev

12 years agolil design changes
Dmitriy Zaporozhets [Sun, 6 Nov 2011 13:52:23 +0000 (15:52 +0200)]
lil design changes

12 years agoImplement tags cloud support for projects
Aleksei Kvitinskii [Sat, 5 Nov 2011 20:21:03 +0000 (22:21 +0200)]
Implement tags cloud support for projects

12 years agoMerge branch 'dev' into issue-184
Aleksei Kvitinskii [Sat, 5 Nov 2011 20:21:03 +0000 (22:21 +0200)]
Merge branch 'dev' into issue-184