gitorious:gitorious-fiit-mainline.git
6 years agoSimplify authenticators structure (remove authenticator module)
Ivan Plesko [Mon, 21 Mar 2011 08:21:14 +0000 (09:21 +0100)]
Simplify authenticators structure (remove authenticator module)

6 years agoAdd tests for authenticators
Ivan Plesko [Sun, 20 Mar 2011 15:28:25 +0000 (16:28 +0100)]
Add tests for authenticators

6 years agoRename 'login' field back to 'email'
Ivan Plesko [Sun, 20 Mar 2011 11:40:48 +0000 (12:40 +0100)]
Rename 'login' field back to 'email'

6 years agoFix label
Ivan Plesko [Sun, 20 Mar 2011 11:36:43 +0000 (12:36 +0100)]
Fix label

6 years agoFront-end changes for authentication
Ivan Plesko [Wed, 9 Mar 2011 14:17:08 +0000 (15:17 +0100)]
Front-end changes for authentication

6 years agoMake user confirm terms of use and fill email after ldap login
Ivan Plesko [Mon, 7 Mar 2011 19:00:23 +0000 (20:00 +0100)]
Make user confirm terms of use and fill email after ldap login

6 years agoEdits related to new authentication system
Ivan Plesko [Mon, 7 Mar 2011 15:04:24 +0000 (16:04 +0100)]
Edits related to new authentication system

This commit fixes bugs found by tests.

6 years agoTest new authentication system correctly
Ivan Plesko [Mon, 7 Mar 2011 15:01:10 +0000 (16:01 +0100)]
Test new authentication system correctly

6 years agoHandle LDAP errors correctly
Ivan Plesko [Sun, 6 Mar 2011 15:17:09 +0000 (16:17 +0100)]
Handle LDAP errors correctly

6 years agoAuthenticators refactoring
ivo [Sat, 5 Mar 2011 21:41:21 +0000 (22:41 +0100)]
Authenticators refactoring

6 years agoFix typo error
ivo [Sat, 5 Mar 2011 17:11:30 +0000 (18:11 +0100)]
Fix typo error

6 years agoLDAP login: make user e-mail domain configurable
ivo [Thu, 3 Mar 2011 18:11:22 +0000 (19:11 +0100)]
LDAP login: make user e-mail domain configurable

6 years agoPut authenticators configuration into array
ivo [Mon, 28 Feb 2011 11:10:24 +0000 (12:10 +0100)]
Put authenticators configuration into array

6 years agoAdd LDAP login method and make login methods configurable
ivo [Mon, 28 Feb 2011 10:04:08 +0000 (11:04 +0100)]
Add LDAP login method and make login methods configurable

6 years agoWiki UI updates
Marius Mathiesen [Tue, 15 Feb 2011 13:21:23 +0000 (14:21 +0100)]
Wiki UI updates

- Add a sidebar to all pages
- Provide link to git access instructions w/separate controller action

6 years agoMerge commit 'refs/merge-requests/2205' of gitorious.org:gitorious/mainline
Marius Mathiesen [Mon, 14 Feb 2011 14:25:59 +0000 (15:25 +0100)]
Merge commit 'refs/merge-requests/2205' of gitorious.org:gitorious/mainline

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Marius Mathiesen [Mon, 14 Feb 2011 14:23:04 +0000 (15:23 +0100)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoSlightly improved readability of session domain name check
Marius Mathiesen [Mon, 14 Feb 2011 14:18:32 +0000 (15:18 +0100)]
Slightly improved readability of session domain name check

6 years agoMerge commit 'refs/merge-requests/2206' of gitorious.org:gitorious/mainline into...
Marius Mathiesen [Mon, 14 Feb 2011 14:06:35 +0000 (15:06 +0100)]
Merge commit 'refs/merge-requests/2206' of gitorious.org:gitorious/mainline into merge-requests/2206

6 years agoMerge request #83, resolve conflict
Christian Johansen [Sat, 12 Feb 2011 22:10:49 +0000 (23:10 +0100)]
Merge request #83, resolve conflict

6 years agoMerge commit 'refs/merge-requests/84' of git://gitorious.org/gitorious/mainline into...
Christian Johansen [Sat, 12 Feb 2011 21:59:21 +0000 (22:59 +0100)]
Merge commit 'refs/merge-requests/84' of git://gitorious.org/gitorious/mainline into merge-requests/84

6 years agoMerge commit 'refs/merge-requests/101' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Sat, 12 Feb 2011 21:56:45 +0000 (22:56 +0100)]
Merge commit 'refs/merge-requests/101' of git://gitorious.org/gitorious/mainline into merge-requests/101

