gitorious:mainline.git
7 years agoAdd new action for repository browser
Marko Peltola [Tue, 8 Jun 2010 12:36:48 +0000 (15:36 +0300)]
Add new action for repository browser

- new action in controller: browser
- new method in model: most_active_recently

Signed-off-by: Marko Peltola <marko.peltola@jyu.fi>
7 years agoDon't attempt to show "Clone of" link if there's no parent
Johan Sørensen [Mon, 7 Jun 2010 10:28:12 +0000 (12:28 +0200)]
Don't attempt to show "Clone of" link if there's no parent

7 years agoFaster and cached projects#show events pagination
Johan Sørensen [Mon, 7 Jun 2010 08:09:54 +0000 (10:09 +0200)]
Faster and cached projects#show events pagination

7 years agofixed failing test
Johan Sørensen [Mon, 7 Jun 2010 08:09:39 +0000 (10:09 +0200)]
fixed failing test

7 years agoRemove deprecation warning from will_paginate
Johan Sørensen [Mon, 7 Jun 2010 07:25:27 +0000 (09:25 +0200)]
Remove deprecation warning from will_paginate

7 years ago@page_title is set in the view
Johan Sørensen [Mon, 7 Jun 2010 07:24:20 +0000 (09:24 +0200)]
@page_title is set in the view

7 years agoCache User#paginated_events_in_watchlist
Johan Sørensen [Mon, 7 Jun 2010 06:58:59 +0000 (08:58 +0200)]
Cache User#paginated_events_in_watchlist

7 years agoMerge branch 'master' of git.shortcut.no:gitorious/gitorious
Ole Martin Kristiansen [Wed, 2 Jun 2010 08:13:29 +0000 (10:13 +0200)]
Merge branch 'master' of git.shortcut.no:gitorious/gitorious

7 years agoFixed a bug with the repository button "Clone of", added it below the Branches list.
Ole Martin Kristiansen [Wed, 2 Jun 2010 08:12:22 +0000 (10:12 +0200)]
Fixed a bug with the repository button "Clone of", added it below the Branches list.

Fixed error feedback on register page.

7 years agoMade the toggling of favorites change the text properly on success
Johan Sørensen [Tue, 1 Jun 2010 14:03:27 +0000 (16:03 +0200)]
Made the toggling of favorites change the text properly on success

7 years agosubmodule ref bump
Johan Sørensen [Tue, 1 Jun 2010 11:43:09 +0000 (13:43 +0200)]
submodule ref bump

7 years agoMerge commit 'refs/merge-requests/95' of git://gitorious.org/gitorious/mainline
Johan Sørensen [Tue, 1 Jun 2010 10:56:29 +0000 (12:56 +0200)]
Merge commit 'refs/merge-requests/95' of git://gitorious.org/gitorious/mainline

* git://gitorious.org/gitorious/mainline:
  Allow specifying categories with only a comma as separator

7 years agoMerge commit 'refs/merge-requests/108' of git://gitorious.org/gitorious/mainline
Johan Sørensen [Tue, 1 Jun 2010 10:47:18 +0000 (12:47 +0200)]
Merge commit 'refs/merge-requests/108' of git://gitorious.org/gitorious/mainline

* git://gitorious.org/gitorious/mainline:
  Remove "User Management" button from user admin page

7 years agoMerge commit 'refs/merge-requests/107' of git://gitorious.org/gitorious/mainline
Johan Sørensen [Tue, 1 Jun 2010 10:46:22 +0000 (12:46 +0200)]
Merge commit 'refs/merge-requests/107' of git://gitorious.org/gitorious/mainline

* git://gitorious.org/gitorious/mainline:
  Link to user URL correctly on profile page

7 years agoFix to team activity
Ole Martin Kristiansen [Tue, 1 Jun 2010 08:55:13 +0000 (10:55 +0200)]
Fix to team activity

7 years agoEdit project form width fix
Ole Martin Kristiansen [Tue, 1 Jun 2010 08:41:56 +0000 (10:41 +0200)]
Edit project form width fix

7 years agoAdded new files to commit
Ole Martin Kristiansen [Tue, 1 Jun 2010 08:32:55 +0000 (10:32 +0200)]
Added new files to commit

7 years agoAdjustments to the search results page.
Ole Martin Kristiansen [Tue, 1 Jun 2010 08:27:48 +0000 (10:27 +0200)]
Adjustments to the search results page.

7 years agoFixes to search field in top bar in IE7. Restyled the search results page.
Ole Martin Kristiansen [Tue, 1 Jun 2010 08:10:31 +0000 (10:10 +0200)]
Fixes to search field in top bar in IE7. Restyled the search results page.

