Commit Graph
17924 Commits
Author SHA1 Message Date
Jesse Glick ede95a0fb0 Merge branch 'master' into login-events-JENKINS-20999 2014-01-02 13:01:41 -05:00
Jesse Glick 2756f08c13 Merge branch 'master' into folder-moving
Conflicts:
	core/src/main/java/hudson/model/Items.java
2014-01-02 12:51:42 -05:00
stephlag 6d7bd89f62 Translated all messages 2014-01-02 11:08:48 +01:00
Kohsuke Kawaguchi 3634681324 the trunk is toward 1.547-SNAPSHOT 2013-12-31 16:00:07 -08:00
Kohsuke Kawaguchi 162fc30b4a creating an RC branch 2013-12-31 16:00:02 -08:00
Kohsuke Kawaguchi cc0622edda merged back the RC branch 2013-12-31 15:02:17 -08:00
Kohsuke Kawaguchi f4a1af2533 updated changelog as a part of the release 2013-12-31 15:02:14 -08:00
Kohsuke Kawaguchi 6589b88207 updated changelog for release 2013-12-31 13:13:39 -08:00
Kohsuke Kawaguchi ba3b5e073e [maven-release-plugin] prepare for next development iteration 2013-12-31 12:42:32 -08:00
Kohsuke Kawaguchi 4d3549a17f [maven-release-plugin] prepare release jenkins-1.545 jenkins-1.545 2013-12-31 12:42:31 -08:00
Jesse Glick 8011acf028 [FIXED JENKINS-21183] Updated XStream to pick up NPE fix. builds/10 changes/10 2013-12-31 11:49:34 -05:00
stephlag 6cc74f511f Added some french translations 2013-12-31 11:13:26 +01:00
stephlag 0552aceb66 Added some french translations 2013-12-31 11:00:16 +01:00
Oleg Nenashev 1e849c0ed4 Renamed "Run Command" to "Run Shell Command"
The original name is quite confusing for users, because they usually want to run Batch scripts inside this installer. "Execute Batch Command" is available inside "extra-tool-installers" plugin, so there's no need to implement such installer inside the core.

Related to: https://issues.jenkins-ci.org/browse/JENKINS-20635

Signed-off-by: Oleg Nenashev <nenashev@synopsys.com>
2013-12-24 12:04:55 +04:00
CloudBees DEV@Cloud 7871cb191f Merge commit 'fd97a2f5e858ae137935dcf56d3a95b74ba279fc' builds/9 2013-12-23 23:10:03 +00:00
Jesse Glick fd97a2f5e8 Fingerprinter calls rebuildDependencyGraphAsync, so since this is now delayed by 500msec, tests incorrect as of 1.522 will now fail pretty reliably unless made to forcibly rebuild the graph. changes/9 2013-12-23 18:08:48 -05:00
Jesse Glick e292366f62 Merge pull request #1077 from daniel-beck/better-apply-dialog
[JENKINS-20772] Fix scrolling
2013-12-23 14:59:21 -08:00
Daniel Beck 9b947ae8a2 [JENKINS-20772] Fix scrolling 2013-12-23 23:46:01 +01:00
Jesse Glick 78ffa3e923 Noting yet another weird problem with BuildTrigger’s reliance on DependencyGraph for its own execution.
Since this is now (1.522) updated asynchronously, the value may not actually be correct, potentially causing erratic behavior especially in tests.
changes/8
2013-12-23 17:40:08 -05:00
CloudBees DEV@Cloud f2e2cbeca4 Merge REMERGE_HEAD into HEAD 2013-12-23 22:13:42 +00:00
Jesse Glick f8a73006e9 Merge pull request #1076 from daniel-beck/better-apply-dialog
[JENKINS-20772] Only show error message in dialog
2013-12-23 13:54:12 -08:00
Daniel Beck b856cc2434 [JENKINS-20772] Only show error message in dialog
This change removes the superfluous UI elements around the error
message if possible. Otherwise, fall back to existing behavior
of adding entire page to iframe.
2013-12-23 22:28:47 +01:00
Jesse Glick 1805b90a31 rebuildDependencyGraphAsync can wait a fraction of a second to improve the chances that events will be coalesced. builds/7 changes/7 2013-12-23 16:17:19 -05:00
Jesse Glick 3fe6ed7b78 Make sure rebuildDependencyGraphAsync does not repeat work if called many times in quick succession. builds/6 changes/6 2013-12-23 15:58:51 -05:00
Jesse Glick 28e403ac05 Providing a documented abstraction for Items.updatingByXml.
(Turns out cloudbees-template at least needs this, and it is possible other things besides Trigger could use it too.)
builds/5 changes/5
2013-12-23 14:59:54 -05:00
Jesse Glick 6a9ce7f933 Incorrect filename in error. 2013-12-23 14:10:12 -05:00
Jesse Glick c7dcb99290 [JENKINS-17401] [JENKINS-20772] Noting. builds/4 changes/4 2013-12-23 13:24:42 -05:00
Jesse Glick 0e8195c43d [FIXED JENKINS-20772] Properly render response in case Apply results in an error page. 2013-12-23 13:22:43 -05:00
Jesse Glick 9e5817adbb [FIXED JENKINS-17401] Behave gracefully if the user tries to rename a job using the Apply button. 2013-12-23 12:31:58 -05:00
Jesse Glick 9f23c0bdb3 JavaScript error when showing a FormException after Apply is clicked. Related to JENKINS-20772 but probably not the same. 2013-12-23 12:30:51 -05:00
Jesse Glick 833c423268 [JENKINS-18678] Tweaking API, adding @since & changelog for #1075, fixing purgeCache so that test can pass. builds/3 changes/3 2013-12-23 11:10:56 -05:00
Jesse Glick fa039957fa Merge branch 'synopsys-arc-oss-jenkins_18678_job_renaming_fix' 2013-12-23 10:13:14 -05:00
Jesse Glick 1943801ba7 [JENKINS-18678] Reproduced problem in test. 2013-12-23 10:11:53 -05:00
Oleg Nenashev 568ccba818 [FIXED JENKINS-18678] - Update builds location in RunMap after the job's renaming
This change resolve the issue with missing builds after the jobs renaming and further cleanup of cache.
Finally, the cache's directory location will be updated after the each job renaming.
https://issues.jenkins-ci.org/browse/JENKINS-18678