6 years agoMerge commit 'refs/merge-requests/122' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Sat, 12 Feb 2011 21:37:40 +0000 (22:37 +0100)]
Merge commit 'refs/merge-requests/122' of git://gitorious.org/gitorious/mainline into merge-requests/122

6 years agoMerge commit 'refs/merge-requests/133' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Sat, 12 Feb 2011 21:24:53 +0000 (22:24 +0100)]
Merge commit 'refs/merge-requests/133' of git://gitorious.org/gitorious/mainline into merge-requests/133

6 years agoMerge commit 'refs/merge-requests/134' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Sat, 12 Feb 2011 21:23:21 +0000 (22:23 +0100)]
Merge commit 'refs/merge-requests/134' of git://gitorious.org/gitorious/mainline into merge-requests/134

6 years agoMerge commit 'refs/merge-requests/135' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Sat, 12 Feb 2011 21:21:20 +0000 (22:21 +0100)]
Merge commit 'refs/merge-requests/135' of git://gitorious.org/gitorious/mainline into merge-requests/135

6 years agoMerge commit 'refs/merge-requests/141' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Sat, 12 Feb 2011 21:19:54 +0000 (22:19 +0100)]
Merge commit 'refs/merge-requests/141' of git://gitorious.org/gitorious/mainline into merge-requests/141

