]>
source.dussan.org Git - gitblit.git/log
James Moger [Fri, 21 Feb 2014 20:32:53 +0000 (15:32 -0500)]
Merge commit 'refs/tickets/12/12/1' of https://dev.gitblit.com/git/gitblit
James Moger [Fri, 21 Feb 2014 20:25:46 +0000 (15:25 -0500)]
WindowsAuthProvider setting to restrict BUILTIN\Administrators
Some environments do not want to automatically allow Windows admin
accounts to be Gitblit admins. This patch allows disabling/enabling the
relationship between Windows builtin admin accounts and Gitblit accounts.
James Moger [Fri, 21 Feb 2014 16:16:11 +0000 (11:16 -0500)]
Merge commit 'refs/tickets/11/11/1' of https://dev.gitblit.com/git/gitblit
James Moger [Fri, 21 Feb 2014 16:14:47 +0000 (11:14 -0500)]
Add GO launch parameter to specify daily, rolling log file generation
James Moger [Fri, 21 Feb 2014 15:11:51 +0000 (10:11 -0500)]
Merge commit 'refs/tickets/10/10/1' of https://dev.gitblit.com/git/gitblit
James Moger [Fri, 21 Feb 2014 15:10:41 +0000 (10:10 -0500)]
Add timestamp to the default log4j configuration
James Moger [Fri, 21 Feb 2014 14:58:04 +0000 (09:58 -0500)]
Merge commit 'refs/tickets/09/9/2' of https://dev.gitblit.com/git/gitblit
James Moger [Fri, 21 Feb 2014 14:49:44 +0000 (09:49 -0500)]
Select default/configured gc period in create/edit repository page
James Moger [Fri, 21 Feb 2014 14:24:54 +0000 (09:24 -0500)]
Strip file extension from document index
James Moger [Fri, 21 Feb 2014 14:05:42 +0000 (09:05 -0500)]
Remove admin permission setting from Redmine auth provider (issue-368)
This feature depended on an undocumented behavior of Redmine. If/when
Redmine groups are mapped to Gitblit teams, we can reconsider setting
the admin permission (issue-321).
James Moger [Fri, 21 Feb 2014 13:36:18 +0000 (07:36 -0600)]
Merged ticket #5 patchset 2
Alfred Schmid [Fri, 21 Feb 2014 10:52:11 +0000 (11:52 +0100)]
Added LdapSyncServiceTest to GitBlitSuite.
Alfred Schmid [Fri, 21 Feb 2014 07:47:11 +0000 (08:47 +0100)]
Fixed and introduced tests for synching ldap users and groups.
Using new settings key realm.ldap.synchronize
Switched from key String to Keys class. To avoid letting tests pass with
hardcoded keys wich doesn't exist anymore. Now on Key Refactorings the
test gets compile error again.
Test the isReady behavior from LdapSyncService.
James Moger [Wed, 19 Feb 2014 14:57:44 +0000 (09:57 -0500)]
API adjustments and elimination of duplicate config options
Alfred Schmid [Mon, 3 Feb 2014 09:30:58 +0000 (10:30 +0100)]
Added logging for empty group sync.
Alfred Schmid [Mon, 3 Feb 2014 09:30:35 +0000 (10:30 +0100)]
Documented default value for empty groups filter
Alfred Schmid [Mon, 3 Feb 2014 09:01:04 +0000 (10:01 +0100)]
Load empty groups as empty teams from ldap, when ldap user
synchronization is enabled.
Alfred Schmid [Fri, 31 Jan 2014 13:19:58 +0000 (14:19 +0100)]
Fixed error with negative periods. Using at least ldapCaching period to
sync with ldap
Alfred Schmid [Fri, 31 Jan 2014 12:36:53 +0000 (13:36 +0100)]
Fixed Tests, use local copy of users.conf. Initialize reset ldap before
every test.
Alfred Schmid [Fri, 31 Jan 2014 11:29:55 +0000 (12:29 +0100)]
Basic implementation of feature for ldap user synchronization as
background service. Introduced configuration property to configure the
synchronization period.
James Moger [Wed, 19 Feb 2014 14:04:55 +0000 (09:04 -0500)]
Merge commit 'refs/tickets/08/8/3' of https://dev.gitblit.com/r/gitblit
Alfred Schmid [Thu, 13 Feb 2014 08:47:53 +0000 (09:47 +0100)]
Show "Displayname (username)" in palettes for edit team and repository pages
mrbytes [Sat, 1 Feb 2014 11:06:36 +0000 (12:06 +0100)]
Translation esES updated
- Fixes some syntax
Change-Id: I581d6ba73f15dd49409ba349d53034e6880c322d
James Moger [Mon, 3 Feb 2014 16:13:47 +0000 (11:13 -0500)]
Fix NPE in cookie change detection on login
James Moger [Fri, 31 Jan 2014 13:02:45 +0000 (08:02 -0500)]
Redirect Centos service output to a log file (issue-348)
James Moger [Thu, 30 Jan 2014 12:57:23 +0000 (04:57 -0800)]
Merge pull request #138 from ptemplier/patch-1
Typo on Gitblit in english labels
ptemplier [Thu, 30 Jan 2014 10:26:35 +0000 (11:26 +0100)]
Typo on Gitblit in english labels
James Moger [Tue, 28 Jan 2014 18:41:22 +0000 (13:41 -0500)]
issue-323: Synchronize all user service methods
James Moger [Tue, 28 Jan 2014 18:16:37 +0000 (13:16 -0500)]
issue-361: Reset user cookie after administrative password change
Cookies were not reset on administrative password change of a user
account. This allowed accounts with changed passwords to continue
authenticating. Cookies are now reset on password changes, they are
validated on each page request, AND they will now expire 7 days after
generation.
James Moger [Tue, 28 Jan 2014 17:10:26 +0000 (12:10 -0500)]
Documentation
Berke Viktor [Tue, 28 Jan 2014 17:07:02 +0000 (12:07 -0500)]
Add Redmine Fetch groovy hook (issue-359)
James Moger [Tue, 28 Jan 2014 16:14:21 +0000 (11:14 -0500)]
Fix broken import from pull request #136
James Moger [Tue, 28 Jan 2014 15:24:19 +0000 (07:24 -0800)]
Merge pull request #137 from vitalidze/master
Added fisheye hook script
Vitaly Litvak [Tue, 28 Jan 2014 14:18:04 +0000 (18:18 +0400)]
Added fisheye hook script
James Moger [Tue, 28 Jan 2014 12:49:55 +0000 (04:49 -0800)]
Merge pull request #136 from culmat/patch-1
Decode the request url as UTF-8 in the authentication filter
Matthias Cullmann [Tue, 28 Jan 2014 10:16:11 +0000 (11:16 +0100)]
allow specials chars in repo names
see http://code.google.com/p/gitblit/issues/detail?id=362
James Moger [Tue, 14 Jan 2014 15:07:13 +0000 (10:07 -0500)]
Updated contributors list
James Moger [Tue, 14 Jan 2014 15:06:56 +0000 (10:06 -0500)]
Fixed incorrect tagger identity on dashboards (issue-276)
James Moger [Tue, 14 Jan 2014 14:28:04 +0000 (06:28 -0800)]
Merge pull request #135 from kxyfyh/branch_fixbug
修正读取默认文件语言识别
James Moger [Tue, 14 Jan 2014 14:26:46 +0000 (09:26 -0500)]
Merge pull request #133 from mvdkleijn/betterEmptyRepoPage
Change-Id: Ic4ccf135333f49696883a3c8da99535b53403abb
James Moger [Tue, 14 Jan 2014 13:16:17 +0000 (08:16 -0500)]
Fixed compile failure and updated translated empty repo pages
Ting [Tue, 14 Jan 2014 07:57:14 +0000 (15:57 +0800)]
修正读取默认文件语言识别
Martijn [Mon, 13 Jan 2014 20:47:40 +0000 (21:47 +0100)]
Updating the Dutch translation file
Martijn [Mon, 13 Jan 2014 20:45:28 +0000 (21:45 +0100)]
Improving empty repo page
Adding upstream example as well as different way to push an existing local repo
Martijn [Mon, 13 Jan 2014 18:13:14 +0000 (19:13 +0100)]
Changing hardcoded `gitblit` origin into `origin`.
James Moger [Fri, 10 Jan 2014 12:58:58 +0000 (04:58 -0800)]
Merge pull request #131 from alfsch/master
Fix for Issue 356 - LDAP Groupmembers are not displayed until they are signed in once
Alfred Schmid [Thu, 9 Jan 2014 12:42:54 +0000 (13:42 +0100)]
Issue 356 - function updateUserModels also updates the stored teams in
the UserModel. Now all Teammembers are shown when
realm.ldap.synchronizeUsers.enable is turned on.
James Moger [Sat, 4 Jan 2014 16:05:28 +0000 (08:05 -0800)]
Merge pull request #130 from asbachb/master
Evaluate X_Forwarded_Context only when X-Forwarded-Context is not set
Benjamin Asbach [Sat, 4 Jan 2014 15:29:12 +0000 (16:29 +0100)]
Evaluate X_Forwarded_Context only when X-Forwarded-Context is not set
James Moger [Mon, 9 Dec 2013 22:15:05 +0000 (17:15 -0500)]
Tweak info logging in GitblitReceivePack and open variable scope
Change-Id: I11624daca0694dc1996795b31432274467f09228
James Moger [Sat, 30 Nov 2013 01:06:09 +0000 (20:06 -0500)]
New canonical base url setting for repository urls and notifications
Change-Id: I86a1eb61c2351d1cf3f6b3becf00f2a36d5c8ed6
James Moger [Tue, 26 Nov 2013 21:26:44 +0000 (16:26 -0500)]
Support customizing the "from" display name for generated emails
Change-Id: Ibad9e2b1c12a24ad9c671a0d96aafb3365daa529
James Moger [Mon, 9 Dec 2013 22:12:02 +0000 (17:12 -0500)]
Allow overriding the page title in a page subclass
Change-Id: I4bf65f771ab1ba0b0da6838fb07007520dd4b5e1
James Moger [Mon, 9 Dec 2013 22:11:14 +0000 (17:11 -0500)]
Add FontAwesome dependency
Change-Id: I2dc302fea7a7cd21d4569e835ed987748ff8938b
James Moger [Mon, 30 Dec 2013 18:52:26 +0000 (13:52 -0500)]
Fix potential NPE on getting Markdown content
Change-Id: Ie245da271ad1e7c90b1fab46832f9ecc7b5d297a
James Moger [Mon, 30 Dec 2013 18:51:53 +0000 (13:51 -0500)]
Do not serialize the Logger instance
Change-Id: Icbef95e95d05fa8d7dbdc750241252d291083820
James Moger [Mon, 23 Dec 2013 15:58:52 +0000 (07:58 -0800)]
Merge pull request #129 from alexmob/testrevlog_failure
Fixed test.
Alex Lewis [Mon, 23 Dec 2013 15:02:18 +0000 (15:02 +0000)]
Fixed test.
testRevlog was expecting 12 commits but getting 19. Looking at the
hello-world repository on github (on which the test executes) the 19
commit count appears to be correct.
James Moger [Fri, 20 Dec 2013 17:25:36 +0000 (12:25 -0500)]
Update to JGit 3.2.0
Change-Id: I77475dedfecbdc7ba3c065886a51b7a70b7ece48
James Moger [Mon, 16 Dec 2013 13:59:58 +0000 (08:59 -0500)]
Sync bugtraq support for spec v0.3
Change-Id: I2c24d1201d4c36963a708b178e780c1828707269
James Moger [Fri, 13 Dec 2013 13:12:47 +0000 (08:12 -0500)]
Use multiple mappings for the git servlet instead of multiple instances
Change-Id: I47adeaac142ca7ea5199a5c4c2164ffd9cc68551
James Moger [Thu, 12 Dec 2013 13:19:33 +0000 (08:19 -0500)]
Fixed regression in /r/ security due to Servlet 2.5 rollback
Change-Id: Id7e882cf48689ace8910718e0091207f8e8c6912
James Moger [Thu, 12 Dec 2013 04:12:12 +0000 (23:12 -0500)]
Rollback to Servlet 2.5
Combining Dagger and Servlet 3 works really well on stock Tomcat and
Jetty but it is a troublesome combination on JEE containers with their
own ideas on how to instantiate classes. JBoss AS 7 has been
particularly nasty and it is just simpler to scaleback and stay with
Servlet 2.5 than it is to fight all permuations of containers.
Instead of using constructor DI, the servlets and filters each have an
inject(ObjectGaph) method which is automatically called during
initialization. Each servlet or filter is responsible for retrieving
the required dependency from the graph. The Dagger object graph is
created in the context listener and stuffed into the context as an
attribute.
Change-Id: Ib5714584fe73e2a6b9c6fda12af080a43356cbda
James Moger [Wed, 11 Dec 2013 19:52:45 +0000 (14:52 -0500)]
Show mirror indicator on repository url panel
Change-Id: I5eb66500cc1ed47f97d4935d42ea4c3ca4cdba14
James Moger [Wed, 11 Dec 2013 19:42:15 +0000 (14:42 -0500)]
Remove obsolete pageName label
Change-Id: I2c5df563393de1aa69c3ea0f2cbd5e7b11e3f3dc
James Moger [Wed, 11 Dec 2013 16:01:37 +0000 (11:01 -0500)]
Fix NPE in getting a user's fork if repository caching is disabled
Change-Id: I10e90f54964daa32d954b47a8a6d54267b215222
James Moger [Wed, 11 Dec 2013 15:58:36 +0000 (10:58 -0500)]
Remove deprecated methods from User and Team models
Change-Id: Ief3231270e55b8e4075de45c70ee24517b05b3fc
James Moger [Wed, 11 Dec 2013 15:29:25 +0000 (10:29 -0500)]
Fix NPE on usermodel account type checking
Change-Id: I964381a896e8c8bf8cce5f19a83fd7c33ef5c9bd
James Moger [Wed, 11 Dec 2013 14:08:26 +0000 (09:08 -0500)]
Centralize cookie creation
Change-Id: I1a17416121764f33a8d05a88c80cece0c03ac41d
James Moger [Wed, 11 Dec 2013 13:08:37 +0000 (08:08 -0500)]
Fix external authentication failure
Change-Id: I0f415941a4bfd5e63d85c60613cea0c7d10cbb49
James Moger [Tue, 10 Dec 2013 20:15:05 +0000 (15:15 -0500)]
Allow null authentication provider to manipulate users
Change-Id: I07405f2ed915b8f544ac58aca8367301a7d23e38
James Moger [Tue, 10 Dec 2013 20:14:31 +0000 (15:14 -0500)]
Documentation
Change-Id: I94c6f1a31de8e067f3be788a2a77ec7b4c3a5ea8
James Moger [Tue, 10 Dec 2013 20:06:19 +0000 (12:06 -0800)]
Merge pull request #128 from alexmob/issue-350
Fix chart failure when an apostrophe is in a user display name (issue-350)
James Moger [Tue, 10 Dec 2013 19:38:10 +0000 (14:38 -0500)]
Fix LDAP port and bind regressions due to change for issue-343
Change-Id: I76ee581e067a30fb1656c5c62bdf743846f1a767
Alex Lewis [Tue, 10 Dec 2013 16:40:10 +0000 (16:40 +0000)]
issue-350: Fixes issue when an apostrophe is present in a User's name
James Moger [Tue, 10 Dec 2013 16:04:46 +0000 (11:04 -0500)]
Remove @Inject references because they confuse JEE containers
Change-Id: I2e4a8e7424e7c62d1e89ca62a91423fdf3e36ac8
James Moger [Mon, 9 Dec 2013 21:37:20 +0000 (16:37 -0500)]
Support Markdown image links relative to the repository root (issue-324)
Change-Id: I8bad02b26a20636e4fc3d1f0ab0a16f0bacc7bf1
James Moger [Tue, 3 Dec 2013 16:20:28 +0000 (11:20 -0500)]
Simplify blob loading code
Change-Id: I7f8ad8936e620dd06e88d85f6837248eea75a1ec
James Moger [Tue, 3 Dec 2013 16:19:23 +0000 (11:19 -0500)]
Simplify bare repository bugtraq config loading
Change-Id: I223df72df371ad6e5559f57da16167e56b1e66ad
James Moger [Mon, 25 Nov 2013 18:02:20 +0000 (13:02 -0500)]
Add support for per-repository bugtraq configuration
Imported the reference implementation contributed by syntevo which
is used in their SmartGit product. You may create a bugtraq config
section inf your .git/config file OR you may add a .gitbugtraq file
to the root of your repository.
Example:
[bugtraq "issues"]
url = http://code.google.com/p/gitblit/issues/detail?id=%BUGID%
logRegex = "[Ii]ssue[-#:\\s]{1}\\d+"
logRegex1 = "\\d+"
[bugtraq "[pullrequests"]
url = "https://github.com/gitblit/gitblit/pull/%BUGID%"
logRegex = "(?:pull request|pull|pr)\\s*[-#]?([0-9]+)"
Change-Id: Iaba305bf4280d08cc4d1abf533c2f1365470a43f
James Moger [Mon, 2 Dec 2013 20:51:59 +0000 (15:51 -0500)]
Merge "Bump bouncycastle version to 1.49"
David Ostrovsky [Mon, 2 Dec 2013 21:26:03 +0000 (22:26 +0100)]
Bump bouncycastle version to 1.49
Change-Id: I0ea81f6c45748af3130721b8f8a7244eac9787fc
Alex Lewis [Wed, 20 Nov 2013 17:32:27 +0000 (17:32 +0000)]
Add coloring modes to the blame page (issue-2, pull request #125)
Blame output is now colored according to Commit (default), Author or
Age. Both Commit and Author output uses random colors whereas Age uses a
single color with varying tints applied to indicate the age. White
indicates the eldest commit with the tint darkening as the commits get
younger.
Change-Id: I045458329af4765e91d5829ce3e8d28e21eeb66e
James Moger [Fri, 29 Nov 2013 17:10:53 +0000 (12:10 -0500)]
Added filesystem write permission check (issue-345)
Change-Id: I0a3aced3b8e9887347888c85e469b74fc70931ad
James Moger [Fri, 29 Nov 2013 17:02:58 +0000 (12:02 -0500)]
Invalidate all cached repository data on "clear cache" (issue-346)
Change-Id: I14404e38bbc6f5827c430849baf3c13f4df2c6ef
James Moger [Tue, 26 Nov 2013 02:43:44 +0000 (21:43 -0500)]
Update to Lucene 4.6.0 (pull request #124)
Change-Id: I21b0daf0550dcc2f12f1712e7b7cf519358a7a1d
James Moger [Mon, 25 Nov 2013 15:07:46 +0000 (10:07 -0500)]
Refactor managers and authentication for federation
Change-Id: I5ff18b2768095fb14e7fbece2e756115829abbde
James Moger [Mon, 25 Nov 2013 14:12:47 +0000 (09:12 -0500)]
Change IGitblit API to be more distinct from IUserService
Change-Id: I8fb38fb6a3dae74ad7a12b045b054373b9b02518
James Moger [Mon, 25 Nov 2013 06:31:53 +0000 (01:31 -0500)]
Flattened IGitblitManager, GitblitManager, and GitBlit classes
Change-Id: Id6deb27306e0034898673bf5d5d76a4ed012ced6
James Moger [Mon, 25 Nov 2013 05:12:31 +0000 (00:12 -0500)]
Serve repositories on /r in addition to /git
Change-Id: I3cd332a6509e434d901e1b262600f4c8ce57752b
James Moger [Mon, 25 Nov 2013 05:00:41 +0000 (00:00 -0500)]
Revised committer verification to require email address
Change-Id: I5298c93e03099813f5713a4effd87913429aa3dc
James Moger [Mon, 25 Nov 2013 04:18:50 +0000 (23:18 -0500)]
Refactor user services and separate authentication (issue-281)
Change-Id: I336e005e02623fc5e11a4f8b4408bea5465a43fd
James Moger [Mon, 25 Nov 2013 02:28:27 +0000 (21:28 -0500)]
Update unit tests for refactored architecture
Change-Id: I04639db977c515e5e1090ef8f0e1ce858820cb03
James Moger [Mon, 25 Nov 2013 02:31:14 +0000 (21:31 -0500)]
Renamed Gitblit to GitBlit to not break existing Groovy hooks
Change-Id: Id5286ed1b9d7e92644cacf857096e6dd273c8f05
James Moger [Thu, 21 Nov 2013 23:32:21 +0000 (18:32 -0500)]
Moved servlets and services to separate packages
Change-Id: I5f0f50f4ae7d332e9f724a2e6f074fa71f646035
James Moger [Thu, 21 Nov 2013 22:26:04 +0000 (17:26 -0500)]
Extract Federation, Gitblit and Services manager from GitBlit singleton
Change-Id: I2b2f361a868c8eedf4b6df5939e7dfac2d5f92a9
James Moger [Thu, 21 Nov 2013 03:12:54 +0000 (22:12 -0500)]
Extract ProjectManager from the GitBlit singleton
Change-Id: I93493a473e3d6ea9b2523c1913d6dc323642344d
James Moger [Thu, 21 Nov 2013 02:53:34 +0000 (21:53 -0500)]
Extract RepositoryManager from the GitBlit singleton
Change-Id: I265cfaf25e4093ffa5f53f70d8eb1c20d731b7b3
James Moger [Thu, 21 Nov 2013 02:19:34 +0000 (21:19 -0500)]
Extract SessionManager from GitBlit singleton
Change-Id: I85c9dfc1413f858dc28d731a0bf653828626e127
James Moger [Thu, 21 Nov 2013 01:52:11 +0000 (20:52 -0500)]
Extract UserManager from GitBlit singleton
Change-Id: I4885255ed63aa6c4e000c3e5501675440dca3958