Commit Graph
7272 Commits
Author SHA1 Message Date
Jesse Farinacci 985f378bea [FIXED JENKINS-9967] about page should not autorefresh 2011-06-13 20:48:51 -04:00
Kohsuke Kawaguchi d644c08f1c merged back the RC branch
Conflicts:
	core/src/main/java/hudson/util/VersionNumber.java
	plugins/pom.xml
2011-06-13 09:27:05 -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
appr 287b9fbc29 [FIXED JENKINS-9212] 2011-06-12 17:57:24 +04:00
Kohsuke Kawaguchi e03ba7dc6b [FIXED JENKINS-9960]
We weren't actually enforcing the initialization order at all, as
sorting was based on the plugin name.
2011-06-11 18:39:35 -07:00
Kohsuke Kawaguchi 01696a8e46 Javadoc merge problem? 2011-06-10 17:56:56 -07:00
Seiji Sogabe 938ac77a78 updated ja. 2011-06-11 07:47:38 +09:00
Kohsuke Kawaguchi fb9aeb5d57 added missing PIs 2011-06-10 12:19:01 -07:00
Kohsuke Kawaguchi 77188bfccf LDAPBindSecurityRealm.groovy> can be now overridden in
$JENKINS_HOME if it exists.

See
http://jenkins.361315.n4.nabble.com/LDAPBindSecurityRealm-groovy-td3584243.html
2011-06-09 15:40:20 -07:00
Kohsuke Kawaguchi 9075d82712 Rotate the slave log files instead of deleting them. 2011-06-09 15:24:56 -07:00
Jesse Farinacci 17a835d505 fix misleading comment, thank you orrc 2011-06-09 15:43:28 -04:00
Jesse Farinacci 59eb3b0f8c fix sing->sign typographical error 2011-06-09 11:10:42 -04:00
Jesse Farinacci 760b9bb49e set a more appropriate @since 2011-06-09 11:10:20 -04: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 dd7fd2ec65 Jenkins 2011-06-08 18:33:18 -07:00
Stephen Connolly 2bfa37c88a fix formatting bork 2011-06-08 12:13:48 +01:00
Stephen Connolly e66e44c741 should compare using the int values 2011-06-08 12:09:21 +01:00
Nigel Magnay bb06bd1b99 Getting the version number relies on a build step and a resource being
found in hudson.model. Keep this file and add an equivalent in jenkins.model.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2011-06-08 10:24:19 +01:00
Olivier Lamy 0aca5e5ca9 restore backward comp with the old Hudson class 2011-06-08 11:05:18 +02:00
Kohsuke Kawaguchi 46d658ec4e updated to the proper taglib class 2011-06-07 16:01:06 -07:00
Kohsuke Kawaguchi 0933cd9a6e removed StaplerRequest/Response dependencies 2011-06-07 15:19:18 -07:00
Kohsuke Kawaguchi 7478e7a55a removed StaplerRequest/Response dependencies 2011-06-07 15:17:47 -07:00
Kohsuke Kawaguchi b668a23c9d Merge branch 'label-parameterization' 2011-06-07 15:02:02 -07:00
Kohsuke Kawaguchi 6de74a5bf8 Fied a couple of places where Task.getAssignedLabel() was invoked directly without checking LabelAssignmentAction 2011-06-07 14:57:26 -07:00
Kohsuke Kawaguchi 6e87aca583 doc improvement 2011-06-07 14:34:48 -07:00
Kohsuke Kawaguchi 8291720005 making it more type-safe 2011-06-07 14:27:51 -07:00
Kohsuke Kawaguchi 8c7c1c62b1 this file is now auto-generated 2011-06-07 13:14:57 -07:00
Kohsuke Kawaguchi 7ad1c7e249 assigning packages to keep IDEs happy and make error diagnostics easier in the stack trace 2011-06-07 13:09:22 -07:00
Kohsuke Kawaguchi 5bf706f9b3 permission name needs to be backward compatible 2011-06-07 11:34:55 -07:00
Kohsuke Kawaguchi 4a4a58a4a9 this is marked as deprecated but only to discourage programmatic use. 2011-06-07 10:54:17 -07:00
Kohsuke Kawaguchi 2a30cc36d0 a few more follow up Hudson->Jenkins changes 2011-06-07 10:48:02 -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
Vojtech Juranek 844c49c144 Add warning for user and replaced fixEmpty() by standad Util.fixEmptyAndTrim() 2011-06-07 10:09:16 -07:00
Vojtech Juranek 8b4f30a162 Possible fix for JENKINS-9806, fix empty customWorkspace -if empry, replace it by null (i.e. no custom workspace) 2011-06-07 10:09:16 -07:00
Kohsuke Kawaguchi 9d89b9f983 Put this in a block tag so that it gets separated from summaries from
properties.
2011-06-07 10:04:16 -07:00
Olaf Lenz 12c3d20711 Put User Id before Name in user list. 2011-06-07 10:01:48 -07:00
Olaf Lenz dfba2f4985 Added user id column to securityRealm's list of users. 2011-06-07 10:01:47 -07:00
Olaf Lenz efa2ce74e7 Added column with user id to list of users. 2011-06-07 10:01:47 -07:00
Olaf Lenz cbe3941d54 Include output of the User Id to the User's page. 2011-06-07 10:01:47 -07:00
Stefan Wolf 8910df0326 Made DependencyGroup private in DependencyGraph and not an instance of
Dependency
2011-06-07 09:51:41 -07:00
Stephen Connolly 0208244f9f fix author tag 2011-06-07 09:36:33 -07:00
Stephen Connolly fdddf5e2f8 replace old CDDL+GPLv2 Version Number comparator with one that is both ASL and has a better understanding of Maven version numbers (with some tweaks for wildcard support)
o Had to change the logic of two test cases (2.0 is now newer than 2.0.ea and 1.12-SNAPSHOT is no longer equal to 1.11.*) both of which make more sense than the original test cases

