Skip to content

Commit

Permalink
Merge branch 'master' into move-abstractbuildview-to-run
Browse files Browse the repository at this point in the history
  • Loading branch information
janfaracik authored Aug 19, 2023
2 parents 41b733c + a52c263 commit a518033
Show file tree
Hide file tree
Showing 23 changed files with 74 additions and 120 deletions.
2 changes: 2 additions & 0 deletions core/src/main/resources/hudson/Messages_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ Util.day ={0} j
Util.month ={0} mo.
Util.year ={0} an.

UpdateCenter.DownloadButNotActivated=La mise à jour a été téléchargée avec succès. Elle sera activée lors du prochain démarrage

FilePath.TildaDoesntWork=''~'' n''est supporté que sur les shells Unix.

PluginManager.PortNotANumber=Le port n''est pas un nombre
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# The MIT License
#
# Copyright (c) 2023, Damian Szczepanik
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Updates=Mises à jour
Available\ plugins=Plugins disponibles
Installed\ plugins=Plugins installés
Advanced\ settings=Paramètres avancés
Download\ progress=Progression des téléchargements
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,8 @@ Strategy=Strateji
name={0} isim
Description=Açıklama
LOADING=YÜKLENİYOR
Configuration=Konfigürasyon
Configure=Konfigürasyonu Düzenle
General=Genel
Save=Kaydet
Apply=Uygula
4 changes: 2 additions & 2 deletions core/src/main/resources/hudson/model/Messages_tr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ Run.UnableToDelete={0} silinemiyor: {1}

View.Permissions.Title=Görüntü
Permalink.LastBuild=Son yapılandırma
Permalink.LastStableBuild=Son stabil yapılandırma
Permalink.LastStableBuild=Son kararlı yapılandırma
Permalink.LastSuccessfulBuild=Son başarılı yapılandırma
Permalink.LastFailedBuild=Son başarısız yapılandırma
ManageJenkinsAction.DisplayName=Jenkins''i Yönet
ParametersDefinitionProperty.DisplayName=Bu yapılandırma parametreleştirilmiştir.
ParametersDefinitionProperty.DisplayName=Bu projeyi parametrik hale getir

ManagementLink.Category.CONFIGURATION=Sistem Konfigürasyonu
ManagementLink.Category.SECURITY=Güvenlik
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Update\ Center=Centre de mise à jour
warning=Une fois l''installation terminée, Jenkins doit être redémarré \
pour prendre en compte les nouveaux plugins.
Installing\ Plugins/Upgrades=Installation/Mise à jour des Plugins
Schedule\ Restart=Programmer un redémarrage
Download\ progress=Progression du téléchargement
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dl {
td(val.fullJobName)
} else {
td {
a(job.getFullDisplayName(), href: job.getUrl(), class: 'model-link')
a(job.getFullDisplayName(), href: rootURL + '/' + job.getUrl(), class: 'model-link')
}
}
td(Util.getTimeSpanString(val.duration))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ Hudson.ViewName=Hepsi
ParameterizedJobMixIn.build_now=Şimdi Yapılandır
BlockedBecauseOfBuildInProgress.shortDescription=Yapılandırma #{0} zaten işlemde {1}
BlockedBecauseOfBuildInProgress.ETA=\ (ETA: {0})
BuildDiscarderProperty.displayName=Eski Yapılandırmalardan Kurtul
BuildDiscarderProperty.displayName=Eski yapılandırmalardan kurtul
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ReverseBuildTrigger.build_after_other_projects_are_built=Başka projeler yapılandırıldıktan sonra yapılandırma tetikle
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@
# THE SOFTWARE.

Build=Yapılandırma
Build\ Steps=Yapılandırma Adımları
Add\ build\ step=Yapılandırma adımı ekle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# This file is under the MIT License by authors

title.concurrentbuilds=Eğer gerekliyse eş zamanlı yaplandırmaları çalıştır
title.concurrentbuilds=Gerekirse yaplandırmaları eşzamanlı çalıştır
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@

