Commit Graph
1779 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi f5fa09038f Using the latest Winstone. 2011-07-17 08:47:40 +01:00
Kohsuke Kawaguchi 21a03558e5 remoting module was moved off to http://github.com/jenkinsci/remoting 2011-07-12 22:31:40 -07:00
Stephen Connolly 73862beec5 minor tweeks 2011-07-12 21:25:29 -07:00
Stephen Connolly a376eb5832 assemble the webapp in place... no need for an intermediary directory... don't use one for making jar files, intermediary is only used for generated sources 2011-07-12 21:25:29 -07:00
Stephen Connolly 83d28b9c5b antrun has been removed 2011-07-12 21:25:29 -07:00
Stephen Connolly af2cf8243f more removal of antrun 2011-07-12 21:25:29 -07:00
Stephen Connolly edf7953c46 use build-helper and dependency-unpack for some of the antrun stuff
Conflicts:

	war/pom.xml
2011-07-12 21:25:29 -07:00
Stephen Connolly 6af0308fda use build-helper to attach the war-for-test 2011-07-12 21:25:29 -07:00
Stephen Connolly b42d99953f re-order poms to canonical ordering to ease merging issues 2011-07-12 21:25:28 -07:00
Kohsuke Kawaguchi fad9fb747b the trunk is toward 1.422-SNAPSHOT 2011-07-11 14:34:01 -07:00
bap2000 5936e970fb Revert "Set setting-name class to have vertical-align: middle property."
This reverts commit 9ddf000f2b.
[FIXED JENKINS-10253] Label Alignment does not correctly work for top-level entries that span several lines
2011-07-10 21:44:18 +01:00
Kohsuke Kawaguchi 6a75fe64e6 [FIXED JENKINS-9681] PAM now supports CLI auth
... by extending from AbstractPasswordBasedSecurityRealm.
2011-07-10 12:31:54 -07:00
Kohsuke Kawaguchi 039e43cf48 Merged ce27914ce9
Conflicts:
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/java/hudson/model/AbstractProject.java
	core/src/main/java/hudson/model/Descriptor.java
	core/src/main/java/hudson/model/Hudson.java
	core/src/main/java/hudson/tasks/BuildTrigger.java
	core/src/main/resources/hudson/model/View/newJob.jelly
	core/src/main/resources/hudson/model/View/sidepanel.jelly
	core/src/main/resources/hudson/views/Messages_ja.properties
	maven-plugin/src/main/java/hudson/maven/MavenBuild.java
	maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java
	maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java
2011-07-05 19:42:20 -07:00
Kohsuke Kawaguchi 15e9b269e4 the trunk is toward 1.421-SNAPSHOT 2011-07-05 12:26:03 -07:00
Kohsuke Kawaguchi 491b8577fa added missing image 2011-07-05 09:20:44 -07:00
Kohsuke Kawaguchi b8af4ae312 Added a mechanism to bypass basic authentication. 2011-07-02 14:07:43 -07:00
Kohsuke Kawaguchi 19b81cfb2a Textbox to enter project/system description is now syntax-highlighted. 2011-06-28 15:23:12 -07:00
Kohsuke Kawaguchi 80ea816411 Jenkins 2011-06-28 15:07:57 -07:00
Kohsuke Kawaguchi 91f2059ee0 recognize and properly handle <script src="..."/> injected by the fragment 2011-06-28 15:07:17 -07:00
Kohsuke Kawaguchi 170a232120 alert is enemy of automated test 2011-06-28 15:06:48 -07:00
Kohsuke Kawaguchi b85987a6c5 supporting the callback after the script is fully loaded
See http://stackoverflow.com/questions/4845762/onload-handler-for-script-tag-in-internet-explorer
2011-06-28 13:03:14 -07:00
Kohsuke Kawaguchi b9eb8c5623 Revert "Integrated a new version of Winstone and executable-war to set unique"
This reverts commit a859d2e9d7.
I pushed relevant jars yesterday but doesn't look like they hit central
yet.
2011-06-28 11:58:11 -07:00
Kohsuke Kawaguchi a859d2e9d7 Integrated a new version of Winstone and executable-war to set unique
session cookie name.

