]> source.dussan.org Git - gitblit.git/log
gitblit.git
8 years agoFriendly URL for EditFile Page #974 1022/head
Paul Martin [Sun, 27 Mar 2016 16:05:38 +0000 (17:05 +0100)]
Friendly URL for EditFile Page #974

+ Prevent Edit of old doc version

8 years agoDisable edit links in read only mode #974
Paul Martin [Mon, 14 Mar 2016 22:50:03 +0000 (22:50 +0000)]
Disable edit links in read only mode #974

8 years agoUpdating ProseMirror to 0.4.0
Paul Martin [Wed, 24 Feb 2016 23:05:13 +0000 (23:05 +0000)]
Updating ProseMirror to 0.4.0

8 years agoDocument edit capability via ProseMirror submodule #974
Paul Martin [Mon, 11 Jan 2016 12:25:06 +0000 (12:25 +0000)]
Document edit capability via ProseMirror submodule #974

+ New docEdit page with links from docPage and docList
+ Bespoke menu system with full screen edit mode
+ npm required for building client side scripts
+ Ant script added for BuildUI which performs npm commands
+ Update font-awesome to 4.5.0
+ Factor out to JGitUtils common code in BranchTicketService for EditFilePage
+ getTreeEntries
+ commitIndex
+ Merge capability for document editing

8 years agoMerge pull request #1032 from gitblit/1031-FixForRepositoryPage
Paul Martin [Sun, 27 Mar 2016 15:46:26 +0000 (16:46 +0100)]
Merge pull request #1032 from gitblit/1031-FixForRepositoryPage

Fix for #1031 to display error message

8 years agoFix for #1031 to display error message 1032/head
Paul Martin [Sat, 26 Mar 2016 15:05:51 +0000 (15:05 +0000)]
Fix for #1031 to display error message

8 years agoMerge pull request #1027 from gitblit/1018-Filestore-downloads-filename
Paul Martin [Wed, 23 Mar 2016 20:33:25 +0000 (20:33 +0000)]
Merge pull request #1027 from gitblit/1018-Filestore-downloads-filename

Links to filestore items now download file with correct filename and extension

8 years agoFix for #1018 and #1025 browser LFS links 1027/head
Paul Martin [Mon, 21 Mar 2016 17:41:19 +0000 (17:41 +0000)]
Fix for #1018 and #1025 browser LFS links

+ View and Raw both download the actual file
+ Blame will show the metafile

8 years agoMerge pull request #988 from gitblit/976-raw-download-filestore-item
James Moger [Mon, 25 Jan 2016 16:55:58 +0000 (11:55 -0500)]
Merge pull request #988 from gitblit/976-raw-download-filestore-item

Fix for #976 - Filestore links via browser

8 years agoMerge pull request #1004 from RedShift1/ticket-#998-document-DH-keysize
James Moger [Sun, 17 Jan 2016 22:31:14 +0000 (17:31 -0500)]
Merge pull request #1004 from RedShift1/ticket-#998-document-DH-keysize

Ticket #998 document dh keysize

8 years agoTypo in setup_transport_http.mkd 1004/head
Glenn Matthys [Sun, 17 Jan 2016 22:15:53 +0000 (23:15 +0100)]
Typo in setup_transport_http.mkd

8 years agoDescribe how DH key bitlength can be influenced
Glenn Matthys [Sun, 17 Jan 2016 22:15:38 +0000 (23:15 +0100)]
Describe how DH key bitlength can be influenced

8 years agoMerge pull request #1003 from RedShift1/ticket-#997-doc-char-encoding
James Moger [Sun, 17 Jan 2016 22:13:13 +0000 (17:13 -0500)]
Merge pull request #1003 from RedShift1/ticket-#997-doc-char-encoding

Fix char encoding in setup_proxy.mkd

8 years agoFix char encoding in setup_proxy.mkd 1003/head
Glenn Matthys [Sun, 17 Jan 2016 21:50:31 +0000 (22:50 +0100)]
Fix char encoding in setup_proxy.mkd

8 years agoMerge pull request #990 from dbywalec/authenthication-of-federation-user
James Moger [Sat, 16 Jan 2016 23:23:46 +0000 (18:23 -0500)]
Merge pull request #990 from dbywalec/authenthication-of-federation-user

