Gusted
4fdd0ed728
[SECURITY] Fix XSS in dismissed review
...
- It's possible for reviews to not be assiocated with users, when they
were migrated from another forge instance. In the migration code,
there's no sanitization check for author names, so they could contain
HTML tags and thus needs to be properely escaped.
- Pass `$reviewerName` trough `Escape`.
(cherry picked from commit fe2df46d05
)
Conflicts:
templates/repo/issue/view_content/comments.tmpl
trivial context conflict
2024-02-22 22:44:22 +01:00
Gusted
ef05332c3b
[SECURITY] Fix XSS in wiki last commit information
...
- On the wiki and revisions page, information is shown about the last
commit that modified that wiki page. This includes the time it was last
edited and by whom. That whole string is not being sanitized (passed
trough `Safe` in the templates), because the last edited bit is
formatted as an HTML element and thus shouldn't be sanitized. The
problem with this is that now `.Author.Name` is not being sanitized.
- This can be exploited, the names of authors and commiters on a Git
commit is user controlled, they can be any value and thus also include
HTML. It's not easy to actually exploit this, as you cannot use the
official git binary to do use, as they actually strip `<` and `>` from
user names (trivia: this behaviour was introduced in the initial commit
of Git). In the integration testing, go-git actually has to generate
this commit as they don't have such restrictions.
- Pass `.Author.Name` trough `Escape` in order to be sanitized.
(cherry picked from commit d24c37e132
)
Conflicts:
templates/repo/wiki/revision.tmpl
templates/repo/wiki/view.tmpl
trivial context conflict
2024-02-22 22:36:14 +01:00
jolheiser
09635b6b12
[SECURITY] review(kn4ck3r): more template escapes
...
Signed-off-by: jolheiser <john.olheiser@gmail.com>
(cherry picked from commit 33af169223
)
Conflicts:
templates/repo/migrate/migrating.tmpl
templates/repo/settings/options.tmpl
trivial context conflict
2024-02-22 22:33:06 +01:00
Giteabot
1d228e6ee9
Fix being unable to use a repo that prohibits accepting PRs as a PR source. ( #26785 ) ( #26790 )
...
Backport #26785 by @CaiCandong
## Description
Sometimes, we need to use an upstream mirror repository to update the
current development repository, but mirror repositories are prohibited
from PR. It should not appear in `merge to,` but it can appear in `pull
from.`
Fix #24585 #26193 #26781
Related #24183
Many thanks to @apnote for assisting me in reproducing this bug!
## ScreenShot
---
### Before
<img
src="https://github.com/go-gitea/gitea/assets/50507092/3d76c376-1f54-45b9-80c9-6ba8319d6a9a "
width="400px">
<img
src="https://github.com/go-gitea/gitea/assets/50507092/fbfd9f7f-421f-4a2e-9a3e-f2958bbf3312 "
width="400px">
### After
<img
src="https://github.com/go-gitea/gitea/assets/50507092/e6984524-4f61-4310-b795-4d8598bd8963 "
width="400px">
<img
src="https://github.com/go-gitea/gitea/assets/50507092/04065b44-78d7-4721-bf31-0f1674150727 "
width="400px">
Co-authored-by: CaiCandong <50507092+CaiCandong@users.noreply.github.com>
(cherry picked from commit 3bab20491e
)
2023-09-08 08:09:18 +02:00
wxiaoguang
66016b3fe3
Fix incorrect "tabindex" attributes ( #26733 ) ( #26734 )
...
Backport #26733 manually
Co-authored-by: Giteabot <teabot@gitea.io>
(cherry picked from commit 307ee2c044
)
2023-09-08 08:07:19 +02:00
Giteabot
d7aa9fc964
Fix link in mirror docs ( #26719 ) ( #26732 )
...
Backport #26719 by @silverwind
Fix hash fragment in this link
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 2f6c0e6596
)
2023-09-08 08:07:19 +02:00
Giteabot
560ff3ea36
Make issue template field template access correct template data ( #26698 ) ( #26709 )
...
Backport #26698 by @wxiaoguang
Regression of #23092 , the `{{$field := .}}` was missing during that
refactoring.
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 4af872178e
)
2023-09-08 08:07:19 +02:00
Giteabot
d297a87f75
Add ThreadID parameter for Telegram webhooks ( #25996 ) ( #26480 )
...
Backport #25996
Telegram has recently implemented threads (channels) for group chats.
Co-authored-by: Earl Warren <109468362+earl-warren@users.noreply.github.com>
Co-authored-by: neveraskedtoexist <matikot415@gmail.com>
(cherry picked from commit acc0fd22d8
)
2023-08-21 07:22:19 +02:00
Giteabot
49d2a9e43c
Fix incorrect color of selected assignees when create issue ( #26324 ) ( #26372 )
...
Backport #26324 by @yp05327
Before:
![image](https://github.com/go-gitea/gitea/assets/18380374/75d610b2-3823-4366-be85-c77c9106feff )
After:
![image](https://github.com/go-gitea/gitea/assets/18380374/15afc6ac-f5ad-4e24-8983-fea8ace5921f )
Co-authored-by: yp05327 <576951401@qq.com>
(cherry picked from commit 2bdc38e592
)
2023-08-21 07:22:18 +02:00
delvh
64e2c8f6ff
Display human-readable text instead of cryptic filemodes ( #26352 ) ( #26358 )
...
Backport #26352
Now, you don't need to be a git expert anymore to know what these numbers mean.
## Before
![grafik](https://github.com/go-gitea/gitea/assets/51889757/9a964bf6-10fd-40a6-aeb2-ac8f437f8c32 )
## After
![grafik](https://github.com/go-gitea/gitea/assets/51889757/84573cb9-55b6-4dde-9866-95f71b657554 )
or when the mode actually changed:
![grafik](https://github.com/go-gitea/gitea/assets/51889757/0f327538-ebdc-40e7-8c99-f9e21b67f638 )
(cherry picked from commit 39cbca0f95
)
2023-08-21 07:22:17 +02:00
Giteabot
f597c789e1
Hide last indexed SHA
when a repo could not be indexed yet ( #26340 ) ( #26345 )
...
Backport #26340 by @CaiCandong
Now, for a new repo without any commit, the Last indexed SHA field looks
like this:
Before:
![image](https://github.com/go-gitea/gitea/assets/50507092/cecc6e24-3366-4093-ae07-c361ea34b373 )
After:
![image](https://github.com/go-gitea/gitea/assets/50507092/9b6ba703-b0d5-4648-ad6b-9a2341dd60f9 )
fix #26336
Co-authored-by: CaiCandong <50507092+CaiCandong@users.noreply.github.com>
(cherry picked from commit 59354d7135
)
2023-08-21 07:22:17 +02:00
Giteabot
bd416d0ba9
Fix due date rendering the wrong date in issue ( #26268 ) ( #26274 )
...
Backport #26268 by @yardenshoham
Closes #26263
We have to pass the date without the time.
# Before
![image](https://github.com/go-gitea/gitea/assets/20454870/6b6cb43d-2b1c-4679-951d-20f48c94bfdd )
# After
![image](https://github.com/go-gitea/gitea/assets/20454870/50441baf-2c52-452b-bb0d-6034a407abde )
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: Yarden Shoham <git@yardenshoham.com>
(cherry picked from commit 2cf1515f5c
)
2023-08-21 07:22:16 +02:00
Earl Warren
20557c6bdb
[BRANDING] define the forgejo webhook type
...
templates/swagger/v1_json.tmpl updated with `make generate-swagger`
(cherry picked from commit 88899c492e
)
(cherry picked from commit 7171bd9617
)
(cherry picked from commit 1a742446c1
)
(cherry picked from commit d7c189d7b2
)
Conflicts:
routers/web/web.go
(cherry picked from commit cbdea868e4
)
(cherry picked from commit 6cd150483b
)
(cherry picked from commit 47246da8d3
)
(cherry picked from commit f2aa0e6b76
)
(cherry picked from commit 5a4fc69a16
)
(cherry picked from commit 48e444ca09
)
(cherry picked from commit 888e537811
)
(cherry picked from commit 5121f493c9
)
(cherry picked from commit 9394e55fdf
)
(cherry picked from commit 3a2ce51768
)
(cherry picked from commit 719ead3a65
)
(cherry picked from commit 83e6f82e2a
)
(cherry picked from commit 494a429b21
)
(cherry picked from commit 4d775db6b4
)
(cherry picked from commit b68f777dc2
)
(cherry picked from commit 5b934023fa
)
(cherry picked from commit 3b1ed8b16c
)
(cherry picked from commit 6bc4a46c9f
)
(cherry picked from commit 8064bb24a3
)
Conflicts:
templates/admin/hook_new.tmpl
templates/org/settings/hook_new.tmpl
templates/repo/settings/webhook/base_list.tmpl
templates/repo/settings/webhook/new.tmpl
templates/user/settings/hook_new.tmpl
https://codeberg.org/forgejo/forgejo/pulls/1181
(cherry picked from commit 55f5588a91
)
Conflicts:
routers/web/web.go
https://codeberg.org/forgejo/forgejo/issues/1219
2023-08-21 07:22:16 +02:00
Giteabot
c1544754f8
Use shared template for webhook icons ( #26242 ) ( #26246 )
...
Backport #26242 by @silverwind
Fixes: https://github.com/go-gitea/gitea/issues/26241
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 2517da90aa
)
2023-08-21 07:22:16 +02:00
Earl Warren
c862cc15c8
Revert "[BRANDING] define the forgejo webhook type"
...
This reverts commit 02ba08ca84
.
2023-08-21 07:22:16 +02:00
Giteabot
cc8c7005a6
Don't autosize textarea in diff view ( #26233 ) ( #26244 )
...
Backport #26233 by @silverwind
Resizing the comment editor can be a very expensive operation because it
triggers page reflows, which on large PRs can take upwards of seconds to
complete. Disable this mechanism on the diff page only where we know
that the page can get large.
Fixes https://github.com/go-gitea/gitea/issues/26201 for the textarea
editor.
I don't think this can be fixed for EasyMDE because as far as I can
tell, it exposes no option to disable this resizing.
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 0f265a2489
)
2023-08-21 07:22:15 +02:00
Gusted
88e179d5ef
[GITEA] Add anchor to review types
...
- Backport of https://codeberg.org/forgejo/forgejo/pulls/1293
- The review type '22' is a general comment type that is attached to
single codecomments, reviews with multiple comments or to simple approve
and request changes comment. This comment can be used to create a link
towards this action on an pull request.
- Adds an anchor to the review comment type, so that when its getting
linked to it, it actually jumps towards that event.
- This also now fixes the behavior that after you created a review you
will be redirected to that review and because this is an general comment
type other mails will also be 'fixed' such as the approved or request changes.
- Resolves https://codeberg.org/forgejo/forgejo/issues/1248
2023-08-19 20:46:46 +02:00
sebastian-sauer
90053ce279
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):
![image](https://github.com/go-gitea/gitea/assets/1135157/d7e2aaec-c67b-403d-8d56-d4c824b04eed )
![image](https://github.com/go-gitea/gitea/assets/1135157/9e150881-c265-4074-afd7-407bb52e1934 )
Large screen:
![image](https://github.com/go-gitea/gitea/assets/1135157/d5cbdaa3-2962-4c4f-9595-5938981ff99e )
(cherry picked from commit b81c013057
)
2023-08-18 15:40:21 +02:00
Giteabot
a81c6561e3
Fixed incorrect locale references ( #26218 ) ( #26222 )
...
Backport #26218 by @kerwin612
Fixed two incorrect headers for setting the page navigation bar:
* User settings page, should not use the title "`org.settings`"
* Repo settings page, should not use the title "`org.settings`"
Co-authored-by: Kerwin Bryant <kerwin612@qq.com>
(cherry picked from commit 2122743093
)
2023-07-30 07:46:19 +02:00
Giteabot
7ee4804b9c
Fix commit compare style ( #26209 ) ( #26226 )
...
Backport #26209 by @puni9869
as title
Fixes : #25825
Before
<img width="1334" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/c54a41b0-39bd-4094-a956-081a8f4128f2 ">
After change
<img width="1340" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/c112d235-6bbe-4bcb-9529-78da3ab0fa14 ">
Co-authored-by: puni9869 <80308335+puni9869@users.noreply.github.com>
(cherry picked from commit 81d3dc1da5
)
2023-07-30 07:46:19 +02:00
Giteabot
f20cfc291c
Fix LFS object list style ( #26133 ) ( #26147 )
...
Backport #26133 by @wxiaoguang
Close #26104 . Only a quick fix, the UI is not perfect.
Before:
<details>
![image](https://github.com/go-gitea/gitea/assets/2114189/7b10d42d-8317-4d99-80f9-b6c5fe05c17e )
![image](https://github.com/go-gitea/gitea/assets/2114189/b43f1242-61a0-45e3-98b7-aa74b29f3813 )
</details>
After:
<details>
![image](https://github.com/go-gitea/gitea/assets/2114189/a8d27f70-781d-4702-866f-a56df6dd6c0a )
![image](https://github.com/go-gitea/gitea/assets/2114189/379274e7-c67b-4c11-9cee-28a298b4ff5a )
</details>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 0f73be0ae3
)
2023-07-26 13:49:16 +02:00
Giteabot
5969ec33a1
Improve commit graph alignment and truncating ( #26112 ) ( #26127 )
...
Backport #26112 by @wxiaoguang
Fix #26101
![image](https://github.com/go-gitea/gitea/assets/2114189/7507d201-822e-4534-8b20-e659d56b1268 )
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 3b518a3af5
)
2023-07-26 13:49:15 +02:00
Giteabot
99a4aba898
Fix duplicated url prefix on issue context menu ( #26066 ) ( #26067 )
...
Backport #26066 by @lunny
Fix #26060
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit ab4fd9aa1f
)
2023-07-24 07:59:10 +02:00
Giteabot
3d033a3aa7
Make pending commit status yellow again ( #25935 ) ( #25968 )
...
Backport #25935 by @silverwind
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: silverwind <me@silverwind.io>
Co-authored-by: delvh <dev.lh@web.de>
(cherry picked from commit 864bdd0ac8
)
2023-07-24 07:58:56 +02:00
Earl Warren
02ba08ca84
[BRANDING] define the forgejo webhook type
...
templates/swagger/v1_json.tmpl updated with `make generate-swagger`
(cherry picked from commit 88899c492e
)
(cherry picked from commit 7171bd9617
)
(cherry picked from commit 1a742446c1
)
(cherry picked from commit d7c189d7b2
)
Conflicts:
routers/web/web.go
(cherry picked from commit cbdea868e4
)
(cherry picked from commit 6cd150483b
)
(cherry picked from commit 47246da8d3
)
(cherry picked from commit f2aa0e6b76
)
(cherry picked from commit 5a4fc69a16
)
(cherry picked from commit 48e444ca09
)
(cherry picked from commit 888e537811
)
(cherry picked from commit 5121f493c9
)
(cherry picked from commit 9394e55fdf
)
(cherry picked from commit 3a2ce51768
)
(cherry picked from commit 719ead3a65
)
(cherry picked from commit 83e6f82e2a
)
(cherry picked from commit 494a429b21
)
(cherry picked from commit d30c90c0ab
)
(cherry picked from commit 3c83b325c4
)
(cherry picked from commit 470bffae63
)
(cherry picked from commit 1d65921719
)
(cherry picked from commit c101c2e0b9
)
2023-07-17 00:25:56 +02:00
Caesar Schinas
bbfe115a62
[BRANDING] Custom loading animation for Forgejo
...
(cherry picked from commit a3b3b8a2df
)
(cherry picked from commit de0fd2d2e4
)
(cherry picked from commit e1bf4de211
)
(cherry picked from commit 60ffc88a47
)
(cherry picked from commit 7d2beea9ca
)
(cherry picked from commit 171eadb952
)
(cherry picked from commit 5e81f75ed2
)
Conflicts:
templates/install.tmpl
templates/post-install.tmpl
templates/repo/migrate/migrating.tmpl
(cherry picked from commit 641c4a36c5
)
(cherry picked from commit f1dbb2dcff
)
(cherry picked from commit b66de5e531
)
(cherry picked from commit eeccdf21a1
)
(cherry picked from commit af37663f4d
)
(cherry picked from commit ed3739dccb
)
(cherry picked from commit f0036e37cf
)
(cherry picked from commit 90d453898a
)
(cherry picked from commit c011543238
)
(cherry picked from commit a294f34165
)
(cherry picked from commit 6e1a1d188d
)
(cherry picked from commit 20ae240edb
)
(cherry picked from commit 164693cf14
)
(cherry picked from commit 7c04fa1561
)
(cherry picked from commit 7990fab6a9
)
2023-07-17 00:25:55 +02:00
Giteabot
186f07bbf7
Make add line comment
buttons focusable ( #25894 ) ( #25896 )
...
Backport #25894 by @sebastian-sauer
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.
Co-authored-by: sebastian-sauer <sauer.sebastian@gmail.com>
2023-07-15 12:18:49 +02:00
Giteabot
026e745b9e
Fix incorrect release count ( #25879 ) ( #25887 )
...
Backport #25879 by @yp05327
Release count is not correct:
https://try.gitea.io/yp05327/testrepo/tags
![image](https://github.com/go-gitea/gitea/assets/18380374/07f97c62-d450-4ccb-b3f2-3e0af9d9fc52 )
https://try.gitea.io/yp05327/testrepo/releases
![image](https://github.com/go-gitea/gitea/assets/18380374/6f1d55a4-bb68-445d-84b9-90552a40f403 )
https://try.gitea.io/yp05327/testrepo/releases/tag/testtag
![image](https://github.com/go-gitea/gitea/assets/18380374/09ab5d51-52b6-4621-a571-3100198eb260 )
We already have correct release count, no need to calculate it again.
c5e187c389/modules/context/repo.go (L547)
Co-authored-by: yp05327 <576951401@qq.com>
2023-07-14 09:32:43 +00:00
wxiaoguang
012b804a9a
Clarify "text-align" CSS helpers, fix clone button padding ( #25763 ) ( #25764 )
...
Backport #25763
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
2023-07-10 00:19:24 +02:00
Giteabot
32eaba1b40
Hide add file
button for pull mirrors ( #25748 ) ( #25751 )
...
Backport #25748 by @hiifong
I think hiding the add file button for mirror repositories that can keep
the ui clean.
Before:
![image](https://github.com/go-gitea/gitea/assets/89133723/84ecf1a5-1a92-4bb1-b472-b4988a4441a9 )
After:
![image](https://github.com/go-gitea/gitea/assets/89133723/95382e73-286b-4114-9997-456ed77e07ca )
Co-authored-by: hiifong <i@hiif.ong>
2023-07-07 14:12:59 +00:00
Denys Konovalov
917ca5ded9
Several fixes for mobile UI ( #25634 ) ( #25689 )
...
Backport #25634
Resolves https://github.com/go-gitea/gitea/issues/25622
<details>
<summary>Screenshots</summary>
![Bildschirmfoto vom 2023-07-02
20-47-34](https://github.com/go-gitea/gitea/assets/47871822/a8a0bff6-9ae3-48f3-b008-00c196a3f8fd )
![Bildschirmfoto vom 2023-07-02
20-47-45](https://github.com/go-gitea/gitea/assets/47871822/172a0021-af74-4690-aa67-0e66688ce733 )
![Bildschirmfoto vom 2023-07-02
20-48-37](https://github.com/go-gitea/gitea/assets/47871822/14572ebd-0106-4c8a-ba27-b6b631375ee6 )
![Bildschirmfoto vom 2023-07-02
20-49-08](https://github.com/go-gitea/gitea/assets/47871822/7c0ba3aa-1712-482c-aae9-13394dbdaf8a )
![Bildschirmfoto vom 2023-07-02
20-50-28](https://github.com/go-gitea/gitea/assets/47871822/8bd68e26-099a-4abd-8817-16d52af13167 )
![Bildschirmfoto vom 2023-07-02
20-51-46](https://github.com/go-gitea/gitea/assets/47871822/3beab8c6-3747-4829-be50-bafaed11000c )
![Bildschirmfoto vom 2023-07-02
20-54-12](https://github.com/go-gitea/gitea/assets/47871822/51f82ef3-a32c-4c27-9056-e8711ed469cc )
</details>
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
2023-07-07 00:34:00 +02:00
Giteabot
e595dfeec7
Allow/fix review (approve/reject) of empty PRs ( #25690 ) ( #25732 )
...
Backport #25690 by @sebastian-sauer
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:
![image](https://github.com/go-gitea/gitea/assets/1135157/b5082e5e-8c32-4412-993e-b854905e96d3 )
After:
![image](https://github.com/go-gitea/gitea/assets/1135157/1f5e056e-396f-4dfb-8d14-e17a2f6495d9 )
Co-authored-by: sebastian-sauer <sauer.sebastian@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
2023-07-06 19:34:41 +00:00
Giteabot
68e0c802f7
Show correct naming for 1 comment ( #25704 ) ( #25712 )
...
Backport #25704 by @earl-warren
- Resolves https://codeberg.org/forgejo/forgejo/issues/948
Co-authored-by: Earl Warren <109468362+earl-warren@users.noreply.github.com>
Co-authored-by: Gusted <postmaster@gusted.xyz>
2023-07-06 16:04:13 +00:00
Giteabot
04eea29ecb
Fix tags header and pretty format numbers ( #25624 ) ( #25694 )
...
Backport #25624 by @lunny
This casused by #23465
Before
release disabled
<img width="1320" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/190a1c81-daa5-41bc-91ac-c9a0bf629b5f ">
release enabled
<img width="1320" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/a0372c31-727c-4ee0-a6b9-30e502498d90 ">
After
release disabled
<img width="1304" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/a747ea80-a3d9-4792-8f6d-e8955da78b9e ">
release enabled
<img width="1290" alt="图片"
src="https://github.com/go-gitea/gitea/assets/81045/7c0bc43a-9149-4148-859d-35839aeb60ca ">
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-05 07:08:16 +00:00
silverwind
491f36d32a
Actions list enhancements ( #25601 ) ( #25678 )
...
Backport https://github.com/go-gitea/gitea/pull/25601 to 1.20.
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 13:00:34 +00:00
Giteabot
1ddfe03131
Use AfterCommitId to get commit for Viewed functionality ( #25529 ) ( #25612 )
...
Backport #25529 by @sebastian-sauer
the PullHeadCommitID is not always available when the PR is merged.
Not sure if this is the best solution but in my simple tests it looks
like this fixes the problem - happy to get any feedback.
hopefully fixes https://github.com/go-gitea/gitea/issues/24813
Co-authored-by: sebastian-sauer <sauer.sebastian@gmail.com>
2023-07-01 07:56:56 +08:00
Giteabot
0b6f7fb607
read-only checkboxes don't appear and don't entirely act the way one might expect ( #25573 ) ( #25602 )
...
Backport #25573 by @saegl5
This pull request fades read-only checkboxes and checkmark, and it makes
the checkboxes act more read-only/disabled by not changing the
border-color when clicked.
Examples using light mode:
| Before | After |
| - | - |
| ![Kapture 2023-06-28 at 00 20
45](https://github.com/go-gitea/gitea/assets/63764270/0899fd5c-18a9-4290-9ba9-d3cf71033cf8 )
| ![Kapture 2023-06-28 at 00 23
12](https://github.com/go-gitea/gitea/assets/63764270/0db9be14-e16c-42ed-8fb1-999928fd1d25 )
|
| ![Kapture 2023-06-28 at 00 25
22](https://github.com/go-gitea/gitea/assets/63764270/65c6c380-b928-4e6c-b403-3655d3565896 )
| ![Kapture 2023-06-28 at 00 27
28](https://github.com/go-gitea/gitea/assets/63764270/d8c2a019-e07c-43a1-a7fa-93c0d4e01900 )
|
| | read-only checkboxes and checkmark are faded<br>and the checkboxes
act more read-only/disabled |
Fixes/Closes/Resolves #25076
Co-authored-by: Ed Silkworth <ed.silkworth@icloud.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-06-29 22:53:43 +00:00
Giteabot
51b6a78791
Fix milestones deletion ( #25583 ) ( #25584 )
...
Backport #25583 by @HesterG
Close #25557
Fix regression from #25315
`data-id` is still needed for deleting milestone.
Co-authored-by: HesterG <hestergong@gmail.com>
2023-06-29 08:52:05 +00:00
Giteabot
9bbb4d8d6d
Improve loadprojects for issue list ( #25468 ) ( #25493 )
2023-06-26 02:06:58 +00:00
Giteabot
85bad22ff8
Fine tune "dropdown button" icon ( #25442 ) ( #25499 )
...
Backport #25442 by @wxiaoguang
![image](https://github.com/go-gitea/gitea/assets/2114189/143e043d-85c9-43a4-85ae-ca55f507f738 )
----
![image](https://github.com/go-gitea/gitea/assets/2114189/bcba03a5-732e-4139-bc35-96a7f8bfcb88 )
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-06-25 14:35:26 +08:00
Giteabot
51789ba12d
Improve wiki sidebar and TOC ( #25460 ) ( #25477 )
...
Backport #25460 by @wxiaoguang
Close #20976
Close #20975
1. Fix the bug: the TOC in footer was incorrectly rendered as main
content's TOC
2. Fix the layout: on mobile, the TOC is put above the main content,
while the sidebar is put below the main content
3. Auto collapse the TOC on mobile
ps: many styles of "wiki.css" are moved from old css files, so leave
nits to following PRs.
### for desktop
![image](https://github.com/go-gitea/gitea/assets/2114189/6c84201c-0648-465a-99e6-c53cdaee53c0 )
### for mobile
![image](https://github.com/go-gitea/gitea/assets/2114189/9cb4fdfe-b6ab-4e6f-ae82-219ddb8fa27e )
### other changed pages
<details>
![image](https://github.com/go-gitea/gitea/assets/2114189/ef077736-2c3e-4e3d-82fe-d9bf1ebcca98 )
![image](https://github.com/go-gitea/gitea/assets/2114189/bb528429-ad5f-4258-a5c4-05f997c624ea )
</details>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-06-24 10:16:15 +08:00
Giteabot
2e64449de7
Make "dismiss" content shown correctly ( #25461 ) ( #25465 )
...
Backport #25461 by @wxiaoguang
Close #25127
![image](https://github.com/go-gitea/gitea/assets/2114189/7d6be811-8e4a-4982-a5e4-857d171758d4 )
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-06-23 11:04:15 +00:00
Giteabot
056829749e
Diff page enhancements ( #25398 ) ( #25437 )
...
Backport #25398 by @silverwind
Two small tweaks:
1. Vertically center arrow here when editing a PR:
<img width="405" alt="Screenshot 2023-06-20 at 19 48 49"
src="https://github.com/go-gitea/gitea/assets/115237/1d63764d-9fd9-467e-8a8e-9258c06475eb ">
2. Use 2-row layout on diff viewed status and show it again on mobile:
<img width="142" alt="Screenshot 2023-06-20 at 19 51 21"
src="https://github.com/go-gitea/gitea/assets/115237/3046e782-163c-4f87-910c-a22066de8f1b ">
Mobile view:
<img width="370" alt="Screenshot 2023-06-20 at 19 44 40"
src="https://github.com/go-gitea/gitea/assets/115237/9cf56347-7323-4d05-99a5-17ad215ee44d ">
Co-authored-by: silverwind <me@silverwind.io>
2023-06-22 14:33:13 +02:00
Giteabot
ea00ed320d
Various UI fixes ( #25264 ) ( #25431 )
...
Backport #25264 by @silverwind
Numerous small UI fixes:
- Fix double border in collaborator list
- Fix system notice table background
- Mute links in repo and org lists
- Downsize projects edit buttons
- Improve milestones and project list rendering
- Condense milestone list entry to a single line of "metas"
- Mute ".." button in repo files list
<img width="899" alt="Screenshot 2023-06-14 at 21 19 23"
src="https://github.com/go-gitea/gitea/assets/115237/40d70006-5f76-49ad-b43c-4343ec3311e1 ">
<img width="905" alt="Screenshot 2023-06-14 at 21 18 29"
src="https://github.com/go-gitea/gitea/assets/115237/46ef39ea-ab26-452d-89b0-a55d0cfacfdb ">
<img width="270" alt="Screenshot 2023-06-14 at 21 14 09"
src="https://github.com/go-gitea/gitea/assets/115237/aa16e833-a03b-4231-bc7c-159a6a6bee19 ">
<img width="409" alt="Screenshot 2023-06-14 at 21 12 13"
src="https://github.com/go-gitea/gitea/assets/115237/b5242d41-f87a-4837-b0cf-9cc4c1f43daf ">
<img width="286" alt="Screenshot 2023-06-14 at 21 10 03"
src="https://github.com/go-gitea/gitea/assets/115237/d0c36e47-651b-4d34-ad95-3d59474a7c3e ">
<img width="928" alt="Screenshot 2023-06-14 at 21 05 24"
src="https://github.com/go-gitea/gitea/assets/115237/fc3b713e-d252-40f5-b6ba-6e5a741ab500 ">
<img width="217" alt="Screenshot 2023-06-14 at 21 02 01"
src="https://github.com/go-gitea/gitea/assets/115237/c4c33376-18d6-4820-aff5-f508f6d351a0 ">
<img width="79" alt="Screenshot 2023-06-14 at 20 42 43"
src="https://github.com/go-gitea/gitea/assets/115237/034b5950-c0bf-473b-a2f7-0c27a0259f29 ">
<img width="607" alt="Screenshot 2023-06-14 at 21 00 42"
src="https://github.com/go-gitea/gitea/assets/115237/fba2d3fd-bd3e-4daf-8b2f-530a1c99c8bc ">
Co-authored-by: silverwind <me@silverwind.io>
2023-06-22 10:19:38 +00:00
sebastian-sauer
30a783879f
Show outdated comments in files changed tab ( #24936 ) ( #25428 )
...
Backport #24936
If enabled show a clickable label in the comment. A click on the label
opens the Conversation tab with the comment focussed - there you're able
to view the old diff (or original diff the comment was created on).
**Screenshots**
![image](https://github.com/go-gitea/gitea/assets/1135157/63ab9571-a9ee-4900-9f02-94ab0095f9e7 )
![image](https://github.com/go-gitea/gitea/assets/1135157/78f7c225-8d76-46f5-acfd-9b8aab988a6c )
When resolved and outdated:
![image](https://github.com/go-gitea/gitea/assets/1135157/6ece9ebd-c792-4aa5-9c35-628694e9d093 )
Option to enable/disable this (stored in user settings - default is
disabled):
![image](https://github.com/go-gitea/gitea/assets/1135157/ed99dfe4-76dc-4c12-bd96-e7e62da50ab5 )
![image](https://github.com/go-gitea/gitea/assets/1135157/e837a052-e92e-4a28-906d-9db5bacf93a6 )
fixes #24913
Co-authored-by: silverwind <me@silverwind.io>
2023-06-22 08:34:42 +00:00
Giteabot
cda69a0363
Fix dropdown icon layout on diff page ( #25397 ) ( #25403 )
...
Backport #25397 by @wxiaoguang
Address
https://github.com/go-gitea/gitea/pull/25163#issuecomment-1599207916
Remove the unused "icon-button".
And fix the layout:
Without the dropdown icon:
```
{{svg "gitea-whitespace"}}
```
![image](https://github.com/go-gitea/gitea/assets/2114189/58a524ba-f289-4982-aea2-6f9f9f9cbdcf )
With the dropdown icon:
```
{{svg "gitea-whitespace" 16 "gt-mr-3"}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
```
![image](https://github.com/go-gitea/gitea/assets/2114189/eb99168b-5d49-40a7-8665-5296cbb4e486 )
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-06-21 10:55:11 +08:00
Giteabot
e9105ac281
Fix label list divider ( #25312 ) ( #25372 )
...
Backport #25312 by @wxiaoguang
We only needs 2 lines to hide the dividers.
```
$dropdownLabelFilter.dropdown('setting', {'hideDividers': 'empty'});
$dropdownLabelFilter.dropdown('refreshItems');
```
Other code blocks are refactored by the way.
![image](https://github.com/go-gitea/gitea/assets/2114189/74989996-fcea-4df4-b534-b06f7957939a )
![image](https://github.com/go-gitea/gitea/assets/2114189/ee3b3761-b96e-4fb5-b646-e9d3117e5f40 )
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2023-06-19 18:14:31 +00:00
Giteabot
e6e1cfd8e4
fix issue filters on mobile view ( #25368 ) ( #25371 )
...
Backport #25368 by @denyskon
Fix #24846 applying the solution proposed by @silverwind
<details>
<summary>Screenshots</summary>
![Bildschirmfoto vom 2023-06-19
12-20-54](https://github.com/go-gitea/gitea/assets/47871822/3f4e4536-38c4-451b-bfc0-a7c39acd37f0 )
![Bildschirmfoto vom 2023-06-19
12-21-02](https://github.com/go-gitea/gitea/assets/47871822/3403ecc2-4d7f-4acd-b0c0-1b7a10228ff7 )
![Bildschirmfoto vom 2023-06-19
12-21-16](https://github.com/go-gitea/gitea/assets/47871822/ef28a2bf-b7cc-4aec-b54b-99d2cc46a1f6 )
![Bildschirmfoto vom 2023-06-19
12-21-21](https://github.com/go-gitea/gitea/assets/47871822/f8cd72a5-379e-410b-b0ef-d58895719370 )
![Bildschirmfoto vom 2023-06-19
12-21-28](https://github.com/go-gitea/gitea/assets/47871822/34c78301-820c-4106-a086-ae81dc97eb91 )
![Bildschirmfoto vom 2023-06-19
12-21-48](https://github.com/go-gitea/gitea/assets/47871822/b677adf1-3a48-42c8-befe-fa9d2679f0a3 )
</details>
Replaces #25335
Co-authored-by: Denys Konovalov <kontakt@denyskon.de>
2023-06-19 17:43:22 +00:00
Giteabot
b673edbeaf
Fix UI on mobile view ( #25315 ) ( #25340 )
...
Backport #25315 by @denyskon
Various fixes to pages or elements which were looking ugly on mobile.
<details>
<summary>Screenshots</summary>
![Bildschirmfoto vom 2023-06-17
20-38-41](https://github.com/go-gitea/gitea/assets/47871822/30b5d3ce-df3b-43eb-a4c2-c3790667fb9d )
![Bildschirmfoto vom 2023-06-17
20-39-27](https://github.com/go-gitea/gitea/assets/47871822/27c07b25-3602-4fb2-b34d-d5e875e054e9 )
![Bildschirmfoto vom 2023-06-17
20-41-27](https://github.com/go-gitea/gitea/assets/47871822/dacdbb4e-e3dd-4b94-abf0-c68e3d64bd3b )
![Bildschirmfoto vom 2023-06-17
20-41-48](https://github.com/go-gitea/gitea/assets/47871822/72432c35-7c4a-4c7f-a767-3562f26a5c14 )
![Bildschirmfoto vom 2023-06-17
20-42-37](https://github.com/go-gitea/gitea/assets/47871822/737c26ed-1910-4467-98ef-e8769bbbe6f0 )
![Bildschirmfoto vom 2023-06-17
20-42-52](https://github.com/go-gitea/gitea/assets/47871822/1813b4bc-43c0-4912-8acb-5d799c090bf3 )
![Bildschirmfoto vom 2023-06-17
20-43-06](https://github.com/go-gitea/gitea/assets/47871822/136466e8-34e5-419d-97ec-5202ff819fd2 )
![Bildschirmfoto vom 2023-06-17
20-43-42](https://github.com/go-gitea/gitea/assets/47871822/59270bb2-d661-4a84-8504-3e50f771f767 )
![Bildschirmfoto vom 2023-06-17
20-44-44](https://github.com/go-gitea/gitea/assets/47871822/494e274d-3771-4141-9419-0a4bbd8b7f64 )
</details>
Co-authored by: @silverwind
Co-authored-by: Denys Konovalov <kontakt@denyskon.de>
Co-authored-by: silverwind <me@silverwind.io>
2023-06-18 13:02:41 +00:00
Giteabot
4e79c76ed0
When viewing a file, hide the add button ( #25320 ) ( #25339 )
...
Backport #25320 by @hiifong
Fix #25281
When viewing a file, hide the add button
![image](https://github.com/go-gitea/gitea/assets/89133723/839babaf-6b67-46e1-a103-677306fb8503 )
![image](https://github.com/go-gitea/gitea/assets/89133723/32a8aeca-31f4-4ce1-a0fa-7656e16b66d3 )
Co-authored-by: hiifong <i@hiif.ong>
2023-06-18 10:24:54 +00:00