caicandong
ab72f7ee4a
remove IsWarning in tmpl ( #26120 )
...
This problem occurs because in #25839 , the warning status has been
removed, but there is something in the tmpl that hasn't been changed.
related #25839
close #26118
2023-07-25 12:09:01 +00:00
wxiaoguang
ad5ce59800
Improve commit graph alignment and truncating ( #26112 )
...
Fix #26101
2023-07-25 10:17:41 +00:00
JakobDev
6598d0291c
Allow Organisations to have a E-Mail ( #25082 )
...
Resolves #25057
This adds a E-Mail field to Organisations. The E-Mail is just shown on
the Profile when it is visited by a logged in User. The E-mail is not
used for something else.
**Screenshots:**
---------
Co-authored-by: Denys Konovalov <kontakt@denyskon.de>
Co-authored-by: Denys Konovalov <privat@denyskon.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Giteabot <teabot@gitea.io>
2023-07-25 08:26:27 +00:00
caicandong
4211efe8b7
fix Missing 404 swagger response docs for /admin/users/{username} ( #26086 )
...
close #26079
2023-07-24 10:48:44 +02:00
HesterG
24c3bb95ac
Categorize admin settings sidebar panel ( #26030 )
...
This PR reorganize and categorize the admin settings sidebar panel into
groups:
- User Accounts, User Emails, Organizations, Authentication Sources ->
Identity & Access
- Repositories, Packages -> Code Assets
- Webhooks, Applications -> Integrations
Before:
<img width="1346" alt="Screen Shot 2023-07-21 at 10 30 28"
src="https://github.com/go-gitea/gitea/assets/17645053/e0c5ae83-464f-4aaa-8bab-2c5258c9278d ">
After:
all configurable settings enabled (package, oauth, webhook)
<img width="1153" alt="Screen Shot 2023-07-21 at 10 27 30"
src="https://github.com/go-gitea/gitea/assets/17645053/88acf3f5-0623-4307-8654-69c654d80874 ">
all configurable settings disabled (package, oauth, webhook)
<img width="1391" alt="Screen Shot 2023-07-21 at 10 25 19"
src="https://github.com/go-gitea/gitea/assets/17645053/9e13aa60-e75c-4077-afd6-3da9e0ae18dd ">
only oauth enabled
<img width="1323" alt="Screen Shot 2023-07-21 at 10 26 23"
src="https://github.com/go-gitea/gitea/assets/17645053/ce4f9ec0-b141-4d5e-ac13-46d001724dc5 ">
only webhook enabled
<img width="1350" alt="Screen Shot 2023-07-21 at 10 26 55"
src="https://github.com/go-gitea/gitea/assets/17645053/702491bd-083e-44fa-82bc-52c4571e54ac ">
2023-07-24 09:05:16 +08:00
Lunny Xiao
a12a5f3652
Fix duplicated url prefix on issue context menu ( #26066 )
...
Fix #26060
2023-07-23 11:56:43 +02:00
wxiaoguang
a7e8273574
Fix the truncate and alignment problem for some admin tables ( #26042 )
...
Some "text truncate email" code were just copied&pasted, they are not
suitable for most admin tables.
For the table layouts, some "max-width" helpers could be very helpful.
At least, we can get rid of the confusing "email" CSS class.
2023-07-22 10:54:48 +00:00
HesterG
2f0e79e639
Use frontend fetch for branch dropdown component ( #25719 )
...
- Send request to get branch/tag list, use loading icon when waiting for
response.
- Only fetch when the first time branch/tag list shows.
- For backend, removed assignment to `ctx.Data["Branches"]` and
`ctx.Data["Tags"]` from `context/repo.go` and passed these data wherever
needed.
- Changed some `v-if` to `v-show` and used native `svg` as mentioned in
https://github.com/go-gitea/gitea/pull/25719#issuecomment-1631712757 to
improve perfomance when there are a lot of branches.
- Places Used the dropdown component:
Repo Home Page
<img width="1429" alt="Screen Shot 2023-07-06 at 12 17 51"
src="https://github.com/go-gitea/gitea/assets/17645053/6accc7b6-8d37-4e88-ae1a-bd2b3b927ea0 ">
Commits Page
<img width="1431" alt="Screen Shot 2023-07-06 at 12 18 34"
src="https://github.com/go-gitea/gitea/assets/17645053/2d0bf306-d1e2-45a8-a784-bc424879f537 ">
Specific commit -> operations -> cherry-pick
<img width="758" alt="Screen Shot 2023-07-06 at 12 23 28"
src="https://github.com/go-gitea/gitea/assets/17645053/1e557948-3881-4e45-a625-8ef36d45ae2d ">
Release Page
<img width="1433" alt="Screen Shot 2023-07-06 at 12 25 05"
src="https://github.com/go-gitea/gitea/assets/17645053/3ec82af1-15a4-4162-a50b-04a9502161bb ">
- Demo
https://github.com/go-gitea/gitea/assets/17645053/d45d266b-3eb0-465a-82f9-57f78dc5f9f3
- Note:
UI of dropdown menu could be improved in another PR as it should apply
to more dropdown menus.
Fix #14180
---------
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-07-21 11:20:04 +00:00
Yarden Shoham
dbbae67f44
Remove commit status running and warning from the dashboard repo list ( #26036 )
...
Also added comments so the next time the dashboard repo list won't be
forgotten
Follows #25839
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
2023-07-21 10:32:25 +00:00
caicandong
840830b655
Remove commit status running and warning to align GitHub ( #25839 )
...
Fix #25776 . Close #25826 .
In the discussion of #25776 , @wolfogre's suggestion was to remove the
commit status of `running` and `warning` to keep it consistent with
github.
references:
-
https://docs.github.com/en/rest/commits/statuses?apiVersion=2022-11-28#about-commit-statuses
## ⚠️ BREAKING ⚠️
So the commit status of Gitea will be consistent with GitHub, only
`pending`, `success`, `error` and `failure`, while `warning` and
`running` are not supported anymore.
---------
Co-authored-by: Jason Song <i@wolfogre.com>
2023-07-21 16:24:36 +08:00
Lunny Xiao
037c9895a7
Support copy protected branch from template repository ( #25889 )
...
Fix #14303
2023-07-21 12:32:47 +08:00
silverwind
d021c88d29
Reduce margins on admin pages ( #26026 )
...
Reduce margins around admin boxes and reduce sidebar size from 275px to
240px. This is the same 16px margin we use on issue pages.
Before and After:
<img width="1270" alt="Screenshot 2023-07-21 at 00 28 11"
src="https://github.com/go-gitea/gitea/assets/115237/f9b0dcb0-8f7e-49b4-b130-54bf31c142fd ">
<img width="1271" alt="Screenshot 2023-07-21 at 00 30 51"
src="https://github.com/go-gitea/gitea/assets/115237/ddd75d59-9ab9-4061-8989-852e89727560 ">
2023-07-21 03:11:42 +00:00
puni9869
d12ba978a7
Adding remaining enum for migration repo model type. ( #26021 )
2023-07-20 12:28:38 -05:00
Dominik Heidler
2e128dd1fc
RPM Registry: Show zypper commands for SUSE based distros as well ( #25981 )
...
After RPM is supported with https://github.com/go-gitea/gitea/pull/23380
let's show the user
how to add the repo and install the RPM via all common package managers.
---------
Co-authored-by: Giteabot <teabot@gitea.io>
2023-07-20 17:37:31 +02:00
jeremiepozzigithub
d7a8d09da0
Add file status for API "Get a single commit from a repository" ( #16205 ) ( #25831 )
...
#16205 To obtain a closer behavior to the api from github, the status
(added, modified, removed) of a file should be available in addition to
the filename.
See github doc :
https://docs.github.com/fr/rest/commits/commits?apiVersion=2022-11-28#get-a-commit
2023-07-20 16:35:47 +08:00
wxiaoguang
50e14699d3
Update path related documents ( #25417 )
...
Update WorkPath/WORK_PATH related documents, remove out-dated
information.
Remove "StaticRootPath" on the admin config display page, because few
end user really need it, it only causes misconfiguration.
Co-authored-by: Giteabot <teabot@gitea.io>
2023-07-19 11:22:57 +02:00
wxiaoguang
236c645bf1
Refactor "Content" for file uploading ( #25851 )
...
Before: the concept "Content string" is used everywhere. It has some
problems:
1. Sometimes it means "base64 encoded content", sometimes it means "raw
binary content"
2. It doesn't work with large files, eg: uploading a 1G LFS file would
make Gitea process OOM
This PR does the refactoring: use "ContentReader" / "ContentBase64"
instead of "Content"
This PR is not breaking because the key in API JSON is still "content":
`` ContentBase64 string `json:"content"` ``
2023-07-18 18:14:47 +00:00
silverwind
dcb607d3cf
Make pending commit status yellow again ( #25935 )
...
With the introduction of Actions, the pending commit icon has changed
from yellow to grey for Drone integrations which never set the "running"
status, so it stays in "pending" until completion.
I find it better to have this icon colored like on 1.19. Now both the
"pending" and "running" icons look the same, but I guess we could add an
animation to the "running" state similar to GitHub has to it later.
Before:
<img width="339" alt="Screenshot 2023-07-17 at 19 14 19"
src="https://github.com/go-gitea/gitea/assets/115237/2f4886e4-74fd-42ea-b59e-9af8f141bf1f ">
After:
<img width="335" alt="Screenshot 2023-07-17 at 19 14 30"
src="https://github.com/go-gitea/gitea/assets/115237/53189642-e72d-47f6-9cbe-f14eda28f730 ">
Also, it matches GH's icon:
<img width="466" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/5804ff90-d223-4a3c-8093-7a9abbaacf87 ">
---------
Co-authored-by: delvh <dev.lh@web.de>
2023-07-18 16:59:02 +00:00
puni9869
8fc4774e5a
Fix margin on the new/edit project page. ( #25885 )
...
New/Edit Project page consistent layout. Fix margin on the new/edit
page.
Before:
<img width="1381" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/303e128c-0bd0-4289-a395-ff077e33b1c8 ">
<img width="1392" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/d11f7a42-ddf4-4c0a-a1b1-b8cefca9dfa1 ">
After
<img width="1390" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/8ae1a979-9050-4d68-8f5d-9dfaa620c0e8 ">
<img width="1391" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/24a62711-dc0a-4425-bf84-7c1896b9a005 ">
Co-authored-by: silverwind <me@silverwind.io>
2023-07-16 14:53:54 +00:00
sebastian-sauer
d473de0c2d
Make add line comment buttons focusable ( #25894 )
...
Use a real button and add an aria-label.
Additionally, show the button whenever it is focused.
See https://codeberg.org/forgejo/forgejo/issues/998 for explanation.
Our handling of this button is now equal to that of GitHub.
Nothing has changed visually.
2023-07-15 11:45:34 +02:00
yp05327
dc679fc9fa
Fix incorrect release count ( #25879 )
...
Release count is not correct:
https://try.gitea.io/yp05327/testrepo/tags
https://try.gitea.io/yp05327/testrepo/releases
https://try.gitea.io/yp05327/testrepo/releases/tag/testtag
We already have correct release count, no need to calculate it again.
c5e187c389/modules/context/repo.go (L547)
2023-07-14 08:47:17 +00:00
yp05327
61c9268c56
Fix wrong usage of PathEscapeSegments in branch list page ( #25864 )
...
Before:
emmm, don't know how to write a good title to describe this issue.
If you have a good idea, I can change the title.
The fix code is copied from L122. Not sure it is right or not.
@lunny
Maybe `DefaultBranchBranch` is also typo?
Two `Branch` in variable name .
2023-07-14 06:08:38 +00:00
sebastian-sauer
b81c013057
Don't stack PR tab menu on small screens ( #25789 )
...
the stacking takes up screen space - display the tabs as the navigation
bar. github uses the same layout.
Screenshots (left before, right after):
Large screen:
2023-07-14 01:54:20 +00:00
Denys Konovalov
eec45b43db
move issue filters to shared template ( #25729 )
...
Issue filters are being used on repo list page and on milestone issues
page, and the code is mostly duplicated.
This PR does the following changes:
- move issue filters into a shared template
- allow filtering milestone issues by project, so no need to hide this
filter on milestone issues page
- remove some dead code (e. g. issue actions in milestone issues
template)
- fix label filter dropdown width
---------
Co-authored-by: 6543 <6543@obermui.de>
2023-07-13 20:00:38 +00:00
puni9869
4744cb32e2
Fix margin on the new/edit milestone page ( #25801 )
...
There is some distortion in desktop and mobile ui for new/edit milestone
page.
Fixing the new/edit milestone page for desktop and mobile ui
Design background
https://uxplanet.org/primary-secondary-action-buttons-c16df9b36150
https://balsamiq.com/learn/articles/button-design-best-practices/
<details>
<summary>Screen shots</summary>
Before:
After
</details>
---------
Co-authored-by: Denys Konovalov <privat@denyskon.de>
Co-authored-by: Giteabot <teabot@gitea.io>
2023-07-12 10:36:56 +00:00
wxiaoguang
cee352bb38
Show correct SSL Mode on "install page" ( #25818 )
2023-07-11 18:09:23 -04:00
wxiaoguang
fa0b5b14c2
Make "install page" respect environment config ( #25648 )
...
Replace #25580
Fix #19453
The problem was: when users set "GITEA__XXX__YYY" , the "install page"
doesn't respect it.
So, to make the result consistent and avoid surprising end users, now
the "install page" also writes the environment variables to the config
file.
And, to make things clear, there are enough messages on the UI to tell
users what will happen.
There are some necessary/related changes to `environment-to-ini.go`:
* The "--clear" flag is removed and it was incorrectly written there.
The "clear" operation should be done if INSTALL_LOCK=true
* The "--prefix" flag is removed because it's never used, never
documented and it only causes inconsistent behavior.
2023-07-09 22:43:37 +00:00
silverwind
61e0d1a767
Enable H014 and H023 djlint rules ( #25786 )
...
Enable these rules:
- H014 | More than 2 blank lines.
- H023 | Do not use entity references.
There are more potential rules to enable but they are blocked by bugs in
the linter:
- https://github.com/Riverside-Healthcare/djLint/issues/711
- https://github.com/Riverside-Healthcare/djLint/issues/712
2023-07-09 20:33:25 +00:00
Denys Konovalov
be23b73e85
Restructure issue list template, styles ( #25750 )
...
This PR does various modifications on the issue list shared template:
- restructure layout to achieve better responsiveness
- fix various style issues
- restructure styles (better result with less code :)
- remove numerous `gt-*` patches and other unneeded classes -> use
existing css classes
<details>
<summary>Before:</summary>
</details>
<details>
<summary>After:</summary>
</details>
---------
Co-authored-by: silverwind <me@silverwind.io>
2023-07-09 19:38:01 +00:00
wxiaoguang
84c78650cc
Fix notification list bugs ( #25781 )
...
Fix #25627
1. `ctx.Data["Link"]` should use relative URL but not AppURL
2. The `data-params` is incorrect because it doesn't contain "page". JS
can simply use "window.location.search" to construct the AJAX URL
3. The `data-xxx` and `id` in notification_subscriptions.tmpl were
copied&pasted, they don't have affect.
2023-07-09 18:42:31 +00:00
hiifong
d58096ec31
Fix the wrong default branch name displayed by checkout ( #25777 )
...
Related: #22743
Before:
After:
2023-07-09 11:09:06 +02:00
silverwind
f8bb1018ae
Tweak repo topics bar ( #25769 )
...
Minor tweaks to repo topics:
- Use gap instead of margin to align "Manage Topics" when no topics
present
- Add margin to description instead
Before:
<img width="1232" alt="Screenshot 2023-07-08 at 13 08 15"
src="https://github.com/go-gitea/gitea/assets/115237/a5d3586c-6cbf-4b74-8137-11d91f2cbb45 ">
<img width="1233" alt="Screenshot 2023-07-08 at 13 08 05"
src="https://github.com/go-gitea/gitea/assets/115237/59b18d93-e4cb-4f2b-9bc2-d6aa63f93827 ">
After:
<img width="1232" alt="Screenshot 2023-07-08 at 13 08 42"
src="https://github.com/go-gitea/gitea/assets/115237/470d42ad-3f7e-40f9-b0a1-203b4af77eb9 ">
<img width="1231" alt="Screenshot 2023-07-08 at 13 08 32"
src="https://github.com/go-gitea/gitea/assets/115237/42d18048-748c-4a3f-ab89-3403866cef34 ">
---------
2023-07-08 18:12:30 +00:00
puni9869
2ff0c12a95
Repository Archived text title center align ( #25767 )
...
Archive text title center align
<details>
<summary>Screen shots</summary>
Before
After
BTW On github
</details>
---------
Co-authored-by: Giteabot <teabot@gitea.io>
2023-07-08 10:57:17 +00:00
wxiaoguang
cc00fd50f3
Clarify "text-align" CSS helpers, fix clone button padding ( #25763 )
...
Changes:
* Rename gt-tl/gt-tc/gt-tr to gt-text-left/gt-text-center/gt-text-right
* The gt-ab and gt-br-0 are removed because they are not needed anymore
* Fix the clone dropdown button padding by ":not(.icon)"
Before:
<details>
</details>
After:
<details>
</details>
Fixes #25758
Co-authored-by: Giteabot <teabot@gitea.io>
2023-07-08 11:53:56 +02:00
Lunny Xiao
6375419468
Newly pushed branches hints on repository home page ( #25715 )
...
This PR will display a pull request creation hint on the repository home
page when there are newly created branches with no pull request. Only
the recent 6 hours and 2 updated branches will be displayed.
Inspired by #14003
Replace #14003
Resolves #311
Resolves #13196
Resolves #23743
co-authored by @kolaente
2023-07-08 05:19:00 +02:00
Maxim Slipenko
e0a780d75b
Translate untranslated string in issues list ( #25759 )
2023-07-07 22:36:39 +00:00
wxiaoguang
3780795b93
Reformat some templates ( #25756 )
...
Only: indent/dedent/newline
2023-07-07 18:06:49 +00:00
wxiaoguang
128d77a3a0
Following up fixes for "Fix inconsistent user profile layout across tabs" ( #25739 )
...
Follow
https://github.com/go-gitea/gitea/pull/25625#issuecomment-1621577816
1. Fix the incorrect "project view" layout
2. Fix the "follow/unfollow" link on "packages" and "projects" tab
Before:
After:
---------
Co-authored-by: Giteabot <teabot@gitea.io>
2023-07-07 17:27:12 +02:00
hiifong
a6a9389c70
Hide add file button for pull mirrors ( #25748 )
...
I think hiding the add file button for mirror repositories that can keep the ui clean.
Before:
After:
2023-07-07 13:36:14 +00:00
wxiaoguang
98088befae
Fix broken translations for package documantion ( #25742 )
...
The code was just copied&pasted, it causes problems now.
There are a lot (for every package) broken translations. eg:
```
# en-US
conda.documentation = For more information on the Conda registry, see
<a target="_blank" rel="noopener noreferrer" href="%s">the documentation</a>.
# fr-FR (and many languages)
conda.documentation=Pour plus d'informations sur le registre Conda, voir
<a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/fr-fr/packages/conda/ ">la documentation</a>.
```
To resolve the problem fundamentally, use a general string, and trigger
the re-translating on Crowdin side.
And, it should really really really avoid introducing too much
copied&pasted code .......
2023-07-07 10:47:26 +02:00
puni9869
2af30f715e
Fix inconsistent user profile layout across tabs ( #25625 )
...
Fix ::User Profile Page Project Tab Have Inconsistent Layout and Style
Added the big_avator for consistency in the all header_items tabs.
Fixes : #24871
> ### Description
> in the user profile page the `Packages` and `Projects` tab have small
icons for user but other tabs have bigger profile picture with user
info:
>
> ### Screenshots
> ### **For Packages And Projects:**
>
>
> ### **For Other Tabs:**
>
>
## Before
## After changes
Project View
<img width="1394" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/95d181d7-8e61-496d-9899-7b825c91ad56 ">
Packages View
<img width="1378" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/7f5fd60f-6b18-4fa8-8c56-7b0d45d1a610 ">
## Org view for projects page
<img width="1385" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/6400dc89-a5ae-4f0a-831b-5b6efa020d89 ">
## Org view for packages page
<img width="1387" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/4e1e9ffe-1e4b-4334-8657-de11b5fd31d0 ">
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Giteabot <teabot@gitea.io>
Co-authored-by: silverwind <me@silverwind.io>
2023-07-06 18:59:24 +00:00
sebastian-sauer
f03d95f0a9
Allow/fix review (approve/reject) of empty PRs ( #25690 )
...
gitea allows to create empty PRs.
Currently when you need approvals for a merge, you have to manually add
/files to the url to get to the files tab to approve / reject the PR.
This PR allows to open the files tab via the normal tab / link and then
fixes the layout of the files tab.
**Screenshots:**
Before:
After:
---------
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
2023-07-06 15:33:04 +00:00
Lunny Xiao
d17a848fe2
Disable run user change in installation page ( #22499 )
...
The run user should not be changed on the installation page because it
will not be any effect to Gitea.
This PR disabled the input box of run user.
2023-07-06 10:14:51 +08:00
Earl Warren
e1edd7a8e9
Show correct naming for 1 comment ( #25704 )
...
- Resolves https://codeberg.org/forgejo/forgejo/issues/948
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: Giteabot <teabot@gitea.io>
2023-07-05 19:53:38 +00:00
Lunny Xiao
90b3b3dbf8
Fix tags header and pretty format numbers ( #25624 )
...
This caused by #23465
2023-07-05 04:11:42 +00:00
Denys Konovalov
00dbba7f42
Several fixes for mobile UI ( #25634 )
...
Resolves #25622
<details>
<summary>Screenshots</summary>
</details>
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
2023-07-04 17:45:45 +00:00
silverwind
0006169f38
Actions list enhancements ( #25601 )
...
Various small enhancements to the actions list. Before and after:
<img width="1264" alt="Screenshot 2023-06-30 at 00 11 40"
src="https://github.com/go-gitea/gitea/assets/115237/bb4162ee-cdcf-4a73-b05e-f9521562edbb ">
<img width="1264" alt="Screenshot 2023-06-30 at 00 09 51"
src="https://github.com/go-gitea/gitea/assets/115237/52a70ea9-4bb3-406e-904b-0fdaafde9582 ">
---------
Co-authored-by: Giteabot <teabot@gitea.io>
2023-07-04 09:59:47 +00:00
wxiaoguang
eea58a5d55
Fix UI misalignment on user setting page ( #25629 )
...
Fix #25628
Diff with ignoring space:
https://github.com/go-gitea/gitea/pull/25629/files?diff=unified&w=1
The "modal" shouldn't appear between "ui attached segment", otherwise
these segments lose margin-top.
After the fix:
<details>
</details>
2023-07-03 20:38:06 +00:00
wxiaoguang
45bc180a15
Make "cancel" buttons have proper type in modal forms ( #25618 )
...
Replace #25446 , fix #25438
All "cancel" buttons which do not have "type" should not submit the
form, should not be triggered by "Enter".
This is a complete fix for all modal dialogs.
The major change is "modules/aria/modal.js", "devtest" related code is
for demo/test purpose.
2023-07-03 14:04:50 +08:00
Lunny Xiao
7735da1c66
Display branch commit status ( #25608 )
...
Fix #10388
This PR adds a status icon for every branch which has a status check for
the latest commit on branch list page.
<img width="1313" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/727cd540-d03a-40c6-a7dd-e87c118af0ac ">
2023-07-03 03:32:21 +00:00