6 years agoMerge commit 'refs/merge-requests/2225' of git://gitorious.org/gitorious/mainline...
Christian Johansen [Sat, 12 Feb 2011 21:06:51 +0000 (22:06 +0100)]
Merge commit 'refs/merge-requests/2225' of git://gitorious.org/gitorious/mainline into merge-requests/2225

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Christian Johansen [Fri, 11 Feb 2011 12:13:01 +0000 (13:13 +0100)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoDescribe changed links on trees page in changelog loba-loba
Christian Johansen [Fri, 11 Feb 2011 10:04:26 +0000 (11:04 +0100)]
Describe changed links on trees page in changelog

6 years agoLet the users set whether they by default want favorites to trigger email.
Marius Mathiesen [Fri, 11 Feb 2011 08:53:29 +0000 (09:53 +0100)]
Let the users set whether they by default want favorites to trigger email.

The feature has been there for some time, but the UI has not exposed it for some reason.

6 years agoSupply a more meaningful error message for users connecting via SSH directly
Marius Mathiesen [Fri, 11 Feb 2011 08:13:42 +0000 (09:13 +0100)]
Supply a more meaningful error message for users connecting via SSH directly

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Marius Mathiesen [Fri, 11 Feb 2011 08:05:11 +0000 (09:05 +0100)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoIndentation
Christian Johansen [Wed, 9 Feb 2011 21:57:31 +0000 (22:57 +0100)]
Indentation

6 years agoLink to trees in right column when viewing trees
Christian Johansen [Wed, 9 Feb 2011 21:57:25 +0000 (22:57 +0100)]
Link to trees in right column when viewing trees

6 years agoResolve long-standing bug: new tag events should link to tree, not commit
Christian Johansen [Wed, 9 Feb 2011 16:30:13 +0000 (17:30 +0100)]
Resolve long-standing bug: new tag events should link to tree, not commit

6 years agoAdd test for subdomain hosting
Christian Johansen [Fri, 4 Feb 2011 14:31:28 +0000 (15:31 +0100)]
Add test for subdomain hosting

6 years agoUse project for New collaborator page url
Aleksey Lim [Fri, 4 Feb 2011 00:32:22 +0000 (00:32 +0000)]
Use project for New collaborator page url

Otherwise, for having several repositories with the same name, all time
will be used the same committerships page.

6 years agoUpdate disk usage when registering a push to a repository.
Marius Mathiesen [Wed, 2 Feb 2011 11:45:21 +0000 (12:45 +0100)]
Update disk usage when registering a push to a repository.

6 years agoMerge branch 'master' of gitorious.org:gitorious/mainline
Marius Mathiesen [Wed, 2 Feb 2011 09:55:54 +0000 (10:55 +0100)]
Merge branch 'master' of gitorious.org:gitorious/mainline

6 years agoFix bug where the watchlist atom feed would fail when facing an event whose user...
Marius Mathiesen [Wed, 2 Feb 2011 09:55:37 +0000 (10:55 +0100)]
Fix bug where the watchlist atom feed would fail when facing an event whose user is nil.

6 years agoFix bug where events created for deleted tags would not include the user
Marius Mathiesen [Wed, 2 Feb 2011 09:21:26 +0000 (10:21 +0100)]
Fix bug where events created for deleted tags would not include the user

6 years agoHandle deprecation warning in Stomp send/publish method
Marius Mathiesen [Wed, 2 Feb 2011 08:34:39 +0000 (09:34 +0100)]
Handle deprecation warning in Stomp send/publish method

6 years agoAvoid laying the footer above the login form in IE7
Christian Johansen [Mon, 31 Jan 2011 10:06:20 +0000 (11:06 +0100)]
Avoid laying the footer above the login form in IE7

6 years agoFix buggy markdown help link in edit wiki page
Christian Johansen [Mon, 31 Jan 2011 09:00:05 +0000 (10:00 +0100)]
Fix buggy markdown help link in edit wiki page

6 years agoAvoid displaying feed items in user page where the watchable is nil
Christian Johansen [Fri, 28 Jan 2011 10:39:07 +0000 (11:39 +0100)]
Avoid displaying feed items in user page where the watchable is nil

6 years agoDisplay contextual help for merging merge requests to the target branch
Christian Johansen [Fri, 28 Jan 2011 10:38:49 +0000 (11:38 +0100)]
Display contextual help for merging merge requests to the target branch

6 years agoFix indentation in test file
Christian Johansen [Fri, 28 Jan 2011 10:30:39 +0000 (11:30 +0100)]
Fix indentation in test file

6 years agoMore translation
Olivier Migeot [Thu, 27 Jan 2011 16:18:14 +0000 (17:18 +0100)]
More translation

6 years agoDisplay wiki cloning URLs
Marius Mathiesen [Thu, 27 Jan 2011 14:34:33 +0000 (15:34 +0100)]
Display wiki cloning URLs

6 years agoAdding a NEWS file that describes user-visible new features in Gitorious
Marius Mathiesen [Thu, 27 Jan 2011 13:53:25 +0000 (14:53 +0100)]
Adding a NEWS file that describes user-visible new features in Gitorious

6 years agoWikiPages should look like wiki pages
Marius Mathiesen [Thu, 27 Jan 2011 13:16:29 +0000 (14:16 +0100)]
WikiPages should look like wiki pages

6 years agoLog wiki updates in PushEventProcessor
Marius Mathiesen [Thu, 27 Jan 2011 13:16:18 +0000 (14:16 +0100)]
Log wiki updates in PushEventProcessor

6 years agoAdding a parser for wiki update commits.
Marius Mathiesen [Thu, 27 Jan 2011 08:17:27 +0000 (09:17 +0100)]
Adding a parser for wiki update commits.

This will be used to generate Wiki update events in the project
log to mirror the behaviour of regular page updates

6 years agoGroups should know of their cloneable_repositories too.
Marius Mathiesen [Wed, 26 Jan 2011 14:17:14 +0000 (15:17 +0100)]
Groups should know of their cloneable_repositories too.

Fixes a bug when querying for paths/permissions

6 years agoDo not create events for pushes to the wiki repository.
Marius Mathiesen [Wed, 26 Jan 2011 09:34:30 +0000 (10:34 +0100)]
Do not create events for pushes to the wiki repository.

6 years agoExpose wiki repositories as cloneable/pushable
Marius Mathiesen [Wed, 26 Jan 2011 09:04:12 +0000 (10:04 +0100)]
Expose wiki repositories as cloneable/pushable

- Also implemented User#cloneable_repositories

6 years agoImplement Project#cloneable_repositories
Marius Mathiesen [Wed, 26 Jan 2011 07:21:45 +0000 (08:21 +0100)]
Implement Project#cloneable_repositories

This will be used to allow push/pull to wiki repositories

6 years agoDon't display internal repositories in Repositories#index
Marius Mathiesen [Wed, 26 Jan 2011 07:21:11 +0000 (08:21 +0100)]
Don't display internal repositories in Repositories#index

6 years agoPaginate Repositories#index, use ivar for assigned repositories in view.
Marius Mathiesen [Wed, 26 Jan 2011 06:54:33 +0000 (07:54 +0100)]
Paginate Repositories#index, use ivar for assigned repositories in view.

This makes it possible to view a large collection of repositories within a project

6 years agoMerge commit 'refs/merge-requests/2212' of gitorious.org:gitorious/mainline
Marius Mathiesen [Tue, 25 Jan 2011 14:21:49 +0000 (15:21 +0100)]
Merge commit 'refs/merge-requests/2212' of gitorious.org:gitorious/mainline

6 years agoMore translation
Olivier Migeot [Tue, 25 Jan 2011 09:43:55 +0000 (10:43 +0100)]
More translation

6 years agoStarted the french translation sequentially.
Olivier Migeot [Mon, 24 Jan 2011 17:31:50 +0000 (18:31 +0100)]
Started the french translation sequentially.

6 years agoAdded initial file for french translation
Olivier Migeot [Mon, 24 Jan 2011 17:23:01 +0000 (18:23 +0100)]
Added initial file for french translation

6 years agoCall reload on repositories proxy to get rid of unpredictable test failure
Marius Mathiesen [Fri, 21 Jan 2011 14:30:40 +0000 (15:30 +0100)]
Call reload on repositories proxy to get rid of unpredictable test failure

6 years agoRemove gitorious sites submodule
Christian Johansen [Fri, 14 Jan 2011 09:54:20 +0000 (10:54 +0100)]
Remove gitorious sites submodule

6 years agoMerge commit 'refs/merge-requests/139' of gitorious.org:gitorious/mainline
Marius Mathiesen [Thu, 13 Jan 2011 07:38:08 +0000 (08:38 +0100)]
Merge commit 'refs/merge-requests/139' of gitorious.org:gitorious/mainline

6 years agoMake the email address lowercase before calculating the hash for gravatar
Craig Andrews [Thu, 13 Jan 2011 00:06:44 +0000 (19:06 -0500)]
Make the email address lowercase before calculating the hash for gravatar

6 years agoInlining some XML attributes for comments on merge request versions.
Marius Mathiesen [Wed, 12 Jan 2011 13:14:51 +0000 (14:14 +0100)]
Inlining some XML attributes for comments on merge request versions.

6 years agoMerge branch 'master' into merge_request_xml_markup
Marius Mathiesen [Wed, 12 Jan 2011 12:23:29 +0000 (13:23 +0100)]
Merge branch 'master' into merge_request_xml_markup

6 years agoFix bug where inline comments in merge requests where not shown
Christian Johansen [Tue, 11 Jan 2011 08:25:21 +0000 (09:25 +0100)]
Fix bug where inline comments in merge requests where not shown

JavaScript did not properly set state

6 years agoAdding comments to merge request XML payload
Marius Mathiesen [Mon, 10 Jan 2011 14:29:32 +0000 (15:29 +0100)]
Adding comments to merge request XML payload

6 years agorobots.txt
Christian Johansen [Mon, 10 Jan 2011 11:54:49 +0000 (12:54 +0100)]
robots.txt

6 years agoFix bug in merge request version selector 20110110-1
Christian Johansen [Mon, 10 Jan 2011 11:10:39 +0000 (12:10 +0100)]
Fix bug in merge request version selector

Undo markup changes originally introduced to improve IE7 compatibility
Position version selector absolutely for IE7 to work around original problem

7 years agoThe comments controller should display comments relating to a merge request, not...
Marius Mathiesen [Mon, 6 Dec 2010 09:27:40 +0000 (10:27 +0100)]
The comments controller should display comments relating to a merge request, not the entire repository.

7 years agoShould probably say "user" rather than "ser"
Michael Stevens [Mon, 1 Nov 2010 17:51:51 +0000 (17:51 +0000)]
Should probably say "user" rather than "ser"

7 years agoPrecedence should be spelt correctly.
Michael Stevens [Mon, 1 Nov 2010 17:49:39 +0000 (17:49 +0000)]
Precedence should be spelt correctly.

7 years agoRecipes should be spelt correctly.
Michael Stevens [Mon, 1 Nov 2010 17:47:56 +0000 (17:47 +0000)]
Recipes should be spelt correctly.

7 years agoFix centos typo.
Michael Stevens [Mon, 1 Nov 2010 17:44:27 +0000 (17:44 +0000)]
Fix centos typo.

7 years ago Minor correction to a message
Peter Kjellerstedt [Mon, 25 Oct 2010 08:39:55 +0000 (10:39 +0200)]
 Minor correction to a message

7 years agoImprove merge request events to include a link to the MR
Peter Kjellerstedt [Mon, 25 Oct 2010 08:36:29 +0000 (10:36 +0200)]
Improve merge request events to include a link to the MR

7 years agoUse the browser set monospace font for code
Marius Mathiesen [Wed, 20 Oct 2010 10:28:40 +0000 (12:28 +0200)]
Use the browser set monospace font for code

7 years agoMerge commit 'refs/merge-requests/127' of gitorious.org:gitorious/mainline into merge...
Marius Mathiesen [Thu, 14 Oct 2010 11:37:55 +0000 (13:37 +0200)]
Merge commit 'refs/merge-requests/127' of gitorious.org:gitorious/mainline into merge-requests/127

7 years agoMerge commit 'refs/merge-requests/126' of gitorious.org:gitorious/mainline into merge...
Marius Mathiesen [Thu, 14 Oct 2010 11:32:58 +0000 (13:32 +0200)]
Merge commit 'refs/merge-requests/126' of gitorious.org:gitorious/mainline into merge-requests/126

7 years agoChange "'s" to "is"
Peter Kjellerstedt [Wed, 13 Oct 2010 15:13:46 +0000 (17:13 +0200)]
Change "'s" to "is"

7 years agoChange "I'm" to "I am"
Peter Kjellerstedt [Wed, 13 Oct 2010 14:48:39 +0000 (16:48 +0200)]
Change "I'm" to "I am"

7 years agoChange "'re" to "are"
Peter Kjellerstedt [Wed, 13 Oct 2010 14:45:59 +0000 (16:45 +0200)]
Change "'re" to "are"

7 years agoChange "'ve" to "have"
Peter Kjellerstedt [Wed, 13 Oct 2010 14:21:22 +0000 (16:21 +0200)]
Change "'ve" to "have"

7 years agoChange "'ll" to "will"
Peter Kjellerstedt [Wed, 13 Oct 2010 12:35:52 +0000 (14:35 +0200)]
Change "'ll" to "will"

7 years agoChange "n't" to "not"
Peter Kjellerstedt [Wed, 13 Oct 2010 12:33:17 +0000 (14:33 +0200)]
Change "n't" to "not"

7 years agoSome minor corrections to a few messages
Peter Kjellerstedt [Wed, 13 Oct 2010 09:22:25 +0000 (11:22 +0200)]
Some minor corrections to a few messages

7 years agoUse user names a bit more consistently
Peter Kjellerstedt [Wed, 13 Oct 2010 09:58:37 +0000 (11:58 +0200)]
Use user names a bit more consistently

7 years agoRefer to "Clone repository" rather than "Clone on Gitorious"
Peter Kjellerstedt [Wed, 13 Oct 2010 08:53:44 +0000 (10:53 +0200)]
Refer to "Clone repository" rather than "Clone on Gitorious"

The "Clone on Gitorious" button in the sidebar was replaced by the
"Clone repository" button in the repository information box quite a
while ago.

7 years agoDisplay the actual HTTP cloning URL
Marius Mathiesen [Wed, 29 Sep 2010 07:17:19 +0000 (09:17 +0200)]
Display the actual HTTP cloning URL

Use the value from Site::HTTP_CLONING_SUBDOMAIN

7 years agoCorrect the help about creating a tracking branch
Peter Kjellerstedt [Wed, 1 Sep 2010 10:36:31 +0000 (12:36 +0200)]
Correct the help about creating a tracking branch

7 years agoAdd support for git-upload-archive in the gitorious client
Peter Kjellerstedt [Wed, 1 Sep 2010 10:44:32 +0000 (12:44 +0200)]
Add support for git-upload-archive in the gitorious client

This is required to support "git archive".

7 years agoMerge remote branch 'origin/master'
Marius Mathiesen [Fri, 27 Aug 2010 11:19:53 +0000 (13:19 +0200)]
Merge remote branch 'origin/master'

7 years agoFix small ui bug in dashboard (You're watching box)
Tero Hänninen [Fri, 13 Aug 2010 09:08:22 +0000 (12:08 +0300)]
Fix small ui bug in dashboard (You're watching box)

Signed-off-by: Tero Hänninen <tero.j.hanninen@jyu.fi>
7 years agoAdd semicolon to the end of jquery/color_picker plugin to avoid ASI related bug....
Christian Johansen [Fri, 20 Aug 2010 09:37:08 +0000 (11:37 +0200)]
Add semicolon to the end of jquery/color_picker plugin to avoid ASI related bug. Also fix include paths in application_helper to avoid bug where missing file caused all.js to fail building

7 years agoFix JS reference in app_helper, fixes error on JS generation
Marius Mathiesen [Wed, 18 Aug 2010 11:29:13 +0000 (13:29 +0200)]
Fix JS reference in app_helper, fixes error on JS generation