Integrating a newer version of libaries that have the correct license
header in POM and source code.
2011-06-28 10:15:41 -07:00
Kohsuke Kawaguchi ea35b39db3 the trunk is toward 1.420-SNAPSHOT 2011-06-27 16:00:07 -07:00
Dustin R. Welden 6c55d355de Returning default behavior for initial sort 2011-06-24 16:27:26 -07:00
dwelden 32d5f11a4b Added sensible sorting behavior for Jenkins 2011-06-24 16:27:26 -07:00
Kevin Sawicki 9ddf000f2b Set setting-name class to have vertical-align: middle property. 2011-06-24 16:21:54 -07:00
Kohsuke Kawaguchi ac6cd818f9 added a public key based CLI authentication 2011-06-23 15:51:06 -07:00
Kohsuke Kawaguchi 303c86e2cc the trunk is toward 1.419-SNAPSHOT 2011-06-20 18:00:06 -07:00
Kevin Connor 6be5275ef0 Revert "change ldap group lookup when using memberUid to match using name"
I had a misunderstanding of the values in {0} and {1}. Both are names.
{1} is the shorter username rather than {0} which is the full ldap
specifier.

This reverts commit 8feb91bb2f.
2011-06-20 13:09:38 -07:00
Kohsuke Kawaguchi 405f9134ec merged back the RC branch 2011-06-20 11:08:12 -07:00
Kohsuke Kawaguchi a878c0ad84 [maven-release-plugin] prepare for next development iteration 2011-06-20 10:36:52 -07:00
Kohsuke Kawaguchi 174530d924 [maven-release-plugin] prepare release jenkins-1.417 2011-06-20 10:36:51 -07:00
Kohsuke Kawaguchi c22c147b27 [maven-release-plugin] prepare for next development iteration 2011-06-17 22:49:08 -07:00
Kohsuke Kawaguchi c371a5511a [maven-release-plugin] prepare release jenkins-1.416 2011-06-17 22:49:07 -07:00
Kohsuke Kawaguchi 40ffd566a2 Merge branch 'rc'
Conflicts:
	war/pom.xml
2011-06-17 22:12:34 -07:00
Kohsuke Kawaguchi 2ef840a876 using a new version to assist Debian packaging effort 2011-06-17 08:22:18 -07:00
Olivier Lamy 7984399df7 upgrade to subversion plugin 1.28 2011-06-16 10:03:56 +02:00
Kohsuke Kawaguchi e669d8cc85 [FIXED JENKINS-9689]
backporting this from the trunk.
2011-06-15 13:37:21 -07:00
Andrew Bayer 2b14fe3de5 Merge pull request #157 from slide/master
[FIXED JENKINS-9689]
2011-06-14 17:45:17 -07:00
Olivier Lamy 3ac5a041ca revert to 1.26 to be able to build (as 1.27 is not deployed) 2011-06-14 12:41:20 -07:00
Stephen Connolly 9bdb057880 Update to 1.27 release of subversion integration 2011-06-14 05:36:59 -07:00
Kohsuke Kawaguchi 10c1a8cd94 bundle a later version of this plugin 2011-06-13 10:45:21 -07:00
Kohsuke Kawaguchi 6464917106 the trunk is toward 1.417-SNAPSHOT 2011-06-13 09:39:32 -07:00
Olivier Lamy 8007d83fc9 Merge pull request #155 from jieryn/JENKINS-9915
[FIXED JENKINS-9915] Make captcha support optional; remove LGPL jcaptcha
2011-06-13 05:49:44 -07:00
slide 8a2fc3ba12 Fixed spacing 2011-06-10 06:36:34 -07:00
slide 015c227dff Fix JENKINS-9689 2011-06-09 23:01:38 -07:00
Jesse Farinacci 7689840966 [FIXED JENKINS-9915] Make captcha support optional; remove LGPL jcaptcha
This change is largely based on changes made by Winston Prakash for Hudson.
The main details about his changes can be found here:

http://issues.hudson-ci.org/browse/HUDSON-8844

I deviated a bit from his changes where it was appropriate (e.g. the
description for allow-signup.html was just plain wrong). Also, there
was a lot of collateral damage from formatting in his changeset, which
I have factored out.

I tested the basic functionality of this change and it seems to be OK.
2011-06-08 22:58:20 -04:00
Kohsuke Kawaguchi e0d045ce50 If the user tries to run Jenkins on Java 1.4 and earlier, detect that
more gracefully.
2011-06-08 18:42:08 -07:00
Kohsuke Kawaguchi d5c2470370 Merge branch 'pull-152'
Conflicts:
	core/src/main/java/hudson/model/DependencyGraph.java
2011-06-07 10:44:49 -07:00