Fix authentication failure warning log messages for FEDERATION_USER

8 years agoMerge pull request #991 from dbywalec/authentication-of-already-authenticated-user
James Moger [Sat, 16 Jan 2016 23:14:53 +0000 (18:14 -0500)]
Merge pull request #991 from dbywalec/authentication-of-already-authenticated-user

Lower log level of servlet authenticate when request is already authenticated

8 years agoMerge pull request #994 from KeDevServices/master
James Moger [Sat, 16 Jan 2016 23:10:19 +0000 (18:10 -0500)]
Merge pull request #994 from KeDevServices/master

Fix for #993 LIST_BRANCHES without admin

8 years agoFix for #993 LIST_BRANCHES without admin 994/head
Boris Stumm [Wed, 6 Jan 2016 12:51:19 +0000 (13:51 +0100)]
Fix for #993 LIST_BRANCHES without admin

Replaced the canAccess() method in RpcFilter with !adminRequest,
that should solve the problem.

8 years agoLower log level of servlet authenticate when request is already authenticated 991/head
Dariusz Bywalec [Mon, 4 Jan 2016 10:41:12 +0000 (11:41 +0100)]
Lower log level of servlet authenticate when request is already authenticated

When calling a servlet which has already been authenticated, the server would produce
a lot of superfluous log entries, e.g:

Called servlet authenticate when request is already authenticated.

The log level for this log entry has been lowered down to DEBUG.

8 years agoFix authentication failure warning log messages for FEDERATION_USER 990/head
Dariusz Bywalec [Mon, 4 Jan 2016 10:32:58 +0000 (11:32 +0100)]
Fix authentication failure warning log messages for FEDERATION_USER

The AuthenticationManager did not encounter for FEDERATION_USER and would unnecessarily
generate a lot of failure warning log messages, e.g:

Failed login attempt for $gitblit, invalid credentials from XXX.XX.XX.XX

A simple condition will prematurely return null bypassing the regular authentication path
and immediately make the authentication be routed via FederationManager.

8 years agoFix for #976 - Filestore links via browser 988/head
Paul Martin [Fri, 25 Dec 2015 22:35:11 +0000 (22:35 +0000)]
Fix for #976 - Filestore links via browser

+ GitLFS client support
+ FilestoreModel now parses meta file
+ Read meta heading from cache if available
+ Authentication based on accept headers for browser view filestore login
+ PathModel & PathChangeModel now understands filestore items
+ Zip & Rar downloads contain include filestore items
+ Filestore servlet returns LFS JSON error only if accepted by client
+ DiffStat now knows repository to allow identification of filestore items
+ Filestore items identified and returned via view, raw & blob links on
blame, commitDiff, commit and Tree pages

8 years agoMerge pull request #986 from rgroux/jenkins-groovy-all-proto
James Moger [Wed, 23 Dec 2015 13:43:39 +0000 (08:43 -0500)]
Merge pull request #986 from rgroux/jenkins-groovy-all-proto

Change Jenkins groovy script for any protocol (git/http/ssh)

8 years agoChange Jenkins groovy script for any protocol (git/http/ssh) 986/head
rgroux [Wed, 16 Dec 2015 12:37:45 +0000 (13:37 +0100)]
Change Jenkins groovy script for any protocol (git/http/ssh)

groovy.jenkinsGitbaseurl in gitblit.properties or web.xml can
override the http default protocol

8 years agoMerge pull request #980 from mrjoel/mrjoel-httpheaders
James Moger [Thu, 10 Dec 2015 14:55:23 +0000 (09:55 -0500)]
Merge pull request #980 from mrjoel/mrjoel-httpheaders

Refactor authentication for servlet HTTP header handler

8 years agoMerge pull request #981 from mrjoel/mrjoel-loguseraccess
James Moger [Thu, 10 Dec 2015 14:34:38 +0000 (09:34 -0500)]
Merge pull request #981 from mrjoel/mrjoel-loguseraccess

Log username with access logging

8 years agoMerge pull request #982 from gitblit/978-milestone-date-selector
James Moger [Thu, 10 Dec 2015 14:33:30 +0000 (09:33 -0500)]
Merge pull request #982 from gitblit/978-milestone-date-selector