7 years agoRedesigned frontpage to fit 960px screen resolution. Moved project description to...
Ole Martin Kristiansen [Tue, 1 Jun 2010 07:40:07 +0000 (09:40 +0200)]
Redesigned frontpage to fit 960px screen resolution. Moved project description to main content column.

7 years agoRemoved 'Explore'- link until site is fixed
Ole Martin Kristiansen [Mon, 31 May 2010 09:28:32 +0000 (11:28 +0200)]
Removed 'Explore'- link until site is fixed

7 years agoAdded links to featured project images
Ole Martin Kristiansen [Mon, 31 May 2010 09:27:22 +0000 (11:27 +0200)]
Added links to featured project images

7 years agoCleared out the background so it was 100% white.
Ole Martin Kristiansen [Mon, 31 May 2010 08:20:56 +0000 (10:20 +0200)]
Cleared out the background so it was 100% white.

7 years agoSmall CSS width fix to content-container
Ole Martin Kristiansen [Mon, 31 May 2010 08:18:00 +0000 (10:18 +0200)]
Small CSS width fix to content-container

7 years agoRemove "User Management" button from user admin page 108
Peter Kjellerstedt [Fri, 28 May 2010 12:23:26 +0000 (14:23 +0200)]
Remove "User Management" button from user admin page

The "User Management" button on the user administration page links back
to the user administration page which makes it kind of pointless.

7 years agoLink to user URL correctly on profile page 107
Peter Kjellerstedt [Fri, 28 May 2010 08:34:09 +0000 (10:34 +0200)]
Link to user URL correctly on profile page

7 years agoAllow specifying categories with only a comma as separator 95
Peter Kjellerstedt [Fri, 9 Apr 2010 15:56:52 +0000 (17:56 +0200)]
Allow specifying categories with only a comma as separator

Previously it was required to follow the comma with a space, or
"cat1,cat2" would be turned into "cat1cat2" instead of "cat1 cat2".

7 years agoMerge branch 'master' of git.shortcut.no:gitorious/gitorious
Ole Martin Kristiansen [Tue, 25 May 2010 12:03:48 +0000 (14:03 +0200)]
Merge branch 'master' of git.shortcut.no:gitorious/gitorious

Conflicts:
app/views/repositories/_clone_urls.html.erb

7 years agoUse local variable
Ole Martin Kristiansen [Tue, 25 May 2010 12:02:09 +0000 (14:02 +0200)]
Use local variable

7 years agoFix to the exterior front page in IE7
Ole Martin Kristiansen [Tue, 25 May 2010 09:09:45 +0000 (11:09 +0200)]
Fix to the exterior front page in IE7

7 years agoStyled some sidebar content
Ole Martin Kristiansen [Tue, 25 May 2010 09:08:39 +0000 (11:08 +0200)]
Styled some sidebar content

7 years agoMade 'Clone this repository' more prominent (in the repo-box)
Ole Martin Kristiansen [Tue, 25 May 2010 09:06:55 +0000 (11:06 +0200)]
Made 'Clone this repository' more prominent (in the repo-box)