Disable\ this\ project=Yapılandırmayı devre dışı bırak
No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Proje yeniden devreye alınana kadar yeni yapılandırma çalıştırılmayacaktır.
Enabled=Etkin
Disabled=Devre Dışı
Enable\ or\ disable\ the\ current\ project=Bu projeyi etkinleştir veya devre dışı bırak
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Post-build\ Actions=Yapılandırma-sonrası Aksiyonlar
Post-build\ Actions=Yapılandırma Sonrası Aksiyonlar
Add\ post-build\ action=Yapılandırma sonrası aksiyonu ekle
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Post-build\ Actions=Yapılandırma-sonrası Aksiyonlar
Post-build\ Actions=Yapılandırma Sonrası Aksiyonlar
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Disable\ Project=Projeyi devre dışı bırak
Disable\ Project=Projeyi Devre Dışı Bırak
This\ project\ is\ currently\ disabled=Bu proje şimdilik devre dışı
Enable=Etkinleştir
2 changes: 1 addition & 1 deletion test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>324.va_f5d6774f3a_d</version>
<version>325.vcb_307d2a_2782</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions war/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
"eslint-config-prettier": "9.0.0",
"handlebars-loader": "1.7.3",
"mini-css-extract-plugin": "2.7.6",
"postcss": "8.4.27",
"postcss": "8.4.28",
"postcss-loader": "7.3.3",
"postcss-preset-env": "9.1.1",
"postcss-scss": "4.0.6",
"prettier": "3.0.1",
"prettier": "3.0.2",
"sass": "1.65.1",
"sass-loader": "13.3.2",
"style-loader": "3.3.3",
Expand Down
2 changes: 0 additions & 2 deletions war/src/main/js/add-item.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use "widgets/variables";

/*
* Widget styles
*/
Expand Down
16 changes: 0 additions & 16 deletions war/src/main/js/widgets/variables.scss

This file was deleted.