fix for #978 - HTML5 date input support

8 years agoMerge pull request #983 from mrjoel/mrjoel-dotfiledetection
James Moger [Thu, 10 Dec 2015 00:36:39 +0000 (19:36 -0500)]
Merge pull request #983 from mrjoel/mrjoel-dotfiledetection

revise logic for forcing dotfile to text

8 years agorevise logic for forcing dotfile to text 983/head
Joel Johnson [Wed, 9 Dec 2015 22:58:33 +0000 (15:58 -0700)]
revise logic for forcing dotfile to text

8 years agofix for #978 - HTML5 date input support 982/head
Paul Martin [Wed, 9 Dec 2015 17:58:15 +0000 (17:58 +0000)]
fix for #978 - HTML5 date input support

+ JS patch/hack to coerce legacy wicket into talking to a HTML5 input type
+ JS script to hide inline help on date format when using HTML5 date picker
  + Date picker shown in user locale and standard does not support custom
  format.
  + Always sent in ISO8601 format

8 years agolog authenticated username 981/head
Joel Johnson [Fri, 19 Jun 2015 21:43:12 +0000 (15:43 -0600)]
log authenticated username

8 years agoremove external account type in lieu of specific type 980/head
Joel Johnson [Tue, 7 Jul 2015 22:31:39 +0000 (16:31 -0600)]
remove external account type in lieu of specific type

This was unused and causing provider lookup to fail in
AuthenticationManager.findProvider() by changing it out
from underneath. As a result, the supportXChanges methods
weren't being reported correctly.

8 years agoadd site documentation for HTTP header authentication
Joel Johnson [Mon, 29 Jun 2015 21:08:25 +0000 (15:08 -0600)]
add site documentation for HTTP header authentication

8 years agoimplement an HTTP header AuthenticationProvider
Joel Johnson [Fri, 12 Jun 2015 20:31:07 +0000 (14:31 -0600)]
implement an HTTP header AuthenticationProvider

8 years agoMerge pull request #979 from pingunaut/master
James Moger [Tue, 8 Dec 2015 14:32:56 +0000 (09:32 -0500)]
Merge pull request #979 from pingunaut/master

Remove empty catch blocks to stop swallowing exceptions. #498

8 years agoRemove empty catch blocks to stop swallowing exceptions. #498 979/head
Martin Spielmann [Tue, 8 Dec 2015 13:30:11 +0000 (14:30 +0100)]
Remove empty catch blocks to stop swallowing exceptions. #498

8 years agoMerge pull request #973 from paulsputer/967-Filestore-Help
James Moger [Tue, 8 Dec 2015 12:58:21 +0000 (07:58 -0500)]
Merge pull request #973 from paulsputer/967-Filestore-Help

fix for #967 filestore menu and help

8 years agofix for #967 filestore menu for all users 973/head
Paul Martin [Mon, 7 Dec 2015 23:09:26 +0000 (23:09 +0000)]
fix for #967 filestore menu for all users

+ Filestore listing filtered by user view permissions
+ Configuration help for filestore relocated to website files
+ Added migration example

8 years agoMerge pull request #969 from paulsputer/968-GitLFS-Extract-URI-From-Repository
James Moger [Fri, 4 Dec 2015 00:57:05 +0000 (19:57 -0500)]
Merge pull request #969 from paulsputer/968-GitLFS-Extract-URI-From-Repository

fix for #968 extracting repository from URI

8 years agofix for #968 extracting repository from URI 969/head
Paul Martin [Thu, 3 Dec 2015 16:45:12 +0000 (16:45 +0000)]
fix for #968 extracting repository from URI

+ Allows using lfs when `server.contextPath = /git`

8 years agoHandle possible NPE when extracting WAR resources into a new directory
James Moger [Wed, 25 Nov 2015 13:50:10 +0000 (08:50 -0500)]
Handle possible NPE when extracting WAR resources into a new directory

8 years agoFix 2 possible NullPointer occurences
marco [Sat, 17 Oct 2015 11:48:03 +0000 (13:48 +0200)]
Fix 2 possible NullPointer occurences

8 years agoRaw servlet now assumes text/plain for dot files
James Moger [Mon, 23 Nov 2015 18:48:25 +0000 (13:48 -0500)]
Raw servlet now assumes text/plain for dot files

