Kohsuke Kawaguchi
62726699e5
Only show the upgrade banner when Jenkins is in charge
2016-03-23 17:02:23 -07:00
recena
c0111242b5
[JENKINS-31162] New special render for flat categories
2016-03-24 01:00:58 +01:00
Daniel Beck
ee5c1a3a13
Merge pull request #2156 from kzantow/JENKINS-33557-tcp-timeouts-during-install
...
[JENKINS-33557] - connectivity checks may cause setup wizard to hang for a long time
2016-03-24 00:28:13 +01:00
Baptiste Mathus
edbab95fe5
More concise welcome text for Jenkins 2
2016-03-24 00:18:01 +01:00
recena
152a9f8fe1
[JENKINS-31162] Renamed weight instead of order. Client-side ordering was removed, no needed
2016-03-23 22:51:26 +01:00
Manuel Recena
b61bfc0881
Merge pull request #28 from tfennelly/recena-JENKINS-31162-PR10
...
Put focus back on item name input after item selection if name is empty
2016-03-23 22:15:58 +01:00
tfennelly
fdb9bb0c5b
Put focus back on item name input after item selection if name is empty.
...
The item name entry is given focus at the start, but loses it of the user selects an item. This changes puts focus back (post item selection) on the name input if it's empty.
2016-03-23 21:08:46 +00:00
Manuel Recena
bfa62aaf3c
Merge pull request #27 from tfennelly/recena-JENKINS-31162-PR09
...
Sort the items within each category
2016-03-23 21:26:26 +01:00
Manuel Recena
c498a7b464
Merge pull request #25 from kzantow/JENKINS-31162
...
Fix scroll on click bug
2016-03-23 21:24:19 +01:00
tfennelly
2f30736a2f
Sort the items within each category
2016-03-23 20:21:51 +00:00
recena
5140598d31
[JENKINS-31162] Revert an unnecessary change
2016-03-23 21:08:29 +01:00
recena
bb1a4922ce
Merge branch 'JENKINS-31162' of https://github.com/recena/jenkins into JENKINS-31162
2016-03-23 21:05:11 +01:00
recena
f1f1565c4a
[JENKINS-31162] Reviewed the ordening applied
2016-03-23 21:04:55 +01:00
Manuel Recena
370ae561d7
Merge pull request #26 from tfennelly/recena-JENKINS-31162-PR08
...
Resize new item page tabbar based on form resize
2016-03-23 21:03:17 +01:00
tfennelly
2628f8c3a0
Resize new item page tabbar based on form resize.
2016-03-23 19:55:17 +00:00
tfennelly
17514cfae9
Fix more funky scrolling + sticky tabbar issues (missed an 5px offset)
2016-03-23 19:55:17 +00:00
kzantow
447a9b7058
Use ProxyConfiguration defaults in UpdateCenter
2016-03-23 15:31:56 -04:00
kzantow
55d3915ef6
Fix scroll on click bug
2016-03-23 15:17:08 -04:00
kzantow
6d5bcad475
Use standard property naming convention
2016-03-23 14:59:45 -04:00
Daniel Beck
6a74607b4e
Merge branch 'master' of github.com:jenkinsci/jenkins into 2.0
...
Conflicts:
cli/pom.xml
core/pom.xml
pom.xml
test/pom.xml
war/pom.xml
2016-03-23 19:46:25 +01:00
Manuel Recena
8d4a324b66
Merge pull request #24 from tfennelly/recena-JENKINS-31162-PR07
...
Fix more funky scrolling + sticky tabbar issues
2016-03-23 19:21:03 +01:00
tfennelly
c9e96a0f1b
Fix more funky scrolling + sticky tabbar issues
2016-03-23 18:17:23 +00:00
Manuel Recena
2890ff32c2
Merge pull request #23 from gusreiber/k-31162
...
Minimum number of tabs to show.
2016-03-23 19:17:00 +01:00
gusreiber
fc7297175a
setting tabs min from gt 1 to gt 3
2016-03-23 10:45:10 -07:00
Daniel Beck
ef24fd6a76
Merge pull request #2164 from kzantow/JENKINS-33728-dont-call-getactiveinstance-in-layoutjelly
...
[JENKINS-33728] - Remove stray getActiveInstance call in layout.jelly
2016-03-23 17:57:22 +01:00
kzantow
8f094a41bc
JENKINS-33728 - Remove stray getActiveInstance call in layout.jelly
2016-03-23 12:42:03 -04:00
Robert Sandell
7d42f78457
Some javadoc for getXStream
2016-03-23 17:21:01 +01:00
kzantow
a536e62766
Modify default ProxyConfiguration.open() to use 20 second connect
...
timeout, this may be modified with the configuration property:
jenkins.proxy.default_connect_timeout_millis, a value of 0 will restore
the previous behavior
2016-03-23 12:17:19 -04:00
recena
afbd888ea1
[JENKINS-31162] A different way to do the same. Asked by @jglick
2016-03-23 15:40:00 +01:00
Robert Sandell
b183d967e9
Make the XStream field be accessible with a getter instead
2016-03-23 15:23:18 +01:00
Manuel Recena
fb110f8810
Merge pull request #22 from tfennelly/recena-JENKINS-31162-PR06
...
Ignore the window scroll event that's generated from the repositioning of the new item page tabbar
2016-03-23 15:12:11 +01:00
tfennelly
715e70f7fa
Fixed a comment typo
2016-03-23 14:10:51 +00:00
tfennelly
51923bd05a
Ignore the window scroll event that's generated from the repositioning of the new item page tabbar.
...
Repositioning of the tabbar causes a scroll event to happen, which causes tab activation/reactivation, which in turn causes a further autoscroll etc etc. Is the cause of the weird scrolling behavior as seen by @daniel-beck.
2016-03-23 14:07:41 +00:00
tfennelly
551b8b28ea
Ignore window scroll events while a manual scroll (tab click) is happening
2016-03-23 13:59:29 +00:00
Manuel Recena
3aaab3678e
Merge pull request #21 from tfennelly/recena-JENKINS-31162-PR05
...
Fix "weight" based sorting algo
2016-03-23 14:48:54 +01:00
tfennelly
84f5c1827e
Fix "weight" based sorting algo
2016-03-23 13:32:58 +00:00
kzantow
2fbf73fc76
Merge remote-tracking branch 'primary/2.0' into JENKINS-33557-tcp-timeouts-during-install
2016-03-23 09:31:48 -04:00
Manuel Recena
4d9d275e3b
Merge pull request #20 from tfennelly/recena-JENKINS-31162-PR04
...
Check if we can enable the ok button on keyup event (Vs change)
2016-03-23 13:23:19 +01:00
tfennelly
cc9c9a9c73
Check if we can enable the ok button on keyup event (Vs change)
...
Using the change event resulted in a strange situation where, if the user selected the job type first and thn entered the name, they'd have to tab out of the name entry field before the ok button would be enabled.
2016-03-23 12:19:30 +00:00
tfennelly
f5a8955675
Add "navBox" earlier and wire in.
2016-03-23 11:55:46 +00:00
Robert Sandell
df1040cdd5
Make Fingerprint's XSTREAM field public
...
Some plugins needs to register compatibility alias etc for
their FingerprintFacets.
2016-03-23 12:14:07 +01:00
Manuel Recena
3fb4fbbde9
Merge pull request #19 from tfennelly/recena-JENKINS-31162-PR03
...
Fix new item page loading weirdness
2016-03-23 11:46:00 +01:00
tfennelly
c5170d89f0
Fix new item page loading weirdness.
2016-03-23 10:40:47 +00:00
tfennelly
ea83e95a71
Remove sidepanel from newJob.jelly
...
And set the body element classes via the cssclass attr
2016-03-23 10:40:47 +00:00
recena
32e8d3b1e3
Merge branch 'JENKINS-31162' of https://github.com/recena/jenkins into JENKINS-31162
2016-03-23 11:39:07 +01:00
recena
c2fdbc94e3
[JENKINS-31162] Removed unused import
2016-03-23 11:38:34 +01:00
tfennelly
2e005ef60c
Remove jenkins-js-widgets.less
...
Was readded in error
2016-03-23 11:38:34 +01:00
tfennelly
1dcad97a15
Add Item specific LESS file (add-item.less)
2016-03-23 11:38:33 +01:00
tfennelly
3bc84da636
Fix lint errors
2016-03-23 11:38:33 +01:00
recena
323efb144e
Merge branch 'JENKINS-31162' of https://github.com/recena/jenkins into JENKINS-31162
2016-03-23 11:37:06 +01:00