69 changes: 12 additions & 57 deletions war/src/main/scss/abstracts/theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,13 @@ $semantics: (

// branding
--secondary: hsl(240, 10%, 50%);
--focus: #3fb3f7;
--focus-input-border: #063f61;
--focus-input-glow: #{color.change(#0b6aa2, $alpha: 0.25)};

// Deprecated
--focus-btn-primary: #{color.change(#0b6aa2, $alpha: 0.5)};
--focus-btn-secondary: #{color.change(#0b6aa2, $alpha: 0.5)};
--focus-btn-danger: #{color.change(#cc0003, $alpha: 0.5)};
--focus-input-border: #063f61;
--focus-input-glow: #{color.change(#0b6aa2, $alpha: 0.25)};

// State colors
--primary-hover: #0587d4;
Expand All @@ -71,36 +72,23 @@ $semantics: (
// Background colors
--background: var(--white);

// Borders
--line-green: #acb;
--medium-translucent: rgba(255, 255, 255, 0.75);

// Page header colors
--logo-bg: var(--white);
// Header
--brand-link-color: var(--secondary);
--header-link-color: var(--white);
--header-link-color-active: #f5f5f5;
--header-link-outline: var(--focus);
--header-search-border: var(--white);
--search-input-color: var(--brand-link-color);
--search-bg: var(--white);
--search-box-completion-bg: var(--primary-hover);
--search-box-shadow: 0 1px 7px 0 rgba(0, 0, 0, 0.3);

// Header classic colors
--header-bg-classic: #000;
--header-link-bg-classic-hover: #404040;
--header-link-bg-classic-active: #404040;

// Header dimensions
--header-item-border-radius: 4px;

// Breadcrumbs bar
--breadcrumbs-bar-background: hsla(240, 20%, 96.5%, 0.8);

// Footer
--footer-background: hsla(240, 20%, 96.5%, 0.8);

// Alert call outs
--alert-success-text-color: #155724;
--alert-success-bg-color: #d4edda;
Expand All @@ -118,19 +106,19 @@ $semantics: (
// Typography
--text-color-secondary: var(--secondary);

// Button generic
// Deprecated - Button generic
--btn-font-weight: bold;
--btn-text-color: var(--white);
--btn-font-size: var(--font-size-xs);
--btn-line-height: 1rem;
--btn-large-font-size: var(--font-size-sm);
--btn-large-line-height: 1.25rem;
// Button primary
// Deprecated - Button primary
--button-color--primary: var(--background);
--btn-primary-bg: #063f61;
--btn-primary-bg-hover: lighten(#063f61, 7.5%);
--btn-primary-bg-active: lighten(#063f61, 12%);
// Button primary
// Deprecated - Button primary
--btn-secondary-color: var(--secondary);
--btn-secondary-bg: var(--btn-text-color);
--btn-secondary-border: var(--medium-grey);
Expand All @@ -143,18 +131,14 @@ $semantics: (
--btn-secondary-color--active: var(--primary-active);
--btn-secondary-bg--active: var(--btn-secondary-bg);
--btn-secondary-border--active: var(--primary-active);
// Button link
// Deprecated - Button link
--btn-link-color: var(--accent-color);
--btn-link-font-weight: var(--link-font-weight);
--btn-link-color--hover: var(--primary-hover);
--btn-link-bg--hover: var(--very-light-grey);
--btn-link-color--active: var(--primary-active);
--btn-link-bg--active: var(--light-grey);

// Help area
--help-area-bg-color: var(--very-light-grey);
--configure-job-help-area-bg-color: var(--medium-translucent);

// Table
--table-background: var(--panel-header-bg-color);
--table-header-foreground: var(--text-color);
Expand Down Expand Up @@ -250,25 +234,7 @@ $semantics: (
--tabs-item-foreground--selected: var(--link-color);
--tabs-border-radius: calc((10px + 34px) / 2);

// Deprecated
--tab-link-border-radius: 10px;
--tab-link-border-width: 2px;
--tab-link-padding-x: 0.75rem;
--tab-link-padding-y: 0.375rem;
--tab-link-font-weight: bold;
--tab-link-text-color: var(--text-color-secondary);
--tab-link-bg: transparent;
--tab-link-border-color: var(--light-grey);
--tab-link-text-color--hover: var(--tab-link-text-color); // Redundant?
--tab-link-bg--hover: var(--light-grey);
--tab-link-border-color--hover: var(--tab-link-bg--hover); // Redundant?
--tab-link-text-color--active: var(--tab-link-text-color); // Redundant?
--tab-link-bg--active: var(--light-grey);
--tab-link-border-color--active: var(--tab-link-checked-bg); // Redundant?
--tab-link-checked-text-color: var(--white);
--tab-link-checked-bg: var(--dark-grey);
--tab-link-checked-border-color: var(--tab-link-checked-bg);
// Tabbar baseline
// Deprecated - Tabbar baseline
--tab-baseline-width: 2px;
--tab-baseline-color: var(--light-grey);
--tab-baseline-default-display: none;
Expand Down Expand Up @@ -310,21 +276,14 @@ $semantics: (
--standard-transition: 0.3s ease;
--elastic-transition: 0.3s cubic-bezier(0, 0.68, 0.5, 1.5);

// Pop out menus
// Deprecated - Pop out menus
--menu-text-color: black;
--menu-bg-color: var(--white);
--menu-selected-color: #b3d4ff;
--menu-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3);

// Manage component
--manage-option-bg-color--hover: var(--very-light-grey);
--manage-option-bg-color--active: var(--light-grey);
--manage-option-border-color: var(--medium-grey);

// Add form widget / configure job
// Deprecated - Add form widget / configure job
--light-bg-color: #eee;
--bright-bg-color: #f9f9f9;
--brightest-bg-color: var(--white);
--light-bg-color--hover: rgba(255, 255, 255, 0.65);
--add-item-btn-decorator-border-color: #acb;
--add-item-btn-decorator-bg-color: rgba(245, 249, 239, 0.75);
Expand All @@ -341,10 +300,6 @@ $semantics: (
// Auto complete
--auto-complete-bg-color--prehighlight: #b3d4ff;

// Call to action
--call-to-action-link-color: #000;
--call-to-action-text-color: var(--alert-info-text-color);

// Default button
--button-background: hsla(240, 25%, 75%, 0.1);
--button-background--hover: hsla(240, 25%, 75%, 0.175);
Expand Down
16 changes: 0 additions & 16 deletions war/src/main/scss/base/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -156,22 +156,6 @@ a.tip:hover span {
text-align: left;
}

.call-to-action {
display: table;
margin-bottom: 5px;
padding: 10px;
background-color: var(--alert-info-bg-color);
border-left: 4px solid #577baa;
color: var(--call-to-action-text-color);
}

.call-to-action a,
.call-to-action a:visited {
color: var(--call-to-action-link-color);
font-weight: bold;
font-size: larger;
}

img {
vertical-align: middle;
border: 0;
Expand Down
1 change: 0 additions & 1 deletion war/src/main/scss/modules/page-header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ a.page-header__brand-link {
padding: 0.5rem;
margin-right: 0 !important;
font-weight: bold;
outline-color: var(--header-link-outline);

&:link,
&:visited {
Expand Down
2 changes: 0 additions & 2 deletions war/src/main/webapp/scripts/hudson-behavior.js
Original file line number Diff line number Diff line change
Expand Up @@ -1395,14 +1395,12 @@ function rowvgStartEachRow(recursive, f) {
(function () {
var cmdKeyDown = false;
var mode = e.getAttribute("script-mode") || "text/x-groovy";
var readOnly = eval(e.getAttribute("script-readOnly")) || false;

// eslint-disable-next-line no-unused-vars
var w = CodeMirror.fromTextArea(e, {
mode: mode,
lineNumbers: true,
matchBrackets: true,
readOnly: readOnly,
onKeyEvent: function (editor, event) {
function saveAndSubmit() {
editor.save();
Expand Down
Loading

0 comments on commit a518033

Please sign in to comment.