Commit Graph
2531 Commits
Author SHA1 Message Date
Daniel Beck ba74788810 [SECURITY-233] Only append crumb to URL in multipart forms 2015-11-19 19:41:26 +01:00
Daniel Beck ef2c0dc163 [FIX SECURITY-233] Remove multipart form exception from crumb filter 2015-11-19 17:42:14 +01:00
Kohsuke Kawaguchi 892f203b9d [maven-release-plugin] prepare for next development iteration 2015-09-02 22:50:12 -07:00
Kohsuke Kawaguchi c105ce5ab4 [maven-release-plugin] prepare release jenkins-1.609.3 2015-09-02 22:50:11 -07:00
Kohsuke Kawaguchi 7613069799 [maven-release-plugin] prepare for next development iteration 2015-07-28 08:46:49 -07:00
Kohsuke Kawaguchi 88f9f4c8fc [maven-release-plugin] prepare release jenkins-1.609.2 2015-07-28 08:46:47 -07:00
tfennelly c7264c4668 [FIXED JENKINS-28455] Build History badges don't wrap
(cherry picked from commit 35eb8ac93e)
2015-06-08 20:52:06 +02:00
Harald Albers fb47e9b58b Update bundled LDAP plugin in order to restore missing help files
In e91782e78f some help files were removed
from core because they were moved to LDAP plugin.
Unfortunately, these help files are not available in LDAP plugin
versions prior to 1.11.
(cherry picked from commit 824662a84d)
2015-06-08 18:39:05 +02:00
Kohsuke Kawaguchi 0cace71a51 [maven-release-plugin] prepare for next development iteration 2015-05-29 18:08:03 -07:00
Kohsuke Kawaguchi 0c04593627 [maven-release-plugin] prepare release jenkins-1.609.1 2015-05-29 18:08:03 -07:00
Oliver Gondža 58edc35abf Towards 1.609.1 2015-05-05 21:02:45 +02:00
Kohsuke Kawaguchi b1bac27272 [maven-release-plugin] prepare for next development iteration 2015-04-05 18:49:28 -07:00
Kohsuke Kawaguchi e544304c0b [maven-release-plugin] prepare release jenkins-1.608 2015-04-05 18:49:28 -07:00
Kohsuke Kawaguchi 25e3a723f3 Revert "Added Jenkins 100K easter egg for 1.600"
This reverts commit fe1a1487d5.
It's been about a month, so I think it has served its purpose.
2015-04-02 11:43:10 -07:00
Kohsuke Kawaguchi b3c2c4d7b6 [maven-release-plugin] prepare for next development iteration 2015-03-30 19:45:58 -07:00
Kohsuke Kawaguchi 6dbf767e7a [maven-release-plugin] prepare release jenkins-1.607 2015-03-30 19:45:57 -07:00
Kohsuke Kawaguchi 6b0f2c0ed9 [maven-release-plugin] prepare for next development iteration 2015-03-23 08:42:19 -07:00
Kohsuke Kawaguchi df66934070 [maven-release-plugin] prepare release jenkins-1.606 2015-03-23 08:42:19 -07:00
Kohsuke Kawaguchi 9e36cc731a [maven-release-plugin] prepare for next development iteration 2015-03-16 19:14:02 -07:00
Kohsuke Kawaguchi 097a7c5ff4 [maven-release-plugin] prepare release jenkins-1.605 2015-03-16 19:14:02 -07:00
Kohsuke Kawaguchi 2657689081 [maven-release-plugin] prepare for next development iteration 2015-03-15 10:32:26 -07:00
Kohsuke Kawaguchi 0ed1fb97ba [maven-release-plugin] prepare release jenkins-1.604 2015-03-15 10:32:26 -07:00
Kohsuke Kawaguchi e9bf4b71cd the trunk is toward 1.604-SNAPSHOT 2015-03-08 12:42:02 -07:00
Kohsuke Kawaguchi 2983905e45 the trunk is toward 1.603-SNAPSHOT 2015-03-04 06:30:25 -08:00
Kohsuke Kawaguchi 8d9329e57c the trunk is toward 1.602-SNAPSHOT 2015-03-01 11:19:22 -08:00
Kohsuke Kawaguchi 083ea50125 [maven-release-plugin] prepare for next development iteration 2015-02-28 09:23:17 -08:00
Kohsuke Kawaguchi 1d096c265d [maven-release-plugin] prepare release jenkins-1.600 2015-02-28 09:23:17 -08:00
Kohsuke Kawaguchi 8c5843537e Merge branch 'security-rc' into rc 2015-02-28 08:26:13 -08:00
Kohsuke Kawaguchi fe1a1487d5 Added Jenkins 100K easter egg for 1.600
My plan is to remove this in a while.
2015-02-28 08:16:53 -08:00
Jesse Glick 8f84890923 Merge branch 'rc' into security-rc 2015-02-27 13:48:15 -05:00
Seiji Sogabe 75b9b314ec added nowrap to avoid table layout being broken. 2015-02-15 15:24:15 +09:00
Daniel Beck 27dbc6bc58 Merge pull request #1483 from pwielgolaski/JENKINS-25953
[FIXED JENKINS-25953]Tabs in job view are layouted in wrong way
2015-02-07 21:51:22 +01:00
Jesse Glick 6ad8cbfc3a Merge branch 'security' into security-rc
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/node_monitors/MonitorOfflineCause.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/FileParameterValue/value_pt_BR.properties
	core/src/main/resources/hudson/model/Job/index.jelly
	core/src/main/resources/hudson/model/TextParameterDefinition/config_pt_BR.properties
	core/src/main/resources/hudson/node_monitors/Messages_cs.properties
	core/src/main/resources/hudson/node_monitors/Messages_sv_SE.properties
	core/src/main/resources/hudson/security/SecurityRealm/signup.jelly
	core/src/main/resources/hudson/slaves/CommandConnector/config_pt_BR.properties
	core/src/main/resources/hudson/views/BuildButtonColumn/column.properties
	core/src/main/resources/jenkins/diagnosis/HsErrPidList/index_pt_BR.properties
	core/src/main/resources/jenkins/model/IdStrategy/config.jelly
	core/src/main/resources/jenkins/model/Jenkins/MasterComputer/_api.jelly
	core/src/main/resources/jenkins/model/Jenkins/load-statistics_pt_BR.properties
	core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.jelly
	core/src/main/resources/jenkins/security/s2m/AdminWhitelistRule/index_pt_BR.properties
	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_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_zh_TW.properties
	core/src/main/resources/jenkins/triggers/Messages_fr.properties
	core/src/main/resources/lib/form/class-entry.jelly
	core/src/main/resources/lib/form/helpLink_pt_BR.properties
	core/src/main/resources/lib/form/link.jelly
	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_nl.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/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/task_pt.properties
	core/src/test/java/hudson/util/XStream2Test.java
	pom.xml
	test/pom.xml
	test/src/test/java/hudson/model/AbstractItemSecurityTest.java
	test/src/test/resources/lib/layout/IconTest/03_testTask.jelly
	war/src/main/webapp/scripts/msie.js