o Should now allow custom builds with text/alpha qualifiers in the version number.
2011-06-07 09:36:12 -07:00
Stephen Connolly 4f569c8a39 fix author tag 2011-06-07 17:16:44 +01:00
Stephen Connolly 36774c254f replace old CDDL+GPLv2 Version Number comparator with one that is both ASL and has a better understanding of Maven version numbers (with some tweaks for wildcard support)
o Had to change the logic of two test cases (2.0 is now newer than 2.0.ea and 1.12-SNAPSHOT is no longer equal to 1.11.*) both of which make more sense than the original test cases

o Should now allow custom builds with text/alpha qualifiers in the version number.
2011-06-07 17:11:47 +01:00
Nigel Magnay dbe586ce92 Merge remote branch 'origin/master' into momo
* origin/master: (28 commits)
  Need to run install during prepare, or else the release:perform fails miserably.
  Enabled more convenient access to the XSTREAM field
  added a method to help plugins rename classes and still keep backward compatibility
  Rely on released versions
  Test files accidentally crept in.
  modified to use the type-safe tag lib interface.
  Hooking the taglib interface generation.
  [JENKINS-9326] add integration tests with eclipse tycho relocation
  experimenting with the taglib interface generator
  fixed NPE
  Converted a few more pages into Groovy to test the behaviour. Allow global.jelly to be written in Groovy.
  Jenkins
  auto-completes instance and descriptor
  Support global.groovy as well as config.groovy
  A few more Jelly files switched to Groovy as a test
  Looks like a dead code.
  added DSLD for Eclipse
  1.166 shipped
  not specifying the file extension so that different pieces can be implemented by different view technologies
  replaced i18n by '_' since it shows up a lot.
  ...

Conflicts:
	core/src/main/java/hudson/model/Hudson.java
2011-06-07 09:42:28 +01:00
Nigel Magnay 79eb909b11 Some of the configuration variables use Jenkins/Hudson.class to get
the root name of a system property. Obviously changing the root class
name breaks this. So introduce a simple Configuration class that is
used to first try Jenkins variables, then back off to Hudson variables
if not found.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
2011-06-07 09:06:54 +01: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 b1db233fa2 Enabled more convenient access to the XSTREAM field 2011-06-06 18:26:22 -07:00
Kohsuke Kawaguchi 0007bab4d3 added a method to help plugins rename classes and still keep backward compatibility 2011-06-06 18:26:22 -07:00
Kohsuke Kawaguchi 5abc651cee Merge branch 'groovy-view'
Conflicts:
	core/src/main/java/hudson/ExtensionComponent.java
	core/src/main/resources/hudson/PluginManager/sidepanel.jelly
2011-06-06 17:13:48 -07:00