Signed-off-by: Oleg Nenashev <nenashev@synopsys.com>
2013-12-23 14:02:50 +04:00
Oliver Gondža 7b83852b66 Merge pull request #1074 from rowanhill/patch-1
Add optional version arg to build.sh usage message
2013-12-22 05:05:47 -08:00
Rowan Hill 1dc372d049 Add optional version arg to build.sh usage message 2013-12-22 13:02:04 +00:00
Oliver Gondža 5c28ec83bc Merge pull request #1073 from yoichi/help-ja-typo
fix typo in help in Japanese
2013-12-21 01:58:47 -08:00
Yoichi Nakayama 05e6742836 fix typo in help in Japanese 2013-12-21 14:24:21 +09:00
Jesse Glick eddd9d8bb1 FileUtils.moveDirectory falls back to copy-and-delete if target does not yet exist, which fails to work correctly with symlinks. 2013-12-20 15:18:58 -05:00
Jesse Glick 12adc2248d Items.move should return the new item. 2013-12-20 11:29:17 -05:00
Jesse Glick 6d3c2e0d84 [FIXED JENKINS-18680] Update members of a ListView using a regular listener, not View.onJobRenamed which does not work with folders. 2013-12-19 18:28:01 -05:00
Jesse Glick a11df3f338 Rewrote computeRelativeNamesAfterRenaming to work with moves. 2013-12-19 17:21:11 -05:00
Jesse Glick 7aef5bc6e0 Merge pull request #1072 from bkmeneguello/matrix-bundle-fix
Fix Malformed \uxxxx encoding
2013-12-19 13:19:18 -08:00
Bruno Kühnen Meneguello bb8fa7a8c8 Fix Malformed \uxxxx encoding 2013-12-19 19:03:24 -02:00
Jesse Glick 74db6eba11 Merge pull request #1071 from bkmeneguello/matrix-bundle-fix
Fix portuguese translation
2013-12-19 12:46:05 -08:00
Bruno Kühnen Meneguello 580c53109a Fixed portuguese translation for some matrix resources 2013-12-19 17:29:31 -02:00
Oliver Gondža 760e3f65f0 Merge pull request #1051 from slide/master
Allow SCMPollListener subclasses to provide UI elements
2013-12-19 10:33:56 -08:00
Alex Earl ed7828b959 Merge branch 'scmpolllistener' 2013-12-19 11:24:56 -07:00
Alex Earl 4fbe1a1fe6 Merge branch 'master' of github.com:jenkinsci/jenkins into scmpolllistener 2013-12-19 11:22:12 -07:00
Jesse Glick b65f42c6d0 Working on making it straightforward for plugins to update even relative names after a move. 2013-12-19 12:56:41 -05:00