Jesse Glick
f3fe83803d
Merge branch 'security' into security-stable-1.580
...
Conflicts:
core/src/main/java/hudson/ClassicPluginStrategy.java
core/src/main/java/hudson/cli/AddJobToViewCommand.java
core/src/main/java/hudson/model/Run.java
core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
core/src/main/java/jenkins/model/IdStrategyDescriptor.java
core/src/main/resources/hudson/model/AbstractProject/configure-common_ru.properties
core/src/main/resources/hudson/model/AbstractProject/configure-common_tr.properties
core/src/main/resources/hudson/model/Job/index.jelly
core/src/main/resources/jenkins/model/IdStrategy/config.jelly
core/src/main/resources/jenkins/model/Jenkins/MasterComputer/_api.jelly
core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.jelly
core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message.jelly
core/src/main/resources/jenkins/slaves/systemInfo/EnvVarsSlaveInfo/systemInfo.jelly
core/src/main/resources/jenkins/slaves/systemInfo/Messages.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_da.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_de.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_es.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_fr.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_ja.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_nl.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_pt_BR.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_sv_SE.properties
core/src/main/resources/jenkins/slaves/systemInfo/Messages_zh_TW.properties
core/src/main/resources/lib/form/link.jelly
core/src/main/resources/lib/hudson/failed-test_pt_BR.properties
core/src/main/resources/lib/hudson/project/configurable.properties
core/src/main/resources/lib/hudson/project/configurable_bg.properties
core/src/main/resources/lib/hudson/project/configurable_es_AR.properties
core/src/main/resources/lib/hudson/project/configurable_eu.properties
core/src/main/resources/lib/hudson/project/configurable_gl.properties
core/src/main/resources/lib/hudson/project/configurable_hi_IN.properties
core/src/main/resources/lib/hudson/project/configurable_it.properties
core/src/main/resources/lib/hudson/project/configurable_nl.properties
core/src/main/resources/lib/hudson/project/configurable_sl.properties
core/src/main/resources/lib/hudson/project/configurable_tr.properties
core/src/main/resources/lib/hudson/project/console-link.jelly
core/src/main/resources/lib/hudson/project/console-link_pt_BR.properties
core/src/main/resources/lib/layout/breadcrumbBar_pt.properties
core/src/main/resources/lib/layout/layout_pt.properties
core/src/main/resources/lib/layout/main-panel_pt.properties
core/src/main/resources/lib/layout/pane_de.properties
core/src/main/resources/lib/layout/pane_pt.properties
core/src/main/resources/lib/layout/pane_pt_BR.properties
core/src/main/resources/lib/layout/progressiveRendering_pt.properties
core/src/main/resources/lib/layout/task_pt.properties
pom.xml
test/pom.xml
test/src/test/resources/lib/layout/IconTest/03_testTask.jelly
war/src/main/webapp/scripts/msie.js
2015-02-05 16:27:47 -05:00
Jesse Glick
f987f9ce89
Need to test against the same version of matrix-project we bundle.
...
Otherwise FingerprinterTest.matrixDependency throws an AbstractMethodError.
2015-02-04 15:52:56 -05:00
Jesse Glick
5b93017568
Integrating snapshot build of matrix-project.
2015-02-04 14:58:22 -05:00
Jesse Glick
5d43fdf1e6
matrix-project 1.0
...
(cherry picked from commit 0bd831e2d9 )
2015-02-04 14:05:32 -05:00
Jesse Glick
075bd9b5b3
matrix-project 1.0-beta-1
...
(cherry picked from commit 9259f8736c )
2015-02-04 14:05:06 -05:00
Jesse Glick
92ca85339f
Preparing to include transitional release.
...
(cherry picked from commit 071951e658 )
2015-02-04 14:05:00 -05:00
Jesse Glick
7d926f720e
Removing hudson.matrix classes and associated resources as a first pass.
...
(cherry picked from commit 4aad749cbe )
Conflicts:
core/src/main/java/hudson/matrix/MatrixBuild.java
core/src/main/java/hudson/matrix/MatrixConfiguration.java
core/src/main/java/hudson/matrix/MatrixProject.java
core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
2015-02-04 13:08:01 -05:00
Kohsuke Kawaguchi
9a3ff6c687
[maven-release-plugin] prepare for next development iteration
2015-01-27 17:38:15 -08:00
Kohsuke Kawaguchi
49ffccaf03
[maven-release-plugin] prepare release jenkins-1.580.3
2015-01-27 17:38:15 -08:00
Oliver Gondža
a82b5e195b
Revert "Single/Multiline Build History"
...
This reverts commit 3603b69938 .
2015-01-21 00:05:54 +01:00
Kohsuke Kawaguchi
f90e53583a
Merge branch 'stable-1.580' of github.com:jenkinsci/jenkins into stable-1.580
2015-01-08 11:11:49 -08:00
tfennelly
3603b69938
Single/Multiline Build History
...
(cherry picked from commit cb9036c455 )
2015-01-06 21:12:57 +01:00
Kohsuke Kawaguchi
0e445324fb
[maven-release-plugin] prepare for next development iteration
2014-12-15 11:15:17 -08:00
Kohsuke Kawaguchi
03600e925c
[maven-release-plugin] prepare release jenkins-1.580.2
2014-12-15 11:15:16 -08:00
Kohsuke Kawaguchi
3229bdaac8
[maven-release-plugin] prepare for next development iteration
2014-10-29 21:06:06 -07:00
Kohsuke Kawaguchi
388fa0b44a
[maven-release-plugin] prepare release jenkins-1.580.1
2014-10-29 21:06:06 -07:00
Kohsuke Kawaguchi
e70601482a
Merge branch 'SECURITY-144' into SECURITY-144-stable-1.580
2014-10-18 22:43:12 -07:00
Kohsuke Kawaguchi
b2d5cd5162
Integtrating a new version of credentials plugin.
...
This version fixes a test failure in 1.580.1
2014-10-18 22:42:28 -07:00
Kohsuke Kawaguchi
ae181567a8
Merge remote-tracking branch 'community/stable-1.580' into SECURITY-144-stable-1.580
2014-10-18 20:49:51 -07:00
Kohsuke Kawaguchi
1351b18e42
[JENKINS-25169] integrated the fix for POODLE
2014-10-18 20:48:50 -07:00
Jesse Glick
01827e1e2b
Merge branch 'SECURITY-144' into SECURITY-144-stable-1.580
...
Conflicts:
war/pom.xml
2014-10-17 12:28:52 -04:00
Jesse Glick
c0444a5b46
Updating bundled versions of credentials, ssh-credentials, and ssh-slaves.
2014-10-17 12:23:10 -04:00
Oliver Gondža
b105627b73
Towards 1.580.1
2014-10-12 16:35:39 +02:00
Kohsuke Kawaguchi
048d759792
maven plugin is moved off to a separate repository.
...
See https://github.com/jenkinsci/maven-plugin
(cherry picked from commit f98070d3e6 )
Conflicts:
maven-plugin/pom.xml
maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
plugins/pom.xml
pom.xml
2014-09-19 14:03:30 -04:00
Kohsuke Kawaguchi
892af3c4b7
[maven-release-plugin] prepare release jenkins-1.580
2014-09-14 16:30:02 -07:00
Kohsuke Kawaguchi
1a4aef1172
the trunk is toward 1.580-SNAPSHOT
2014-09-01 08:21:17 -07:00
Henrik Ygge
f6ec318cc2
[FIXED JENKINS-23724]
...
For some reason IE10 craches when document.getElementsByName is called and there is an element with a name attribute but no value. In this case a button had a name attribute set with an empty string as the value.
2014-08-27 22:42:17 +01:00
Kohsuke Kawaguchi
862cb04ca1
the trunk is toward 1.579-SNAPSHOT
2014-08-25 06:19:24 -07:00
anafke
e908219a9a
Remove unnecessary onblur call
...
Right now, checker is being attached to both onblur and onchange. The result is when the user changes input, and that input loses focus, the checker is being fired twice. This can cause issues on non-trivial field changes (such as validating a groovy script). If there is no change, the checker is still called once due to the onblur.
The checker should only be called if the input is changed.
2014-08-20 11:46:31 +01:00
Kohsuke Kawaguchi
8a5d5d752b
the trunk is toward 1.578-SNAPSHOT
2014-08-18 22:17:46 -07:00
Jesse Glick
233f52e834
Merge pull request #1364 from daniel-beck/JENKINS-19586
...
[FIXED JENKINS-19586] Change description of 'tied' node mode
2014-08-12 15:17:42 -04:00
Daniel Beck
6fc11a4bc9
[FIXED JENKINS-19586] Change description of 'tied' node mode
2014-08-12 20:59:07 +02:00
Jesse Glick
50a3554541
Unclear what cvs-browser.html used to be bound to, but seems obsolete.
2014-08-11 17:17:03 -04:00
Jesse Glick
fbce514b49
Moving some more help files to their natural homes.
2014-08-11 16:51:29 -04:00
Jesse Glick
37f92b2459
Partly normalizing form binding.
2014-08-11 16:32:57 -04:00
Jesse Glick
e91782e78f
Deleting help files that were supposed to be in ldap-plugin.
2014-08-11 16:13:27 -04:00
Jesse Glick
e826dc1a49
Normalizing form binding.
2014-08-11 15:38:32 -04:00
Jesse Glick
0e8d363ce9
Moving help files to their recommended location.
2014-08-11 15:14:35 -04:00
CloudBees DEV@Cloud
16e206da9f
Merge commit '16197ea502bc2f370f70b65242b9ccb2f0583372'
2014-08-11 17:48:25 +00:00
Jesse Glick
16197ea502
[FIXED JENKINS-23263] JUnit reporter moved to a plugin.
2014-08-11 13:45:23 -04:00
tfennelly
986a7a452e
[FIXED JENKINS-23921] new <div>s layout doesn't work with IE8
2014-08-11 16:24:26 +01:00
Kohsuke Kawaguchi
90c6cc3172
the trunk is toward 1.577-SNAPSHOT
2014-08-10 17:58:25 -07:00
Jesse Glick
f939db47d3
Upgrade mailer to 1.10 to pick up SECURITY-152 fix.
2014-08-06 17:40:06 -04:00
Jesse Glick
34ec6dc050
Deleting help files which were already moved into javadoc-plugin and do not belong here.
2014-08-06 14:58:25 -04:00
tfennelly
7cdb85d09c
Modernized projectview and plugin manager (bigtables with tabs) [JENKINS-24030]
2014-08-05 12:21:18 +01:00
tfennelly
2de93f861a
Modernized tabBar [JENKINS-24030]
2014-08-05 12:01:59 +01:00
tfennelly
bced2c75e3
divification of pane tag
2014-07-30 08:58:40 +01:00
Kohsuke Kawaguchi
b2a98f6bc6
Create a single point in which the basic authentication header is processed.
...
Previously, basic auth header was processed from two different servlet
filters in a single filter chain.
In case the 1st filter (ApiTokenFilter) manages to authenticate the
request, the 2nd filter (BasicProcessingFilter) tries to avoid
interpreting the API token as the password and failing authentication
(see BasicProcessingFilter.authenticationIsRequired), but the check
feels rather fragile.
Although I did eventually discover that the original problem (ZD-19640)
was not caused by this, I've already implemented & tested this change,
and this feels like a good work to be wasted, so I'm pushing this in
anyway.
Refrence: ZD-19640
2014-07-29 16:33:57 -07:00
Harald Albers
4b0ab03cf6
Merge pull request #1326 from albers/missing-td
...
fixed broken HTML tables, added Jelly tag for help links
2014-07-29 17:38:37 +02:00
Kohsuke Kawaguchi
55f8a72e53
the trunk is toward 1.576-SNAPSHOT
2014-07-27 10:56:37 -07:00