8 years agoSimplify build and contribution process back to master/trunk development
James Moger [Mon, 23 Nov 2015 18:33:50 +0000 (13:33 -0500)]
Simplify build and contribution process back to master/trunk development

8 years agoMatch longest repository path towards the shortest pr-950
paladox [Mon, 23 Nov 2015 17:58:38 +0000 (17:58 +0000)]
Match longest repository path towards the shortest pr-950

This was originally from https://github.com/gitblit/gitblit/pull/950 but seems to have been reverted when develop branch was merged with master.

8 years agoReset build identifiers for next point release cycle
James Moger [Mon, 23 Nov 2015 14:32:33 +0000 (09:32 -0500)]
Reset build identifiers for next point release cycle

8 years agoPrepare 1.7.1 release v1.7.1
James Moger [Mon, 23 Nov 2015 14:14:17 +0000 (09:14 -0500)]
Prepare 1.7.1 release

8 years agoDocumentation
James Moger [Mon, 23 Nov 2015 14:12:27 +0000 (09:12 -0500)]
Documentation

8 years agoFix failure to start WAR variants
James Moger [Mon, 23 Nov 2015 14:05:29 +0000 (09:05 -0500)]
Fix failure to start WAR variants

8 years agoReset build identifiers for next point release cycle
James Moger [Sun, 22 Nov 2015 19:53:36 +0000 (14:53 -0500)]
Reset build identifiers for next point release cycle

8 years agoPrepare 1.7.0 release v1.7.0
James Moger [Sun, 22 Nov 2015 19:39:30 +0000 (14:39 -0500)]
Prepare 1.7.0 release

8 years agoMerge branch 'develop'
James Moger [Sun, 22 Nov 2015 19:37:16 +0000 (14:37 -0500)]
Merge branch 'develop'

8 years agoCreate filestore directory on startup
James Moger [Thu, 19 Nov 2015 22:55:38 +0000 (17:55 -0500)]
Create filestore directory on startup

8 years agoDocumentation
James Moger [Wed, 18 Nov 2015 15:06:12 +0000 (10:06 -0500)]
Documentation

8 years agoCatch some potential NPEs
James Moger [Wed, 18 Nov 2015 14:19:23 +0000 (09:19 -0500)]
Catch some potential NPEs

8 years agoRequire admin permissions to view the filestore page
James Moger [Wed, 18 Nov 2015 14:15:50 +0000 (09:15 -0500)]
Require admin permissions to view the filestore page

8 years agoUpdate to JGit 4.1.1
James Moger [Wed, 18 Nov 2015 14:06:12 +0000 (09:06 -0500)]
Update to JGit 4.1.1

8 years agoDocumentation
James Moger [Wed, 18 Nov 2015 14:05:48 +0000 (09:05 -0500)]
Documentation

