Commit Graph
1720 Commits
Author SHA1 Message Date
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 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
Kevin Connor 8feb91bb2f change ldap group lookup when using memberUid to match using name
according to rfc2307 which says the memberUid is a name (not a uid
strangely enough)

just going by
http://manpages.ubuntu.com/manpages/natty/man5/sssd-ldap.5.html
ldap_schema description and my broken install on ubuntu...

I can't say what ldif I used except it was standard (I didn't write it)
and ldapscripts and phpmyadmin all seem to want the field to be a name.
2011-06-07 10:30:24 -07:00
Nigel Magnay 2adef6719a Merge remote branch 'origin/master' into momo
* origin/master: (91 commits)
  Parsing can happen in the forked Maven process. Support remoting.
  Fixed the test failures.
  Strip whitespace on maven installation.
  updated ja.
  Use relative path to validate new view name (in order to allow ViewGroups like NestedView to override)
  Added i18n.
  moved to the model package to colocate with the Result class, since I don't think this class is tied by itself to the notification.
  doc improvements
  enum to describe a result trend - i.e. change from the previous to the current result
  Recording the previous change.
  Do not include trailing periods in console links.
  doc improvements
  Added a hook to customize the XML parser behaviour.
  - Renamed from 'linked' to 'base' - Fixed the bug where multi-level base setting wasn't working properly - Improved docs
  Updated style
  Added convenience method for getting configuration run
  Initial commit
  the trunk is toward 1.416-SNAPSHOT
  creating an RC branch
  updated changelog as a part of the release
  ...

Conflicts:
	core/src/main/java/hudson/slaves/NodeProvisioner.java
	maven-plugin/src/main/java/hudson/maven/MavenModule.java
	maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
2011-06-07 09:04:40 +01:00
Kohsuke Kawaguchi 82a26a579a the trunk is toward 1.416-SNAPSHOT 2011-06-04 11:24:56 -07:00
Seiji Sogabe d24afe997c Updated env_vars.html. jenkins!! 2011-06-04 03:10:16 +09:00
Olivier Lamy ed51d4d68c Merge branch 'JENKINS-9787' of https://github.com/aheritier/jenkins into aheritier-JENKINS-9787 2011-05-31 15:10:23 +02:00
Nigel Magnay 5679d019ec Move hudson.model.Jenkins to be jenkins.model.Jenkins - part II
Just import changes, from hudson.model.Jenkins -> jenkins.model.Jenkins,
and Javadoc comments.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2011-05-29 11:06:28 +01:00
Nigel Magnay 70c1065814 Stage 1 : Create hudson.model.Jenkins, make Hudson derive from Jenkins.
Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2011-05-29 11:00:58 +01:00
bap2000 8af3905a24 Fix version and usage text from java -jar jenkins.war --x 2011-05-28 14:10:37 +01:00
Arnaud Héritier 72ecd06cb5 Maven Best Practice : Always define plugins versions in the pluginManagement of the root POM 2011-05-28 12:27:11 +02:00
Kohsuke Kawaguchi 531f4398a6 the trunk is toward 1.415-SNAPSHOT 2011-05-23 02:02:13 -07:00
Kohsuke Kawaguchi 274143341d the trunk is toward 1.414-SNAPSHOT 2011-05-16 14:35:54 -07:00
Kohsuke Kawaguchi 9171338e0b the trunk is toward 1.413-SNAPSHOT 2011-05-09 13:12:18 -07:00
Stephen Connolly de83a8f733 support rendering tasks as disabled 2011-05-05 16:51:53 +01:00
Kohsuke Kawaguchi 726a86808c the trunk is toward 1.412-SNAPSHOT 2011-05-02 09:09:24 -07:00
Kohsuke Kawaguchi 8d29f4772b Some of our tags, such as <optionalBlock> and <dropdownList> involves grouping of sibling table rows, and controlling visibility of them. So when such tags nest to each other, the visibility updates need to be done carefully, or else the visibility could get out of sync with the model (imagine outer group is made visible while inner group is not visible --- if all the rows are simply enumerated and visibility changed, we end up making the inner group visible.)
The rowVisibilityGroup object in hudson-behavior.js is used to coordinate this activity, and this test ensures that it's working.
2011-04-26 17:39:56 -07:00
Kohsuke Kawaguchi 288595f311 hook this up in behaviour 2011-04-26 17:39:21 -07:00
Kohsuke Kawaguchi ffc3ab2d19 To simplify creating a break point on rule application 2011-04-26 17:39:21 -07:00
Kohsuke Kawaguchi 307af5757f the trunk is toward 1.411-SNAPSHOT 2011-04-25 13:26:34 -07:00
Seiji Sogabe 071c51ac61 updated Japanese localization. 2011-04-20 07:45:24 +09:00
Christoph Kutzinski e65f893b1b [JENKINS-8848] allow custom workspaces for maven jobs 2011-04-19 11:56:46 -07:00
Kohsuke Kawaguchi bd0c937394 Merged 31bb961f4d
Conflicts:
	war/pom.xml