7 years ago404.html fix (it's now dynamic). Fix to source code padding bug.
Ole Martin Kristiansen [Tue, 25 May 2010 08:45:56 +0000 (10:45 +0200)]
404.html fix (it's now dynamic). Fix to source code padding bug.

7 years agoConsistently use the term "Label" instead of "Category"
Marius Mathiesen [Fri, 21 May 2010 13:20:02 +0000 (15:20 +0200)]
Consistently use the term "Label" instead of "Category"

7 years agosmaller chunked branch list
Johan Sørensen [Fri, 21 May 2010 13:13:23 +0000 (15:13 +0200)]
smaller chunked branch list

7 years agoDon't set width of the repository getting started partial
Johan Sørensen [Fri, 21 May 2010 13:02:19 +0000 (15:02 +0200)]
Don't set width of the repository getting started partial

7 years agoMake clone url field larger if push url isn't shown
Johan Sørensen [Fri, 21 May 2010 12:54:10 +0000 (14:54 +0200)]
Make clone url field larger if push url isn't shown

7 years agoSmall css fixes
Ole Martin Kristiansen [Fri, 21 May 2010 12:49:28 +0000 (14:49 +0200)]
Small css fixes

7 years agoMerge remote branch 'origin/master'
Ole Martin Kristiansen [Fri, 21 May 2010 12:30:10 +0000 (14:30 +0200)]
Merge remote branch 'origin/master'

7 years agoBranches width fix
Ole Martin Kristiansen [Fri, 21 May 2010 12:29:21 +0000 (14:29 +0200)]
Branches width fix

7 years agoFix to main header
Ole Martin Kristiansen [Fri, 21 May 2010 12:27:57 +0000 (14:27 +0200)]
Fix to main header

7 years agoBring back blog feed on Site#public_index and fix issue with Time#to_s
Johan Sørensen [Fri, 21 May 2010 11:29:30 +0000 (13:29 +0200)]
Bring back blog feed on Site#public_index and fix issue with Time#to_s

7 years agoCorrected events image sprites
Johan Sørensen [Fri, 21 May 2010 11:06:05 +0000 (13:06 +0200)]
Corrected events image sprites

7 years agoDashboard/profile activity list size fix
Ole Martin Kristiansen [Fri, 21 May 2010 11:51:13 +0000 (13:51 +0200)]
Dashboard/profile activity list size fix

7 years agoSmall css adjustments and preview button fix on Wiki
Ole Martin Kristiansen [Fri, 21 May 2010 11:35:53 +0000 (13:35 +0200)]
Small css adjustments and preview button fix on Wiki

7 years agoChanged copy for Administration table
Ole Martin Kristiansen [Fri, 21 May 2010 11:04:13 +0000 (13:04 +0200)]
Changed copy for Administration table

7 years agoSpelling fix on events.png
Ole Martin Kristiansen [Fri, 21 May 2010 11:01:54 +0000 (13:01 +0200)]
Spelling fix on events.png

7 years agoFix to collaborators table and form
Ole Martin Kristiansen [Fri, 21 May 2010 09:16:23 +0000 (11:16 +0200)]
Fix to collaborators table and form

7 years agoMerge remote branch 'origin/master'
Ole Martin Kristiansen [Fri, 21 May 2010 08:56:25 +0000 (10:56 +0200)]
Merge remote branch 'origin/master'

7 years agoChanged the layout width to 960px to accommodate smaller resolutions and browser...
Ole Martin Kristiansen [Fri, 21 May 2010 08:54:56 +0000 (10:54 +0200)]
Changed the layout width to 960px to accommodate smaller resolutions and browser windows

7 years agoMajor change from 1100 to 960 grid. Small fixes on front page, adjustments to overall...
Ole Martin Kristiansen [Thu, 20 May 2010 12:39:31 +0000 (14:39 +0200)]
Major change from 1100 to 960 grid. Small fixes on front page, adjustments to overall pull-boxes, tables etc.

7 years agoFix layout in .select_commits_from_list in MergeRequest#new
Johan Sørensen [Thu, 20 May 2010 11:05:56 +0000 (13:05 +0200)]
Fix layout in .select_commits_from_list in MergeRequest#new

7 years agoWidth fix for external form inputs
Ole Martin Kristiansen [Thu, 20 May 2010 08:41:50 +0000 (10:41 +0200)]
Width fix for external form inputs

7 years agoExternal form padding fix and terms of service label fix, commit_message width fix.
Ole Martin Kristiansen [Thu, 20 May 2010 08:40:06 +0000 (10:40 +0200)]
External form padding fix and terms of service label fix, commit_message width fix.

7 years agoMerge commit 'refs/merge-requests/2210' of git://gitorious.org/gitorious/mainline
Johan Sørensen [Thu, 20 May 2010 08:35:37 +0000 (10:35 +0200)]
Merge commit 'refs/merge-requests/2210' of git://gitorious.org/gitorious/mainline

* git://gitorious.org/gitorious/mainline:
  A little clean up of the contact information
  Make the support email address configurable

7 years agoAlso filter password_confirmation params
Johan Sørensen [Thu, 20 May 2010 08:31:59 +0000 (10:31 +0200)]
Also filter password_confirmation params

7 years agoMerge commit 'refs/merge-requests/2213' of git://gitorious.org/gitorious/mainline
Johan Sørensen [Thu, 20 May 2010 08:31:31 +0000 (10:31 +0200)]
Merge commit 'refs/merge-requests/2213' of git://gitorious.org/gitorious/mainline

* git://gitorious.org/gitorious/mainline:
  Filter passwords from logs

7 years agoMerge commit 'refs/merge-requests/102' of git://gitorious.org/gitorious/mainline
Johan Sørensen [Thu, 20 May 2010 08:30:40 +0000 (10:30 +0200)]
Merge commit 'refs/merge-requests/102' of git://gitorious.org/gitorious/mainline

* git://gitorious.org/gitorious/mainline:
  Fixed jQuery selector for avatar deletion form.

Conflicts:
app/views/groups/edit.html.erb
app/views/users/edit.html.erb

7 years agoMerge commit 'refs/merge-requests/2214' of git://gitorious.org/gitorious/mainline
Johan Sørensen [Thu, 20 May 2010 08:25:59 +0000 (10:25 +0200)]
Merge commit 'refs/merge-requests/2214' of git://gitorious.org/gitorious/mainline

* git://gitorious.org/gitorious/mainline:
  Fix autocompletion for committerships, memberships and message recipients.

7 years agoFixes to event icons and date width
Ole Martin Kristiansen [Thu, 20 May 2010 08:18:07 +0000 (10:18 +0200)]
Fixes to event icons and date width

7 years agoDo 0322e137b71 correctly
Johan Sørensen [Wed, 19 May 2010 14:18:02 +0000 (16:18 +0200)]
Do 0322e137b71 correctly

7 years agoUppercase OpenSUSE featured project name
Johan Sørensen [Wed, 19 May 2010 14:16:19 +0000 (16:16 +0200)]
Uppercase OpenSUSE featured project name

7 years agopoint to ivar
Johan Sørensen [Wed, 19 May 2010 14:11:36 +0000 (16:11 +0200)]
point to ivar

7 years agoPUT to proper path when resetting password
Johan Sørensen [Wed, 19 May 2010 14:08:01 +0000 (16:08 +0200)]
PUT to proper path when resetting password

7 years agoSubmodule ref bump
Johan Sørensen [Wed, 19 May 2010 13:53:11 +0000 (15:53 +0200)]
Submodule ref bump

7 years agoIt's a good idea to spell your own project name correctly
Johan Sørensen [Wed, 19 May 2010 13:48:00 +0000 (15:48 +0200)]
It's a good idea to spell your own project name correctly

7 years agoadd back extra_html_head_data
Johan Sørensen [Wed, 19 May 2010 13:29:58 +0000 (15:29 +0200)]
add back extra_html_head_data

7 years agoDon't add extra padding to .codediffs
Johan Sørensen [Wed, 19 May 2010 13:26:31 +0000 (15:26 +0200)]
Don't add extra padding to .codediffs

7 years agoFixed invalid html comment
Johan Sørensen [Wed, 19 May 2010 13:15:55 +0000 (15:15 +0200)]
Fixed invalid html comment

7 years agoSkip Courier for monospaced content
Johan Sørensen [Wed, 19 May 2010 13:09:11 +0000 (15:09 +0200)]
Skip Courier for monospaced content

7 years agoShorter excerpts from blog.gitorious.org
Johan Sørensen [Wed, 19 May 2010 12:58:20 +0000 (14:58 +0200)]
Shorter excerpts from blog.gitorious.org

7 years agoFix links and TAVs name on Site#public_index
Johan Sørensen [Wed, 19 May 2010 12:56:50 +0000 (14:56 +0200)]
Fix links and TAVs name on Site#public_index

7 years agoFix autocompletion for committerships, memberships and message recipients.
Juho Nieminen [Mon, 26 Apr 2010 09:57:50 +0000 (12:57 +0300)]
Fix autocompletion for committerships, memberships and message recipients.

Signed-off-by: Tero Hanninen <tero.j.hanninen@jyu.fi>
7 years agoMerge remote branch 'grace/master'
Johan Sørensen [Wed, 19 May 2010 11:54:52 +0000 (13:54 +0200)]
Merge remote branch 'grace/master'

* grace/master:
  Adding the Boost Public License to the list of project licenses
  Serve raw blobs as attachments.
  Gracefully handle Git timeouts when displaying merge requests.

7 years agoFixed header link to activities
Johan Sørensen [Wed, 19 May 2010 11:52:44 +0000 (13:52 +0200)]
Fixed header link to activities

7 years agoAdded a dumb & simple blog entry parser to Site#public_index
Johan Sørensen [Wed, 19 May 2010 11:48:26 +0000 (13:48 +0200)]
Added a dumb & simple blog entry parser to Site#public_index

7 years agoUpdated Site#public_index texts
Johan Sørensen [Wed, 19 May 2010 11:25:34 +0000 (13:25 +0200)]
Updated Site#public_index texts

7 years agoDon't fetch objects we don't use in Site#public_index
Johan Sørensen [Wed, 19 May 2010 11:18:24 +0000 (13:18 +0200)]
Don't fetch objects we don't use in Site#public_index

7 years agoFixed jQuery selector for avatar deletion form. 102
Heikki Salo [Thu, 15 Apr 2010 16:21:58 +0000 (19:21 +0300)]
Fixed jQuery selector for avatar deletion form.

The previous selector was 'delete_avatar' which I think tries to select
delete_avatar HTML elements, not HTML elements with delete_avatar id.

Signed-off-by: Heikki Salo <heikki.ao.salo@iki.fi>
7 years agoFilter passwords from logs 2213
Marko Peltola [Tue, 18 May 2010 12:01:05 +0000 (15:01 +0300)]
Filter passwords from logs

Signed-off-by: Marko Peltola <marko.peltola@jyu.fi>
7 years agoSlightly larger slice point for the JS expanders
Johan Sørensen [Tue, 18 May 2010 11:55:43 +0000 (13:55 +0200)]
Slightly larger slice point for the JS expanders

7 years agoBring back the clone+push help texts
Johan Sørensen [Tue, 18 May 2010 11:50:08 +0000 (13:50 +0200)]
Bring back the clone+push help texts

7 years agoFixed CSS and markup for the user events
Johan Sørensen [Tue, 18 May 2010 11:18:58 +0000 (13:18 +0200)]
Fixed CSS and markup for the user events

7 years agoOnly show the push url if writable_by? current_user, if so make it selected by default
Johan Sørensen [Tue, 18 May 2010 10:36:31 +0000 (12:36 +0200)]
Only show the push url if writable_by? current_user, if so make it selected by default

7 years agoUse rails' helpers for linking stylesheets, as opposed to @import statements
Johan Sørensen [Tue, 18 May 2010 10:09:39 +0000 (12:09 +0200)]
Use rails' helpers for linking stylesheets, as opposed to @import statements

so we can use rails' timestamping of resources and concationation

7 years agoSmall CSS tweak
Johan Sørensen [Tue, 18 May 2010 10:06:54 +0000 (12:06 +0200)]
Small CSS tweak

7 years agoFront page changes as well as Push url changes
Ole Martin Kristiansen [Tue, 18 May 2010 08:26:45 +0000 (10:26 +0200)]
Front page changes as well as Push url changes

7 years agoAdding the Boost Public License to the list of project licenses
Marius Mathiesen [Fri, 14 May 2010 09:16:42 +0000 (11:16 +0200)]
Adding the Boost Public License to the list of project licenses

7 years agoServe raw blobs as attachments.
Marius Mathiesen [Fri, 14 May 2010 08:20:52 +0000 (10:20 +0200)]
Serve raw blobs as attachments.

This fixes some issues where Word documents inside Internet Explorer would
trigger proprietary HTTP requests to the server.

7 years agoMerge remote branch 'js/redesign'
Ole Martin Kristiansen [Wed, 12 May 2010 12:11:34 +0000 (14:11 +0200)]
Merge remote branch 'js/redesign'

7 years agoSmall CSS adjustments
Ole Martin Kristiansen [Wed, 12 May 2010 12:10:38 +0000 (14:10 +0200)]
Small CSS adjustments

7 years agoTone down the author links in the event listings
Johan Sørensen [Wed, 12 May 2010 12:09:54 +0000 (14:09 +0200)]
Tone down the author links in the event listings

7 years agoTweaked texts and css
Ole Martin Kristiansen [Wed, 12 May 2010 08:27:16 +0000 (10:27 +0200)]
Tweaked texts and css

7 years agoRemoved static mock html
Ole Martin Kristiansen [Wed, 12 May 2010 08:26:41 +0000 (10:26 +0200)]
Removed static mock html

7 years agoonly show memberships link, if project is owned by a group
Johan Sørensen [Wed, 12 May 2010 08:22:05 +0000 (10:22 +0200)]
only show memberships link, if project is owned by a group

7 years agoAdd back password field on users/new
Johan Sørensen [Wed, 12 May 2010 08:01:09 +0000 (10:01 +0200)]
Add back password field on users/new

7 years agoUse the existing .errorExplanation css class
Johan Sørensen [Wed, 12 May 2010 07:58:03 +0000 (09:58 +0200)]
Use the existing .errorExplanation css class

7 years agoRemove double login input element and make second_generation layout use our JS helper
Johan Sørensen [Wed, 12 May 2010 07:53:30 +0000 (09:53 +0200)]
Remove double login input element and make second_generation layout use our JS helper

7 years agoLoad jquery.expander before we use it
Johan Sørensen [Tue, 11 May 2010 15:14:44 +0000 (17:14 +0200)]
Load jquery.expander before we use it

7 years agoupdated events.png
Johan Sørensen [Tue, 11 May 2010 14:52:53 +0000 (16:52 +0200)]
updated events.png