8 years agoDo not display fork button if target repo already exists (fixes #944)
James Moger [Tue, 10 Nov 2015 13:58:35 +0000 (08:58 -0500)]
Do not display fork button if target repo already exists (fixes #944)

8 years agoDeclare top and bottom page links on reflog page (fixes #761)
James Moger [Tue, 10 Nov 2015 13:22:18 +0000 (08:22 -0500)]
Declare top and bottom page links on reflog page (fixes #761)

8 years agoMerge pull request #947 from paulsputer/LogUpdateForAllAuthentication
James Moger [Mon, 26 Oct 2015 19:09:25 +0000 (15:09 -0400)]
Merge pull request #947 from paulsputer/LogUpdateForAllAuthentication

Log update for Fail2Ban usage

8 years agoLog update for Fail2Ban usage 947/head
Paul Martin [Sun, 25 Oct 2015 16:12:32 +0000 (16:12 +0000)]
Log update for Fail2Ban usage

+ Adds standard logging for all authentication providers
+ Updates help page to use default GitBlit SSH port

9 years agoMerge pull request #921 from paulsputer/git-lfs-support
James Moger [Sat, 10 Oct 2015 12:13:12 +0000 (08:13 -0400)]
Merge pull request #921 from paulsputer/git-lfs-support

Initial Git-LFS support

9 years agoGit-LFS support 921/head
Paul Martin [Sat, 10 Oct 2015 11:46:51 +0000 (12:46 +0100)]
Git-LFS support

+ Metadata maintained in append-only JSON file providing complete audit
history.
+ Filestore menu item
+ Lists filestore items
+ Current size and availability
+ Link to GitBlit Filestore help page (top right)
+ Hooks into existing repository permissions
+ Uses default repository path for out-of-box operation with Git-LFS
client
+ accessRestrictionFilter now has access to http method and auth header
+ Testing for servlet and manager

9 years agoMerge pull request #940 from RainerW/ticket-932-timedpwd
James Moger [Fri, 9 Oct 2015 11:58:35 +0000 (07:58 -0400)]
Merge pull request #940 from RainerW/ticket-932-timedpwd

#932 do not trim passwords anywhere in the ui

9 years ago#932 do not trim passwords anywhere in the ui 940/head
RainerW [Thu, 8 Oct 2015 10:32:35 +0000 (12:32 +0200)]
#932 do not trim passwords anywhere in the ui

9 years agoMerge branch 'topic/pr-934' into develop
James Moger [Mon, 5 Oct 2015 12:12:43 +0000 (08:12 -0400)]
Merge branch 'topic/pr-934' into develop

9 years agoAddress review comments
James Moger [Mon, 5 Oct 2015 12:09:53 +0000 (08:09 -0400)]
Address review comments

9 years agoMerge branch 'topic/pr-935' into develop
James Moger [Mon, 5 Oct 2015 12:04:34 +0000 (08:04 -0400)]
Merge branch 'topic/pr-935' into develop

9 years agoEnsure a repository is only searched once
James Moger [Mon, 5 Oct 2015 12:04:10 +0000 (08:04 -0400)]
Ensure a repository is only searched once

9 years agoTweak search page translation resource
James Moger [Mon, 5 Oct 2015 12:03:37 +0000 (08:03 -0400)]
Tweak search page translation resource

9 years agoRevert manual specification of ssh user auth factories
James Moger [Mon, 5 Oct 2015 11:57:12 +0000 (07:57 -0400)]
Revert manual specification of ssh user auth factories

9 years agoAdd "all repositories" parameter 935/head
Vitaliy Filippov [Tue, 29 Sep 2015 10:58:21 +0000 (13:58 +0300)]
Add "all repositories" parameter

9 years agoAllow to strip domain from kerberos usernames 933/head 934/head
Vitaliy Filippov [Mon, 1 Jun 2015 20:36:49 +0000 (23:36 +0300)]
Allow to strip domain from kerberos usernames

9 years agoMerge pull request #929 from willyann/develop
James Moger [Wed, 30 Sep 2015 16:00:35 +0000 (12:00 -0400)]
Merge pull request #929 from willyann/develop

send email subject utf-8 encoded

9 years agosend email subject utf-8 encoded 929/head
william [Wed, 30 Sep 2015 14:50:38 +0000 (22:50 +0800)]
send email subject utf-8 encoded

9 years agoUpdate to JGit 4.1.0
James Moger [Wed, 30 Sep 2015 11:39:45 +0000 (07:39 -0400)]
Update to JGit 4.1.0

9 years agoMerge pull request #927 from willyann/develop
James Moger [Wed, 30 Sep 2015 11:19:30 +0000 (07:19 -0400)]
Merge pull request #927 from willyann/develop

redefine some traditional chinese translation after user's feedback

9 years agoredefine some traditional chinese translation after user's feedback since from 2015... 927/head
william [Wed, 30 Sep 2015 05:58:48 +0000 (13:58 +0800)]
redefine some traditional chinese translation after user's feedback since from 2015/08/05

9 years agoFixes #922: RSS feed link ignores forward-slash character
James Moger [Mon, 28 Sep 2015 14:25:59 +0000 (10:25 -0400)]
Fixes #922: RSS feed link ignores forward-slash character

9 years agoMerge pull request #908 from mrjoel/mrjoel-authrequestnotsession
James Moger [Fri, 18 Sep 2015 18:30:07 +0000 (14:30 -0400)]
Merge pull request #908 from mrjoel/mrjoel-authrequestnotsession

prevent session fixation for external authentication

9 years agoUpdate to Guice 4.0 final with -gb2 ServletFilter fix
James Moger [Fri, 18 Sep 2015 18:07:38 +0000 (14:07 -0400)]
Update to Guice 4.0 final with -gb2 ServletFilter fix

9 years agoSimplify RefModel dates
James Moger [Fri, 18 Sep 2015 18:02:52 +0000 (14:02 -0400)]
Simplify RefModel dates

9 years agoUse author date to be consistent with other tools (fixes #919)
James Moger [Fri, 18 Sep 2015 15:23:42 +0000 (11:23 -0400)]
Use author date to be consistent with other tools (fixes #919)

9 years agoDocumentation (fixes #917)
James Moger [Fri, 18 Sep 2015 13:19:49 +0000 (09:19 -0400)]
Documentation (fixes #917)

9 years agoUpdate dependency changes in release log
James Moger [Fri, 18 Sep 2015 12:55:49 +0000 (08:55 -0400)]
Update dependency changes in release log

9 years agoUpdate to Lucene 4.10.4
James Moger [Fri, 18 Sep 2015 12:55:08 +0000 (08:55 -0400)]
Update to Lucene 4.10.4

9 years agoUpdate to Jetty 9.2.13
James Moger [Fri, 18 Sep 2015 12:46:23 +0000 (08:46 -0400)]
Update to Jetty 9.2.13

9 years agoUpdate to JGit 4.0.2
James Moger [Fri, 18 Sep 2015 12:38:00 +0000 (08:38 -0400)]
Update to JGit 4.0.2

9 years agoUpdate to SSHD 1.0.0
James Moger [Fri, 18 Sep 2015 12:30:29 +0000 (08:30 -0400)]
Update to SSHD 1.0.0

9 years agoUpdate to BouncyCastle 1.52
James Moger [Fri, 18 Sep 2015 12:30:00 +0000 (08:30 -0400)]
Update to BouncyCastle 1.52

9 years agoUpdate to Groovy 2.4.4
James Moger [Fri, 18 Sep 2015 12:28:42 +0000 (08:28 -0400)]
Update to Groovy 2.4.4

9 years agoUpdate to Wicket 1.4.22
James Moger [Fri, 18 Sep 2015 12:27:32 +0000 (08:27 -0400)]
Update to Wicket 1.4.22

9 years agoUpdate to SLF4J 1.7.12
James Moger [Fri, 18 Sep 2015 12:21:38 +0000 (08:21 -0400)]
Update to SLF4J 1.7.12

9 years agoUpdate to Pegdown 1.5.0
James Moger [Fri, 18 Sep 2015 12:19:36 +0000 (08:19 -0400)]
Update to Pegdown 1.5.0

9 years agoRevert "Merge pull request #915 from lucamilanesio/lucene-5.2.1"
James Moger [Fri, 18 Sep 2015 11:54:46 +0000 (07:54 -0400)]
Revert "Merge pull request #915 from lucamilanesio/lucene-5.2.1"

This reverts commit 55c385e96e6594ec1ac3b5cd41ccd2df6048b696, reversing
changes made to 61bb29d492ca9c34471ec0a119d1445ccde086e9.

9 years agoMerge pull request #915 from lucamilanesio/lucene-5.2.1
James Moger [Tue, 15 Sep 2015 11:42:11 +0000 (07:42 -0400)]
Merge pull request #915 from lucamilanesio/lucene-5.2.1

Bump to Lucene 5.2.1

9 years agoBump to Lucene 5.2.1 915/head
Luca Milanesio [Wed, 9 Sep 2015 16:00:05 +0000 (17:00 +0100)]
Bump to Lucene 5.2.1

9 years agoUpdate IDE files and gitignore
James Moger [Tue, 1 Sep 2015 12:49:54 +0000 (08:49 -0400)]
Update IDE files and gitignore

9 years agoFix #909: Add missing SLFJ dependencies in Manager build
James Moger [Tue, 1 Sep 2015 12:49:02 +0000 (08:49 -0400)]
Fix #909: Add missing SLFJ dependencies in Manager build

9 years agoAdd .mailmap
James Moger [Thu, 27 Aug 2015 16:33:15 +0000 (12:33 -0400)]
Add .mailmap