Skip to content

Commit 213cfe0

Browse files
committed
Merge branch 'main' into keep-svg-xmlns
2 parents 9412e17 + 8120c0c commit 213cfe0

38 files changed

+1768
-1521
lines changed

.drone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ steps:
726726

727727
# TODO: We should probably build all dependencies into a test image
728728
- name: test-e2e
729-
image: mcr.microsoft.com/playwright:v1.29.2-focal
729+
image: mcr.microsoft.com/playwright:v1.31.2-focal
730730
commands:
731731
- curl -sLO https://go.dev/dl/go1.20.linux-amd64.tar.gz && tar -C /usr/local -xzf go1.20.linux-amd64.tar.gz
732732
- groupadd --gid 1001 gitea && useradd -m --gid 1001 --uid 1001 gitea

package-lock.json

Lines changed: 1477 additions & 1379 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,42 @@
44
"private": true,
55
"type": "module",
66
"engines": {
7-
"node": ">= 14.0.0"
7+
"node": ">= 16.0.0"
88
},
99
"dependencies": {
1010
"@citation-js/core": "0.6.5",
11-
"@citation-js/plugin-bibtex": "0.6.5",
12-
"@citation-js/plugin-csl": "0.6.5",
11+
"@citation-js/plugin-bibtex": "0.6.6",
12+
"@citation-js/plugin-csl": "0.6.7",
1313
"@citation-js/plugin-software-formats": "0.6.0",
1414
"@claviska/jquery-minicolors": "2.3.6",
1515
"@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
16-
"@primer/octicons": "17.10.2",
17-
"@vue/compiler-sfc": "3.2.45",
16+
"@primer/octicons": "18.2.0",
17+
"@vue/compiler-sfc": "3.2.47",
1818
"add-asset-webpack-plugin": "2.0.1",
1919
"ansi-to-html": "0.7.2",
20-
"asciinema-player": "3.0.1",
20+
"asciinema-player": "3.2.0",
2121
"css-loader": "6.7.3",
2222
"dropzone": "6.0.0-beta.2",
2323
"easymde": "2.18.0",
24-
"esbuild-loader": "2.21.0",
24+
"esbuild-loader": "3.0.1",
2525
"escape-goat": "4.0.0",
2626
"fast-glob": "3.2.12",
2727
"font-awesome": "4.7.0",
28-
"jquery": "3.6.3",
28+
"jquery": "3.6.4",
2929
"jquery.are-you-sure": "1.9.0",
3030
"katex": "0.16.4",
3131
"license-checker-webpack-plugin": "0.2.1",
3232
"mermaid": "10.0.2",
3333
"mini-css-extract-plugin": "2.7.4",
34-
"monaco-editor": "0.34.1",
34+
"monaco-editor": "0.36.1",
3535
"monaco-editor-webpack-plugin": "7.0.1",
3636
"pretty-ms": "8.0.0",
3737
"sortablejs": "1.15.0",
38-
"swagger-ui-dist": "4.15.5",
38+
"swagger-ui-dist": "4.18.1",
3939
"tippy.js": "6.3.7",
4040
"tributejs": "5.1.3",
4141
"uint8-to-base64": "0.2.0",
42-
"vue": "3.2.45",
42+
"vue": "3.2.47",
4343
"vue-bar-graph": "2.0.0",
4444
"vue-loader": "17.0.1",
4545
"vue3-calendar-heatmap": "2.0.0",
@@ -48,25 +48,25 @@
4848
"workbox-routing": "6.5.4",
4949
"workbox-strategies": "6.5.4",
5050
"worker-loader": "3.0.8",
51-
"wrap-ansi": "8.0.1"
51+
"wrap-ansi": "8.1.0"
5252
},
5353
"devDependencies": {
54-
"@playwright/test": "1.29.2",
54+
"@playwright/test": "1.31.2",
5555
"@rollup/pluginutils": "5.0.2",
5656
"@stoplight/spectral-cli": "6.6.0",
57-
"eslint": "8.32.0",
57+
"eslint": "8.36.0",
5858
"eslint-plugin-import": "2.27.5",
5959
"eslint-plugin-jquery": "1.5.1",
6060
"eslint-plugin-sonarjs": "0.18.0",
61-
"eslint-plugin-unicorn": "45.0.2",
61+
"eslint-plugin-unicorn": "46.0.0",
6262
"eslint-plugin-vue": "9.9.0",
63-
"jsdom": "21.0.0",
63+
"jsdom": "21.1.1",
6464
"markdownlint-cli": "0.33.0",
65-
"stylelint": "15.2.0",
65+
"stylelint": "15.3.0",
6666
"stylelint-declaration-strict-value": "1.9.2",
6767
"svgo": "3.0.2",
68-
"updates": "13.2.7",
69-
"vitest": "0.27.2"
68+
"updates": "13.2.9",
69+
"vitest": "0.29.3"
7070
},
7171
"browserslist": [
7272
"defaults",
Lines changed: 1 addition & 1 deletion
Loading

public/img/svg/octicon-chevron-up.svg

Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

public/img/svg/octicon-download.svg

Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 1 deletion
Loading

public/img/svg/octicon-issue-tracked-in.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

public/img/svg/octicon-upload.svg

Lines changed: 1 addition & 1 deletion
Loading

public/img/svg/octicon-zoom-in.svg

Lines changed: 1 addition & 0 deletions
Loading

public/img/svg/octicon-zoom-out.svg

Lines changed: 1 addition & 0 deletions
Loading

templates/base/footer_content.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
{{end}}
2222
<div class="ui language bottom floating slide up dropdown link item">
2323
{{svg "octicon-globe"}}
24-
<div class="text">{{.locale.LangName}}</div>
24+
<span>{{.locale.LangName}}</span>
2525
<div class="menu language-menu">
2626
{{range .AllLangs}}
2727
<a lang="{{.Lang}}" data-url="{{AppSubUrl}}/?lang={{.Lang}}" class="item {{if eq $.locale.Lang .Lang}}active selected{{end}}">{{.Name}}</a>

templates/base/head_navbar.tmpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="ui container" id="navbar" role="navigation" aria-label="{{.locale.Tr "aria.navbar"}}">
1+
<nav class="ui container" id="navbar" aria-label="{{.locale.Tr "aria.navbar"}}">
22
{{$notificationUnreadCount := 0}}
33
{{if .IsSigned}}
44
{{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}}
@@ -150,7 +150,7 @@
150150
</div><!-- end content create new menu -->
151151
</div><!-- end dropdown menu create new -->
152152

153-
<div class="ui dropdown jump item tooltip gt-mx-0" tabindex="-1" data-content="{{.locale.Tr "user_profile_and_more"}}">
153+
<div class="ui dropdown jump item tooltip gt-mx-0" data-content="{{.locale.Tr "user_profile_and_more"}}">
154154
<span class="text">
155155
{{avatar $.Context .SignedUser 24 "tiny"}}
156156
<span class="sr-only">{{.locale.Tr "user_profile_and_more"}}</span>
@@ -190,14 +190,14 @@
190190

191191
<a class="{{if .PageIsAdmin}}active {{end}}item" href="{{AppSubUrl}}/admin">
192192
{{svg "octicon-server"}}
193-
{{.locale.Tr "admin_panel"}}<!-- Admin Panel -->
193+
{{.locale.Tr "admin_panel"}}
194194
</a>
195195
{{end}}
196196

197197
<div class="divider"></div>
198198
<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
199199
{{svg "octicon-sign-out"}}
200-
{{.locale.Tr "sign_out"}}<!-- Sign Out -->
200+
{{.locale.Tr "sign_out"}}
201201
</a>
202202
</div><!-- end content avatar menu -->
203203
</div><!-- end dropdown avatar menu -->
@@ -213,6 +213,6 @@
213213
<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login{{if not .PageIsSignIn}}?redirect_to={{.CurrentURL}}{{end}}">
214214
{{svg "octicon-sign-in"}} {{.locale.Tr "sign_in"}}
215215
</a>
216-
</div><!-- end anonymous right menu -->
216+
</div><!-- end anonymous user right menu -->
217217
{{end}}
218-
</div>
218+
</nav>

templates/repo/commit_page.tmpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
<div class="gt-df gt-ac">
217217
{{if .Verification.Verified}}
218218
{{if ne .Verification.SigningUser.ID 0}}
219-
{{svg "octicon-shield-check" 16 "gt-mr-3"}}
219+
{{svg "octicon-verified" 16 "gt-mr-3"}}
220220
{{if .Verification.SigningSSHKey}}
221221
<span class="ui text gt-mr-3">{{.locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
222222
{{.Verification.SigningSSHKey.Fingerprint}}
@@ -225,7 +225,7 @@
225225
{{.Verification.SigningKey.PaddedKeyID}}
226226
{{end}}
227227
{{else}}
228-
{{svg "octicon-shield-lock" 16 "gt-mr-3"}}
228+
{{svg "octicon-unverified" 16 "gt-mr-3"}}
229229
{{if .Verification.SigningSSHKey}}
230230
<span class="ui text gt-mr-3 tooltip" data-content="{{.locale.Tr "gpg.default_key"}}">{{.locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
231231
{{.Verification.SigningSSHKey.Fingerprint}}
@@ -235,7 +235,7 @@
235235
{{end}}
236236
{{end}}
237237
{{else if .Verification.Warning}}
238-
{{svg "octicon-shield" 16 "gt-mr-3"}}
238+
{{svg "octicon-unverified" 16 "gt-mr-3"}}
239239
{{if .Verification.SigningSSHKey}}
240240
<span class="ui text gt-mr-3">{{.locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
241241
{{.Verification.SigningSSHKey.Fingerprint}}
@@ -246,14 +246,14 @@
246246
{{else}}
247247
{{if .Verification.SigningKey}}
248248
{{if ne .Verification.SigningKey.KeyID ""}}
249-
{{svg "octicon-shield" 16 "gt-mr-3"}}
249+
{{svg "octicon-verified" 16 "gt-mr-3"}}
250250
<span class="ui text gt-mr-3">{{.locale.Tr "repo.commits.gpg_key_id"}}:</span>
251251
{{.Verification.SigningKey.PaddedKeyID}}
252252
{{end}}
253253
{{end}}
254254
{{if .Verification.SigningSSHKey}}
255255
{{if ne .Verification.SigningSSHKey.Fingerprint ""}}
256-
{{svg "octicon-shield" 16 "gt-mr-3"}}
256+
{{svg "octicon-verified" 16 "gt-mr-3"}}
257257
<span class="ui text gt-mr-3">{{.locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
258258
{{.Verification.SigningSSHKey.Fingerprint}}
259259
{{end}}

templates/repo/issue/view_content/add_reaction.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{if .ctxData.IsSigned}}
2-
<div class="item action ui pointing select-reaction dropdown top right" data-action-url="{{.ActionURL}}">
2+
<div class="item action ui dropdown jump pointing top right select-reaction" data-action-url="{{.ActionURL}}">
33
<a class="add-reaction">
44
{{svg "octicon-smiley"}}
55
</a>

templates/repo/issue/view_content/context_menu.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{if .ctxData.IsSigned}}
2-
<div class="item action ui pointing custom dropdown top right context-dropdown">
2+
<div class="item action ui dropdown jump pointing top right context-dropdown">
33
<a class="context-menu">
44
{{svg "octicon-kebab-horizontal"}}
55
</a>

0 commit comments

Comments
 (0)