2015-02-05 16:35:57 -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
tfennelly b31bb1cc1c [FIXED JENKINS-26406] Build history text field wrap fails when containing markup 2015-02-04 16:07:36 +00:00
Kohsuke Kawaguchi a66c06fedb the trunk is toward 1.600-SNAPSHOT 2015-01-25 20:53:53 -08:00
tfennelly 1dd60ec778 [FIXED JENKINS-26365] Animated ball in job's build history widget won't open Console Output 2015-01-23 15:16:15 +00:00
Daniel Beck 6852d75bd4 Merge pull request #1509 from smccarthy/JENKINS-19634
[FIXED JENKINS-19634] Fix sorting percentages
2015-01-19 22:39:22 +01:00
Kohsuke Kawaguchi a4165a04dd the trunk is toward 1.599-SNAPSHOT 2015-01-19 10:23:54 -08:00
Jesse Glick 80966d014a 7b90662 added logging in case of an erroneous condition but failed to recover gracefully.
This results in an error in the JavaScript console during the usual “LOADING overlay fails to disappear” kind of bug:
TypeError: Argument 1 of Node.replaceChild is not an object.
2015-01-13 12:20:51 -05:00
tfennelly 0b2bf7ad60 force panel resize check before progressiveText bottom scroll 2015-01-12 09:45:50 +00:00
tfennelly 7a9649ca70 prototypejs setStyle different behavior between firefox and chrome 2015-01-12 09:45:50 +00:00
tfennelly e2ec9eb3c2 [FIX JENKINS-26312] reimpl of layout changes 3e9cdcb
Attempt to do it in pure CSS ala 3e9cdcb failed so using CSS and JS combo.
2015-01-12 09:45:50 +00:00
tfennelly 66c02a4cc3 Revert "Tweak of earlier fix for JENKINS-25971"
This reverts commit 3e9cdcbc85.
2015-01-12 09:45:50 +00:00
Shawn McCarthy 5abb0da923 JENKINS-19634 Fix sorting percentages. Make sure > and < percentages besides 0 and 100 get calculated correctly. 2015-01-05 13:58:11 -07:00