Giteabot
f31879069f
Improve "Reference in new issue" modal ( #30547 ) ( #30574 )
...
Backport #30547 by @silverwind
Fixes: https://github.com/go-gitea/gitea/issues/29994
Also some misc enhancements done to the form in the modal.
<img width="840" alt="Screenshot 2024-04-17 at 23 02 55"
src="https://github.com/go-gitea/gitea/assets/115237/e71fba55-55cd-4e48-a497-6b1025c36a43 ">
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 42019677e6cce6ae44a922e68b91d2a002450fa0)
2024-04-21 18:15:19 +02:00
Giteabot
1d8316f278
Fix border-radius on view, blame and code search ( #30545 ) ( #30560 )
...
Backport #30545 by @silverwind
Fixes: https://github.com/go-gitea/gitea/issues/30540
1. Fix all these boxes by adding `bottom attached` and removing a
problematic CSS rule:
<img width="1319" alt="Screenshot 2024-04-17 at 22 25 31"
src="https://github.com/go-gitea/gitea/assets/115237/346445a4-4944-4003-a1ef-6f5b0eda624e ">
<img width="643" alt="Screenshot 2024-04-17 at 22 21 18"
src="https://github.com/go-gitea/gitea/assets/115237/10f17ed3-9ad6-48de-92fa-bac6621815b9 ">
2. Change the "last commit" box to `ui segment` which has correct
border-radius. Also included is a tiny tweak to make author name ellipse
instead of wrap.
<img width="1331" alt="Screenshot 2024-04-17 at 22 23 23"
src="https://github.com/go-gitea/gitea/assets/115237/285fbd45-ced0-4d33-abe3-7384ffa03188 ">
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit b4a38318c333519b1008d03fd01e14a803363498)
2024-04-21 18:11:36 +02:00
Giteabot
c044cb2de3
Fix various overflows on actions view ( #30344 ) ( #30505 )
...
Backport #30344 by @silverwind
Fix a number of text overflow issues in actions view and run list. Also
improve mobile view of run list.
Fixes: https://github.com/go-gitea/gitea/issues/30328
<img width="782" alt="Screenshot 2024-04-08 at 23 10 16"
src="https://github.com/go-gitea/gitea/assets/115237/3d9f9f88-3eab-44a0-8144-30c2b58b24cb ">
<img width="935" alt="Screenshot 2024-04-08 at 23 17 46"
src="https://github.com/go-gitea/gitea/assets/115237/581d73ea-a31d-416b-be3a-47313b879b12 ">
<img width="1008" alt="Screenshot 2024-04-08 at 23 49 05"
src="https://github.com/go-gitea/gitea/assets/115237/c5d10565-f285-477f-8659-1caf94797647 ">
<img width="397" alt="Screenshot 2024-04-08 at 23 55 30"
src="https://github.com/go-gitea/gitea/assets/115237/368aaa75-1903-4058-9d75-d1fe91c564d6 ">
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 00179f637d9add4e42edf6185cd641eb98115970)
2024-04-21 18:07:00 +02:00
Giteabot
889469fb74
Convert max file name length to 255 ( #30489 ) ( #30504 )
...
Backport #30489 by @yp05327
Quick/Partly fix #29907
In Linux and MacOS, by default the max file name length is 255.
In windows, it depends on the version and settings, and has no file name
length limitation, but has path length limitation.
By default it is 260, considering path length is longer than filename,
so I think it is ok to do this.
For Windows, see
https://learn.microsoft.com/windows/win32/fileio/maximum-file-path-limitation?tabs=registry
For Linux, see
https://github.com/torvalds/linux/blob/master/include/uapi/linux/limits.h#L12-L13
For MacOS, see
https://discussions.apple.com/thread/254788848?sortBy=best
Co-authored-by: yp05327 <576951401@qq.com>
(cherry picked from commit f52b1db305f887c917e6c875b8ac4f8b784b825b)
2024-04-21 18:06:23 +02:00
0ko
99effab1eb
Remove EasyMDE from various areas
...
Ref https://codeberg.org/forgejo/forgejo/issues/2831
Removed from:
- form for creating comment
- form for updating comment
- popup reviewing form
- line reviewing form
- I did not check the use of textarea.tmpl but I belive its used for issue templates, so also removed
- I did not check the use of box.tmpl, could not get any comments on compare
EasyMDE is left for these pages:
- release notes editor
- wiki editor
(cherry picked from commit 703aee4cad
2024-04-19 13:49:20 +00:00
0ko
4b0e8f227d
Make display of EasyMDE in UI optional to template
...
This commit adds EasyMDE field to combomarkdowneditor, as well as to all its calls.
(cherry picked from commit f5c7ccaeff
2024-04-19 13:49:20 +00:00
Gusted
0f72cd8508
[BUG] Escape editor.add_tmpl translation
...
- Previously translations were escaped, but now translations are
accepted as-is and will be rendered as HTML. Use `TrString` to escape
the translation value.
- Adds integration test.
- Regression of 65248945c9Resolves #3260
(cherry picked from commit a0f47b8de7
2024-04-16 16:23:25 +00:00
Earl Warren
335abbbc9d
Merge pull request '[v1.22/gitea] week 16 cherry pick to v7.0' ( #3235 ) from earl-warren/forgejo:wip-v7.0-gitea-cherry-pick into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3235
Reviewed-by: Gergely Nagy <algernon@noreply.codeberg.org>
2024-04-16 09:31:46 +00:00
Michael Kriese
a1716fcdfc
Some NuGet package enhancements
...
- https://github.com/go-gitea/gitea/pull/30280
(cherry picked from commit 2e613ad5e7
2024-04-16 06:54:35 +00:00
0ko
74bc9e666f
[I18N] Improve English locale
...
- user settings/profile: renamed Description fild of biography to Biography
(cherry picked from commit 3b23633721
2024-04-15 17:50:01 +00:00
Giteabot
4fe72284fc
Avoid losing token when updating mirror settings ( #30429 ) ( #30464 )
...
Backport #30429 by @wolfogre
Fix #30416 .
Before (it shows as "Unset" while there's a token):
<img width="980" alt="image"
src="https://github.com/go-gitea/gitea/assets/9418365/d7148e3e-62c9-4d2e-942d-3d795b79515a ">
After:
<img width="977" alt="image"
src="https://github.com/go-gitea/gitea/assets/9418365/24aaa1db-5baa-4204-9081-470b15ea72b5 ">
The username shows as "oauth2" because of
f9fdac9809/services/migrations/dump.go (L99)https://github.com/go-gitea/gitea/assets/9418365/2f042501-2824-4511-9203-c84a6731a02d ">
However, it needs to be checked again when backporting.
Co-authored-by: Jason Song <i@wolfogre.com>
(cherry picked from commit 92f4cd9461949940427f789a345a3a51b2de02bf)
2024-04-15 16:43:34 +02:00
Giteabot
70b0c30def
Fix admin notice view-detail ( #30450 ) ( #30458 )
...
Backport #30450 by @silverwind
Fix https://github.com/go-gitea/gitea/issues/30434 , regression from
https://github.com/go-gitea/gitea/pull/30115 .
I also removed the date insertion into the modal which was also broken
since that date was switched to `absolute-date` because I see no real
purpose to putting that date into the modal.
Result:
<img width="1038" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/aa2eb8b4-73dc-4d98-9b80-3f276f89d9e5 ">
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit fd2184e2343842e158f5b12e3d2e5b88effea2fd)
2024-04-15 16:41:44 +02:00
Giteabot
31ebee203b
Fix the spacing issue in the Project view ( #30415 ) ( #30423 )
...
Backport #30415 by @HEREYUA
**fix**: [#30388 ](https://github.com/go-gitea/gitea/issues/30388 )
**before**
**after**
Co-authored-by: HEREYUA <37935145+HEREYUA@users.noreply.github.com>
(cherry picked from commit 358b28cec0086ff1c7517a69db64f34fcc897008)
2024-04-15 16:40:01 +02:00
silverwind
8b54d38cbe
Various improvements for long file and commit names ( #30374 )
...
Fixes: https://github.com/go-gitea/gitea/issues/29438
This contains numerous enhancements for how large commit messages and
large filenames render. Another notable change is that the file path is
no longer cut off by backend at 30 chars, but rendered in full with
wrapping.
<img width="1329" alt="Screenshot 2024-04-09 at 21 53 57"
src="https://github.com/go-gitea/gitea/assets/115237/5ccbb3d6-643a-4f60-ba79-3572b36d5182 ">
<hr>
<img width="711" alt="Screenshot 2024-04-09 at 21 44 24"
src="https://github.com/go-gitea/gitea/assets/115237/6ffe8fbb-407c-4aa7-b591-3d80daea7d57 ">
<hr>
<img width="439" alt="Screenshot 2024-04-09 at 21 19 03"
src="https://github.com/go-gitea/gitea/assets/115237/1ec7f6e9-2fd8-4841-87eb-6ca02ab9cd61 ">
<hr>
<img width="444" alt="Screenshot 2024-04-09 at 21 18 52"
src="https://github.com/go-gitea/gitea/assets/115237/70931b9e-5841-477e-b3bc-98f8d2662964 ">
---------
Co-authored-by: Giteabot <teabot@gitea.io>
(cherry picked from commit 50099d7af436785daf66a3a9f27bd5c009f90684)
Conflicts:
- templates/repo/diff/box.tmpl
Picked Gitea's version, because it appears we missed a
gt-gap-1 => tw-gap-1 conversion
- web_src/css/repo.css
Conflict due to tag signature highlighting, resolved by
adding the Gitea changes on top of ours manually.
(cherry picked from commit 28170b517914f00449dbce8ba91e02fa1f0f84e5)
2024-04-15 16:33:51 +02:00
Giteabot
7dfe3fe2cb
Add --page-spacing variable, fix admin dashboard notice ( #30302 ) ( #30323 )
...
Backport #30302 by @silverwind
Fixes https://github.com/go-gitea/gitea/issues/30293 and introduce the
`--page-spacing` variable which holds the spacing between the elements
on the page. This is working vertically for all pages, including ones
that have fomantic grid, and horizontally for all that use
`flex-container`.
The `.page-content > :first-child:not(.secondary-nav)` selector uses
margin which in some cases enables to adjacent margins to overlap, which
is nice.
<img width="1320" alt="Screenshot 2024-04-06 at 01 35 19"
src="https://github.com/go-gitea/gitea/assets/115237/3e81e707-e9ff-4b7f-a211-3d98f4f85353 ">
---
<img width="1327" alt="Screenshot 2024-04-06 at 01 35 45"
src="https://github.com/go-gitea/gitea/assets/115237/aad196c0-9e21-4c06-ae59-7e33a76c61e1 ">
---
<img width="1321" alt="Screenshot 2024-04-06 at 01 35 31"
src="https://github.com/go-gitea/gitea/assets/115237/785f6c5d-08b6-4e66-aa16-aeca7cfed3ad ">
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit db370c47a69b2fb17d8b16c8025451efde5c33b6)
2024-04-15 16:16:37 +02:00
forgejo-backport-action
1b8fd7b17b
[v7.0/forgejo] [BUG] Fix code search in explore reporting as git grep even with indexer enabled ( #3204 )
...
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/3173
regression caused in porting #2813 🫣
see https://codeberg.org/forgejo/forgejo/pulls/2688#issuecomment-1692750
Co-authored-by: Shiny Nematoda <snematoda.751k2@aleeas.com>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3204
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
2024-04-14 14:21:31 +00:00
Zottelchen
aad193c4a6
Update templates/api/packages/pypi/simple.tmpl
...
(cherry picked from commit 303b95a1c1
2024-04-12 22:23:58 +00:00
Earl Warren
caa6b4a34d
Merge pull request '[v7.0/forgejo] Fix the settings tab highlighting' ( #3195 ) from bp-v7.0/forgejo-65ed86e into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3195
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-12 22:19:16 +00:00
Gusted
0c71afea31
[BUG] Render correct label link
...
- Render the correct label for pull requests, it should link to the pull
requests list and not the issue list.
- Add unit test.
- Resolves https://codeberg.org/forgejo/forgejo/issues/3183
(cherry picked from commit 7a97c05206
2024-04-12 20:47:23 +00:00
Gergely Nagy
fd5abfd244
Fix the settings tab highlighting
...
When visiting a repos `/settings/units` page, highlight the active tab
properly: "Add more..." if the tab is displayed, or "Settings"
otherwise.
Fixes #3188 .
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
(cherry picked from commit 65ed86e396
2024-04-12 20:46:24 +00:00
Gusted
3344ef3511
[BUG] Fix tooltip for 1000+ stars/forks
...
- The tooltip attribute should be inside the `<a>` element not outside of it.
- Regression of 854164f40b3e9a97b9ce
2024-04-10 22:35:21 +00:00
0ko
71efe9b8fc
Update checker setting updates
...
- revert c53f802778https://codeberg.org/forgejo/forgejo/issues/2859
(cherry picked from commit e498069fd5
2024-04-10 20:55:35 +00:00
Giteabot
e40ab6d0bd
Fix spacing in issue navbar ( #30238 ) ( #30242 )
...
Backport #30238 by @silverwind
Create a new `issue-navbar` class specifically for this bar, previous
class used in many places and I thought I had them all removed, but not
this one.
Fixes: https://github.com/go-gitea/gitea/issues/30226
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 39322d9fc4644d2ede3efe3a9c4efee2e493d4cd)
2024-04-08 11:44:09 +02:00
Giteabot
94fc99c217
Prevent flash of dropdown menu on labels list ( #30215 ) ( #30216 )
...
Backport #30215 by @silverwind
On the labels list, This `left` class caused the dropdown content to
flash on page load until JS had hidden it. Remove it as I see no purpose
to it.
<img width="215" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/9e1de97f-dd89-41e0-9229-5c4a786ba762 ">
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 3ff4a6936b5ee05b3df945c466285de47ea87ef2)
2024-04-08 11:39:53 +02:00
wxiaoguang
704df1ff28
Fix home topic edit form layout ( #30213 )
...
The UI has been refactored by #30191 , so here are 2 choices:
1. Backport #30191
2. Apply this quick fix
Before:
<details>
</details>
After:
<details>
</details>
Co-authored-by: Giteabot <teabot@gitea.io>
(cherry picked from commit e579ddc31f6d6d0406f1c5330f2a31b9707fb3e2)
2024-04-08 11:35:30 +02:00
Giteabot
7ac46f1151
Remove fomantic checkbox module ( #30162 ) ( #30168 )
...
Backport #30162 by @silverwind
CSS is pretty slim already and the `.ui.toggle.checkbox` sliders on
admin page also still work. The only necessary JS is the one that links
`input` and `label` so that it can be toggled via label. All checkboxes
except the markdown ones render at `--checkbox-size: 16px` now.
<img width="174" alt="Screenshot 2024-03-28 at 22 15 10"
src="https://github.com/go-gitea/gitea/assets/115237/3455c1bb-166b-47e4-9847-2d20dd1f04db ">
<img width="499" alt="Screenshot 2024-03-28 at 21 00 07"
src="https://github.com/go-gitea/gitea/assets/115237/412be2b3-d5a0-478a-b17b-43e6bc12e8ce ">
<img width="83" alt="Screenshot 2024-03-28 at 22 14 34"
src="https://github.com/go-gitea/gitea/assets/115237/d8c89838-a420-4723-8c49-89405bb39474 ">
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: delvh <dev.lh@web.de>
(cherry picked from commit 591759fdfae43bc87323b644919cc9581bff1d81)
2024-04-08 11:28:31 +02:00
Gusted
7bbb93b3b1
[BUG] Fix admin layout
...
- Fix the layout of admin pages, it previously was full-width and had
the alert at the incorrect place and within an container.
- Make the placement of the alert consistent with other pages, inside
`flex-container-main` and not wrapped around a container.
- We have to revert 145bebc829145bebc829Resolves #3082
(cherry picked from commit c2d0f64340
2024-04-06 20:48:09 +00:00
forgejo-backport-action
5bde9555b1
[v7.0/forgejo] Add optional pronoun field in user settings ( #3076 )
...
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/1518
An attempt at adding an optional pronoun field for user profiles, as suggested here 3 years ago: https://github.com/go-gitea/gitea/issues/13990
I made this for [my own instance](https://git.gay/h ) and didn't initially think I'd make a PR because of the previous closed issue, but I thought I'd ask the Forgejo matrix chat to see if there was any support and there was!
I'm told I should make a database migration, some help as to how to do that would be appreciated.
Co-authored-by: hazycora <hazysu@riseup.net>
Co-authored-by: Gergely Nagy <forgejo@gergo.csillger.hu>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3076
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
2024-04-06 13:23:43 +00:00
oliverpool
82b92c3f2c
[FEAT] sourcehut webhooks
...
(cherry picked from commit ed9dd0e62a
2024-04-05 19:36:04 +00:00
0ko
68476e2494
Use people icon instead of person on profiles
...
(cherry picked from commit ddedcd44b7
2024-04-05 06:32:11 +00:00
0ko
04ea1aedc5
[I18N] Provide plural support for followers/following in user profiles
...
(cherry picked from commit df2a83ed20
2024-04-05 06:32:11 +00:00
Earl Warren
2024519bb4
Merge pull request '[v7.0/forgejo] [FEAT] Add label filters in organization issues dashboard' ( #3038 ) from bp-v7.0/forgejo-8d13ed4 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3038
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-04 19:41:54 +00:00
iminfinity
cb0c6b52be
add label filters in org/{org_name}/issues
...
(cherry picked from commit 8d13ed4a8d
2024-04-04 17:37:56 +00:00
0ko
bf275ac92f
[I18N] Provide plural support for release download count
...
Following https://codeberg.org/forgejo/forgejo/pulls/2899 and my review
See https://codeberg.org/forgejo/forgejo/pulls/3031#issuecomment-1733158 for why older strings were dropped
(cherry picked from commit 2fff6c255d
2024-04-04 17:29:14 +00:00
Gusted
86d018dffc
[FEAT] Visual separation between types of attachments
...
- Add a visual (but still semantic way) separation between Forgejo's
generated attachments and the user's uploaded ones.
- The styling was first done by `ul` element, but is moved to the
individual list items to have better control over them.
- Add tooltip explaining the attachment was generated by Forgejo.
- Remove the tooltip of the other attachments and 'simplify' them into a text.
- Resolves #2893
Co-authored-by: 0ko <0ko@noreply.codeberg.org>
(cherry picked from commit 20a3597220
2024-04-04 13:56:55 +00:00
0ko
4ef8b139f2
[GITEA] Apply changes to archived labels
...
This is a squashed result of conflict resolution for the following commits from Gitea:
- 36de5b299b9a93b1816e712e19fa6f83850cc4794b09dd11ec
2024-04-03 20:14:39 +00:00
0ko
3a46a37586
[UI] Fix primary button background inconsistency
...
Fixes https://codeberg.org/forgejo/forgejo/issues/2947
(cherry picked from commit d44f290750
2024-04-03 19:03:03 +00:00
Gusted
858fbbaafd
[BUG] Disable 'View at this point in history' for wikis
...
- Don't show the 'View at this point in history' button for wikis as
wikis don't have this feature.
- Adds integration test
- Resolves https://codeberg.org/forgejo/forgejo/issues/2995
(cherry picked from commit 8df9100994
2024-04-03 17:10:28 +00:00
Gergely Nagy
6051722460
Adjust the signed tag verification line
...
Move the signed tag verification line above the release notes, don't
disable the bottom margin, and make sure the verification line's box is
properly rounded like other boxes.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-04-02 22:03:30 +00:00
0ko
470886bf52
Rename ByteSize to ReadableSize
2024-04-02 17:29:32 +00:00
0ko
7b24b669ed
Provide a way to translate data units
2024-04-02 17:29:32 +00:00
0ko
46eeb884b4
Provide plural support for issue participants
2024-04-02 11:22:34 +00:00
Earl Warren
71153ef8b4
Merge pull request '[v7.0/forgejo] [BUG] Use correct translation on closed milestones' ( #2960 ) from bp-v7.0/forgejo-095d845 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2960
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-02 07:17:46 +00:00
Gusted
2e5aa42f20
[BUG] Use correct translation on closed milestones
...
- Uh self explanatory? Fix a typo.
- Regression of 365bb77a54https://codeberg.org/Codeberg/Community/issues/1526
2024-04-02 05:33:45 +00:00
Gusted
029bcd361a
[FEAT] Configure if protected branch rule should apply to admins
...
- Currently protected branch rules do not apply to admins, however in
some cases (like in the case of Forgejo project) you might also want to
apply these rules to admins to avoid accidental merges.
- Add new option to configure this on a per-rule basis.
- Adds integration tests.
- Resolves #65
2024-04-01 19:31:43 +00:00
Gergely Nagy
923035e418
Highlight signed tags like signed commits
...
This makes signed tags show a badge in the tag list similar to signed
commits in the commit list, and a more verbose block when viewing a
single tag. Works for both GPG and SSH signed tags.
Fixes #1316 .
Work sponsored by @glts.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-04-01 13:42:11 +00:00
Gusted
fd8f51f2b6
[BUG] Consistent styling for Sort filter
...
- The dropdowns that contain filters for issues and pull requests are
currently not styled with the `small` class, which causes a smaller font
size to be set. Remove it for the `Sort` filter to make it consistent
and make it _more_ readable.
- Resolves #2914
2024-03-31 20:59:35 +00:00
0ko
b9dbd93ebc
Fix New issue button consistency
...
Fixes https://codeberg.org/forgejo/forgejo/issues/2613
Based on https://codeberg.org/forgejo/forgejo/issues/2613#issuecomment-1654709
- add new class `list-header-issues`;
- add rules that fix button position;
- use variable to keep the vertical offset constant;
- fix gap for edit button.
Co-authored-by: Gusted <gusted@noreply.codeberg.org>
2024-03-31 08:20:16 +00:00
Earl Warren
45f39ce839
Merge pull request '[v7.0/forgejo] Fix accessibility and translatability of repo explore counters' ( #2919 ) from bp-v7.0/forgejo-cbd067e into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2919
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-31 07:57:10 +00:00
oliverpool
84eeab59af
[REFACTOR] add Icon to webhook.Interface
2024-03-31 07:20:19 +00:00
