From c4c19cee1bbf911edcc807c1a1687937c8a0957f Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 14 Dec 2021 15:03:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E5=A4=A7=E5=B0=8F=E5=8D=95=E4=BD=8D=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/js/components/MinioUploader.vue | 2 +- web_src/js/components/ObsUploader.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/components/MinioUploader.vue b/web_src/js/components/MinioUploader.vue index 8006b0c91..0699f957e 100755 --- a/web_src/js/components/MinioUploader.vue +++ b/web_src/js/components/MinioUploader.vue @@ -52,7 +52,7 @@ export default { previewTemplate += ' '; previewTemplate += ' \n '; - previewTemplate += '
\n '; + previewTemplate += '
\n '; previewTemplate += ' \n '; previewTemplate += '
'; previewTemplate += diff --git a/web_src/js/components/ObsUploader.vue b/web_src/js/components/ObsUploader.vue index b0796fe81..3b5bd3162 100755 --- a/web_src/js/components/ObsUploader.vue +++ b/web_src/js/components/ObsUploader.vue @@ -53,7 +53,7 @@ export default { previewTemplate += ' '; previewTemplate += '
\n '; - previewTemplate += '
\n '; + previewTemplate += '
\n '; previewTemplate += ' \n '; previewTemplate += '
'; previewTemplate += From 8a717fb24e14501bee42035fd05b1d67eb3dcab5 Mon Sep 17 00:00:00 2001 From: Gitea Date: Thu, 16 Dec 2021 12:45:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8C=E7=A8=8B?= =?UTF-8?q?=E7=A2=91=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/img/correct.svg | 1 + templates/repo/issue/list.tmpl | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 public/img/correct.svg diff --git a/public/img/correct.svg b/public/img/correct.svg new file mode 100644 index 000000000..ffb0882a8 --- /dev/null +++ b/public/img/correct.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index e7cb8b19f..a4d1e30bf 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -1,3 +1,15 @@ + {{template "base/head" .}}
{{template "repo/header" .}} @@ -65,7 +77,13 @@
{{.i18n.Tr "repo.issues.filter_milestone_no_select"}} {{range .Milestones}} - {{.Name}} + + + +
  • {{if eq $.MilestoneID .ID}}{{end}}
    • +
  • {{.Name}}
    • +     + {{end}}
    From 2895b83ecd8f69dc7d863864a67cecd89e5bda20 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 17 Dec 2021 11:18:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8C=E7=A8=8B?= =?UTF-8?q?=E7=A2=91=E7=AD=9B=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 1 + templates/repo/issue/list.tmpl | 47 ++++++++++++++++++++++----------- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index d58a61756..c95aec81e 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1127,6 +1127,7 @@ issues.filter_label_exclude = `Use alt + click/enter t issues.filter_label_no_select = All labels issues.filter_milestone = Milestone issues.filter_milestone_no_select = All milestones +issues.filter_milestone_no_add = Not add milestones issues.filter_assignee = Assignee issues.filter_assginee_no_select = All assignees issues.filter_type = Type diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 45cabda8f..edeb1356e 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1140,6 +1140,7 @@ issues.filter_label_exclude=`使用 alt + 鼠标左键 / 回 issues.filter_label_no_select=所有标签 issues.filter_milestone=里程碑筛选 issues.filter_milestone_no_select=所有里程碑 +issues.filter_milestone_no_add=未添加里程碑 issues.filter_assignee=指派人筛选 issues.filter_assginee_no_select=所有指派成员 issues.filter_type=类型筛选 diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index a4d1e30bf..96d4c0ab5 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -1,13 +1,9 @@ {{template "base/head" .}} @@ -69,22 +65,41 @@
    -
    +
    {{.i18n.Tr "repo.issues.filter_milestone"}}
    {{.i18n.Tr "repo.issues.filter_milestone_no_select"}} - {{range .Milestones}} - + {{.i18n.Tr "repo.issues.filter_milestone_no_add"}} + + + {{if .OpenMilestones}} +
    +
    + {{svg "octicon-milestone" 12 }} + {{.i18n.Tr "repo.issues.new.open_milestone"}} +
    + {{range .OpenMilestones}} + + {{.Name}} + + {{end}} + {{end}} + + {{if .ClosedMilestones}} +
    +
    + {{svg "octicon-milestone" 12}} + {{.i18n.Tr "repo.issues.new.closed_milestone"}} +
    + {{range .ClosedMilestones}} - -
  • {{if eq $.MilestoneID .ID}}{{end}}
    • -
  • {{.Name}}
    • + {{.Name}}     - - {{end}} + {{end}} + {{end}}
    From 24d67efe4fdb9fb23658c837e175bbacad9b4136 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 17 Dec 2021 14:17:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/img/correct.svg | 1 - 1 file changed, 1 deletion(-) delete mode 100644 public/img/correct.svg diff --git a/public/img/correct.svg b/public/img/correct.svg deleted file mode 100644 index ffb0882a8..000000000 --- a/public/img/correct.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file