2011-04-19 11:44:25 -07:00
Kohsuke Kawaguchi 31bb961f4d generate license from the war, to really include everything 2011-04-19 11:39:22 -07:00
Kohsuke Kawaguchi 80576ef0d6 pushed the winstone dependency to the <dependencies> so that we can see the source code during debugging 2011-04-19 11:11:55 -07:00
Kohsuke Kawaguchi 9f85448e3e Adding a new certificate, as the current update center cert is expirign
and I don't have the CA key.
2011-04-19 00:02:33 -07:00
Kohsuke Kawaguchi 9c7e08b505 trunk is now toward 1.410 2011-04-18 13:28:37 -07:00
Kohsuke Kawaguchi fcf7f46f55 Jenkins can behave as Hudson 1.395 but that\'s where it stops 2011-04-15 22:56:03 -07:00
Kohsuke Kawaguchi 7e14d2ee23 the trunk is toward 1.409-SNAPSHOT 2011-04-15 21:40:04 -07:00
Kohsuke Kawaguchi 70613748db merged back the RC branch
Conflicts:
	core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly
2011-04-15 21:25:37 -07:00
Kohsuke Kawaguchi ef3d48719e [maven-release-plugin] prepare for next development iteration 2011-04-15 19:52:22 -07:00
Kohsuke Kawaguchi 0bf3670072 [maven-release-plugin] prepare release jenkins-1_407 2011-04-15 19:52:18 -07:00
Kohsuke Kawaguchi 6c3a605f71 forgot to update these files 2011-04-12 18:27:37 -07:00
Kohsuke Kawaguchi 7f69fe86f9 integrating the new logo 2011-04-12 17:27:47 -07:00
Olivier Lamy 95a432ee33 [JENKINS-9334] Some french strings are incorrect after renaming to Jenkins
Submitted by Aurélien COUDERC
2011-04-12 23:19:30 +02:00
Kohsuke Kawaguchi 5d9d6e8f58 the trunk is toward 1.408-SNAPSHOT 2011-04-11 10:44:43 -07:00
Kohsuke Kawaguchi cd18457f4a the trunk is toward 1.407-SNAPSHOT 2011-04-04 11:33:41 -07:00
Kohsuke Kawaguchi 2d3608c276 bundling the latest of the Subversion plugin 2011-04-01 21:23:53 -07:00
Kohsuke Kawaguchi edcde6d14a Merged commit 55d1f1fec3
Conflicts:
	core/src/main/resources/lib/form/optionalBlock.jelly
	core/src/main/resources/lib/hudson/newFromList/form.jelly
	test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
2011-03-31 19:04:12 -07:00
Kohsuke Kawaguchi 08a5edc60e Use CSS to create space instead of nbsp 2011-03-31 17:04:05 -07:00
Stephen Connolly 9194d14cce Merge branch 'oss' of github.com:cloudbees/hudson into oss 2011-03-31 09:57:32 +01:00
Kohsuke Kawaguchi 05f36b4772 Merge commit '40983bac81df783cbf07ecfc5b1a71c444c00c79' 2011-03-29 11:27:16 -07:00