Gusted 
								
							 
						 
						
							
							
								
							
							
	88426b578f  
						 
						
							
							
								
								
								[UI] Fix scoped-access-token  
							
							... 
							
							
							
							
							- Regression of #4571 
- Refactor to not use the component API of Vue. The root cause is still
unknown.
(cherry picked from commit aa5163d5c4 
							
						 
						
							2024-07-24 21:35:59 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									wxiaoguang 
								
							 
						 
						
							
							
								
							
							
	
	
	816e77485f 
 
						 
						
							
							
								
								
								Fix some URLs whose sub-path is missing ( #31289 )  
							
							... 
							
							
							
							
							Fix  #31285 
(cherry picked from commit 0188d82e4908eb173f7203d577f801f3168ffcb8)
Conflicts:
	templates/user/settings/applications.tmpl
(cherry picked from commit 3723d8c32059a571b84dc8636cb3649be6e6f1b3)
Conflicts:
	templates/user/settings/applications.tmpl
	trivial context conflict <i> vs <p>
(cherry picked from commit bbe98a3254e65eb8b9ec8fddf5e0ffe416a96614) 
						
							2024-06-09 12:05:43 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Giteabot 
								
							 
						 
						
							
							
								
							
							
	
	
	5a2904166e 
 
						 
						
							
							
								
								
								Fix overflow on notifications ( #31178 ) ( #31237 )  
							
							... 
							
							
							
							
							Backport #31178  by @silverwind
Fixes https://github.com/go-gitea/gitea/issues/31170 .
<img width="1312" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/627711ed-93ca-4be6-b958-10d673ae9517 ">
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 85a81767083efd49bf675b3de30de5421ab2ae69) 
							
						 
						
							2024-06-09 11:46:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zettat123 
								
							 
						 
						
							
							
								
							
							
	
	
	d841e95191 
 
						 
						
							
							
								
								
								Return access_denied error when an OAuth2 request is denied ( #30974 )  
							
							... 
							
							
							
							
							According to [RFC
6749](https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.2.1 ),
when the resource owner or authorization server denied an request, an
`access_denied` error should be returned. But currently in this case
Gitea does not return any error.
For example, if the user clicks "Cancel" here, an `access_denied` error
should be returned.
<img width="360px"
src="https://github.com/go-gitea/gitea/assets/15528715/be31c09b-4c0a-4701-b7a4-f54b8fe3a6c5 "
/>
(cherry picked from commit f1d9f18d96050d89a4085c961f572f07b1e653d1)
(cherry picked from commit 886a675f62 
							
						 
						
							2024-06-05 17:19:22 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									forgejo-backport-action 
								
							 
						 
						
							
							
								
							
							
	7a8b2d8eb8  
						 
						
							
							
								
								
								[v7.0/forgejo] Improve base locale related to settings and accounts ( #3742 )  
							
							... 
							
							
							
							
							**Backport:** https://codeberg.org/forgejo/forgejo/pulls/3733 
- general English improvements
- separated the header of Language part in user settings into a new string for better translatability
- made that header contain "Default", just like the theme one, because this is how this actually works: the bottom selector saves the language temporarily, the selector in the settings saves it permanently. Not many users know about this difference. This clarification will help some
- removed some of "Manage" from the headers where they aren't really needed. This improves the consistency with some other headers
Co-authored-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3742 
Reviewed-by: 0ko <0ko@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-05-16 14:15:33 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Earl Warren 
								
							 
						 
						
							
							
								
							
							
	ac34a68a93  
						 
						
							
							
								
								
								Merge pull request 'Port Fix checkbox field markup' ( #3592 ) from 0ko/forgejo:a-commit into v7.0/forgejo  
							
							... 
							
							
							
							
							Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3592 
Reviewed-by: Otto <otto@codeberg.org> 
							
						 
						
							2024-05-02 18:10:20 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									JakobDev 
								
							 
						 
						
							
							
								
							
							
	d449fcff0a  
						 
						
							
							
								
								
								Show repo count in blocked users tab ( #3601 )  
							
							... 
							
							
							
							
							Fixes  #3595 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3601 
Reviewed-by: Otto <otto@codeberg.org>
Co-authored-by: JakobDev <jakobdev@gmx.de>
Co-committed-by: JakobDev <jakobdev@gmx.de>
(cherry picked from commit d50efa626a 
						
							2024-05-02 17:10:06 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									forgejo-backport-action 
								
							 
						 
						
							
							
								
							
							
	4b79a98910  
						 
						
							
							
								
								
								Fix inconsistent required field ( #3591 )  
							
							... 
							
							
							
							
							Co-authored-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3591 
Reviewed-by: Otto <otto@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-05-01 19:05:43 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	b917571d81  
						 
						
							
							
								
								
								Fix checkbox field markup ( #30666 )  
							
							... 
							
							
							
							
							Fixes https://github.com/go-gitea/gitea/issues/30664 .
Previous use was not a supported way by fomantic and the misuse only
became visible after the checkbox migration.
(cherry picked from commit 1a2ae64b16f10b8d1e17197d18b9eb373faf58db) 
							
						 
						
							2024-05-01 23:31:42 +05: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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
								
							
							
	
	
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									iminfinity 
								
							 
						 
						
							
							
								
							
							
	cb0c6b52be  
						 
						
							
							
								
								
								add label filters in org/{org_name}/issues  
							
							... 
							
							
							
							
							(cherry picked from commit 8d13ed4a8d 
							
						 
						
							2024-04-04 17:37:56 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									0ko 
								
							 
						 
						
							
							
								
							
							
	7b24b669ed  
						 
						
							
							
								
								
								Provide a way to translate data units  
							
							
							
							
						 
						
							2024-04-02 17:29:32 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	5016bc5d5c 
 
						 
						
							
							
								
								
								Migrate gt-hidden to tw-hidden ( #30046 )  
							
							... 
							
							
							
							
							We have to define this one in helpers.css because tailwind only
generates a single class but certain things rely on this being
double-class. Command ran:
```sh
perl -p -i -e 's#gt-hidden#tw-hidden#g' web_src/js/**/* templates/**/* models/**/* web_src/css/**/*
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit ec3d467f15a683b305ac165c3eba6683628dcb25)
Conflicts:
	templates/install.tmpl
	templates/repo/diff/conversation.tmpl
	templates/repo/issue/view_content/conversation.tmpl
	templates/repo/issue/view_content/sidebar.tmpl
	templates/repo/issue/view_title.tmpl
	resolved by prefering Forgejo version and applying the
	commands to all files 
							
						 
						
							2024-03-30 07:17:29 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	c82bef515e 
 
						 
						
							
							
								
								
								Migrate margin and padding helpers to tailwind ( #30043 )  
							
							... 
							
							
							
							
							This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g'   {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g'   {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g'   {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g'   {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g'   {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
	routers/web/repo/view.go
	templates/base/head_navbar.tmpl
	templates/repo/code/recently_pushed_new_branches.tmpl
	templates/repo/diff/box.tmpl
	templates/repo/diff/compare.tmpl
	templates/repo/diff/conversation.tmpl
	templates/repo/header.tmpl
	templates/repo/issue/filter_list.tmpl
	templates/repo/issue/view_content/conversation.tmpl
	templates/repo/issue/view_content/sidebar.tmpl
	templates/repo/settings/options.tmpl
	templates/repo/view_file.tmpl
	templates/shared/user/blocked_users.tmpl
	templates/status/500.tmpl
	web_src/js/components/DashboardRepoList.vue
	resolved by prefering Forgejo version and applying the
	commands to all files 
							
						 
						
							2024-03-30 07:17:29 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Earl Warren 
								
							 
						 
						
							
							
								
							
							
	ade8fc51b7  
						 
						
							
							
								
								
								Merge pull request '[FEAT] Remove add organization on dashboard switcher' ( #2895 ) from gusted/forgejo-rm-org into forgejo  
							
							... 
							
							
							
							
							Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2895 
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> 
							
						 
						
							2024-03-30 06:04:22 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Gusted 
								
							 
						 
						
							
							
								
							
							
	
	
	3ccc7b22d8 
 
						 
						
							
							
								
								
								[FEAT] Remove add organization on dashboard switcher  
							
							... 
							
							
							
							
							- Similair to #2593  that removed subtle add button in a place where it's
strictly not needed.
- Remove the "Add organization" item in the 'context dashboard switcher' dropdown. 
							
						 
						
							2024-03-30 03:58:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Gusted 
								
							 
						 
						
							
							
								
							
							
	
	
	6c55347377 
 
						 
						
							
							
								
								
								[BRANDING] Move docs.gitea.com to forgejo.org/docs  
							
							... 
							
							
							
							
							- Replace links from docs.gitea.com with forgejo.org/docs for those
where the relevant links are available on the Forgejo documentation.
- Resolves  #2892  
							
						 
						
							2024-03-30 01:56:25 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	1ee494a045 
 
						 
						
							
							
								
								
								[Port] gitea#29982 Introduce .secondary-nav and handle .page-content spacing universally  
							
							... 
							
							
							
							
							Fixes: https://github.com/go-gitea/gitea/issues/29981 . Introduce
`.secondary-nav` as a universal way for styling and margin adjustments
inside `.page-content`.
If the first child of `.page-content` is `.secondary-nav`, we add margin
below it, otherwise we add padding to the first child. Notable changes:
- `--color-header-wrapper` is replaced with `--color-secondary-nav-bg`.
- `navbar` class is removed.
Co-authored-by: Giteabot <teabot@gitea.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
---
Conflict resolution: Trivial conflict & changed selector to reflect new
classes.
Ref: https://codeberg.org/forgejo/forgejo/issues/2776 
(cherry picked from commit 3ccda41a539b8ba7841919ee12dc2877ddc03818) 
							
						 
						
							2024-03-28 16:43:09 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	5940dc17fd 
 
						 
						
							
							
								
								
								Migrate gap helpers to tailwind ( #30034 )  
							
							... 
							
							
							
							
							Commands ran:
```sh
perl -p -i -e 's#gt-gap-0#tw-gap-0#g'   web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-1#tw-gap-0.5#g' web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-2#tw-gap-1#g'   web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-3#tw-gap-2#g'   web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-4#tw-gap-4#g'   web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-5#tw-gap-8#g'   web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-x-0#tw-gap-x-0#g'   web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-x-1#tw-gap-x-0.5#g' web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-x-2#tw-gap-x-1#g'   web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-x-3#tw-gap-x-2#g'   web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-x-4#tw-gap-x-4#g'   web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-x-5#tw-gap-x-8#g'   web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-y-0#tw-gap-y-0#g'   web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-y-1#tw-gap-y-0.5#g' web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-y-2#tw-gap-y-1#g'   web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-y-3#tw-gap-y-2#g'   web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-y-4#tw-gap-y-4#g'   web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-gap-y-5#tw-gap-y-8#g'   web_src/js/**/* templates/**/*
(cherry picked from commit 90a4f9a49eecc4b672df0c29f5034be25244191c)
Conflicts:
	templates/repo/diff/box.tmpl
	templates/repo/diff/conversation.tmpl
	prefered Forgejo files & re-ran the commands to ensure all are applied 
							
						 
						
							2024-03-26 19:04:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	66feafb3de 
 
						 
						
							
							
								
								
								Migrate font-size helpers to tailwind ( #30029 )  
							
							... 
							
							
							
							
							Migrate `gt-font-*` to `tw-text-*` All tailwind-original class names are
also available and render like they would with 16px root font size.
We currently have root font size at 14px, but I would like to eventually
migrate us to 16px so that the tailwind docs apply to us unchangend and
because 16px is the recommended root font size for web pages in general.
Also the number 16 is much better dividable than 14 so will result in
more integers.
(cherry picked from commit 75e2e5c736687ae1897cf760a432b572feed56f5)
Conflicts:
	templates/repo/header.tmpl
	trivial context conflict 
							
						 
						
							2024-03-26 19:04:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	eaac4af245 
 
						 
						
							
							
								
								
								Replace all simple inline styles with tailwind ( #30032 )  
							
							... 
							
							
							
							
							These should be all simple inline styles that were left in the
templates.
Co-authored-by: Giteabot <teabot@gitea.io>
(cherry picked from commit 0bef9a2775af0e27a0754207fc87537b96c2792e) 
							
						 
						
							2024-03-26 19:04:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	76315e0919 
 
						 
						
							
							
								
								
								Migrate font-weight helpers to tailwind ( #30027 )  
							
							... 
							
							
							
							
							Commands ran:
```sh
perl -p -i -e 's#gt-font-light#tw-font-light#g' web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-font-normal#tw-font-normal#g' web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-font-medium#tw-font-medium#g' web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-font-semibold#tw-font-semibold#g' web_src/js/**/* templates/**/*
perl -p -i -e 's#gt-font-bold#tw-font-bold#g' web_src/js/**/* templates/**/*
```
(cherry picked from commit fabe01478ab449cc4870b7e2a9a1db3911bb14bd)
Conflicts:
	templates/repo/header.tmpl
	prefered Forgejo file & re-ran the commands to ensure the
	migration is done 
							
						 
						
							2024-03-26 19:04:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	3ea7437fa6 
 
						 
						
							
							
								
								
								Fix incorrect tailwind migration ( #30007 )  
							
							... 
							
							
							
							
							Fixes https://github.com/go-gitea/gitea/issues/30005 . Regression from
https://github.com/go-gitea/gitea/pull/29945 .
There was only once instance of `tw-content-center` before that PR, so I
just ran below command and reverted that one instance.
```sh
perl -p -i -e 's#tw-content-center#tw-items-center#g' web_src/js/**/* templates/**/* models/**/* tests/**/*
```
(cherry picked from commit 04f9ad056882fc3f21b247b16f84437adf0f36d8)
Conflicts:
	templates/repo/diff/conversation.tmpl
	templates/repo/header.tmpl
	templates/repo/issue/filter_list.tmpl
	templates/repo/issue/view_content/conversation.tmpl
	templates/repo/wiki/view.tmpl
	web_src/js/components/DashboardRepoList.vue
	re-ran the command after discarding the Gitea changes to
	ensure all Forgejo files are also covered 
							
						 
						
							2024-03-26 19:04:27 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	2befd9a3cf 
 
						 
						
							
							
								
								
								Replace 10 more gt- classes with tw- ( #29945 )  
							
							... 
							
							
							
							
							Likely the biggest change of the tailwind refactors. Only thing of note
is that `tw-flex-1` resolves to `flex: 1 1 0%` while our `gt-f1` was
`flex: 1 1 0`, I don't think it will make any difference. Commands I've
ran:
```sh
perl -p -i -e 's#gt-vm#tw-align-middle#g' web_src/js/**/* templates/**/* models/**/*
perl -p -i -e 's#gt-fw#tw-flex-wrap#g' web_src/js/**/* templates/**/* models/**/*
perl -p -i -e 's#gt-f1#tw-flex-1#g' web_src/js/**/* templates/**/* models/**/*
perl -p -i -e 's#gt-fc#tw-flex-col#g' web_src/js/**/* templates/**/* models/**/*
perl -p -i -e 's#gt-sb#tw-justify-between#g' web_src/js/**/* templates/**/* models/**/*
perl -p -i -e 's#gt-je#tw-justify-end#g' web_src/js/**/* templates/**/* models/**/*
perl -p -i -e 's#gt-jc#tw-justify-center#g' web_src/js/**/* templates/**/* models/**/*
perl -p -i -e 's#gt-ac#tw-content-center#g' web_src/js/**/* templates/**/* models/**/* tests/**/*
perl -p -i -e 's#gt-df#tw-flex#g' web_src/js/**/* templates/**/* models/**/* tests/**/*
perl -p -i -e 's#gt-dib#tw-inline-block#g' web_src/js/**/* templates/**/* models/**/* tests/**/*
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit f88ad5424f381bf2a45fd863b551c5a72891bb68)
Conflicts:
	templates/repo/diff/conversation.tmpl
	templates/repo/header.tmpl
	templates/repo/issue/filter_actions.tmpl
	templates/repo/issue/filter_list.tmpl
	templates/repo/issue/view_content/conversation.tmpl
	templates/repo/release/list.tmpl
	templates/repo/wiki/view.tmpl
	web_src/js/components/DashboardRepoList.vue
	discard the proposed changes and prefer Forgejo. A followup
	commit will apply the same commands. 
							
						 
						
							2024-03-26 19:04:27 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									wxiaoguang 
								
							 
						 
						
							
							
								
							
							
	
	
	e5920b4a62 
 
						 
						
							
							
								
								
								Refactor StringsToInt64s ( #29967 )  
							
							... 
							
							
							
							
							And close  #27176 
(cherry picked from commit cdb4d1a8db096d60dba04728924dab85def45b19) 
							
						 
						
							2024-03-26 19:04:26 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	165182a92d 
 
						 
						
							
							
								
								
								Remove the negative margin from .page-content ( #29922 )  
							
							... 
							
							
							
							
							The negative margin was suboptimal and presents a few unnecessary
challenges while styling the page. Remove it and add custom margin
values, which slightly changes the height a few things near the top of
the page as well:
15px less height of explore and login navbar:
<img width="899" alt="Screenshot 2024-03-20 at 00 52 34"
src="https://github.com/go-gitea/gitea/assets/115237/72a01ca4-5d17-4a0f-b915-61f95054fcb1 ">
15px reduced padding-top height of "user bar" and equal 4px padding
added:
<img width="484" alt="Screenshot 2024-03-20 at 00 52 50"
src="https://github.com/go-gitea/gitea/assets/115237/a8507e6d-372d-4a8b-9048-66fcf8a5facd ">
3px less padding on top of repo:
<img width="552" alt="Screenshot 2024-03-20 at 00 53 49"
src="https://github.com/go-gitea/gitea/assets/115237/dede6e44-7688-440f-a1b6-13532638ae03 ">
(cherry picked from commit 8cad44f4109b6f87e565d43e137e99ab23b54349) 
							
						 
						
							2024-03-26 19:04:26 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									wxiaoguang 
								
							 
						 
						
							
							
								
							
							
	
	
	4f8763c4fd 
 
						 
						
							
							
								
								
								Remove unnecessary ".Link" usages ( #29929 )  
							
							... 
							
							
							
							
							Follow #29909 
(cherry picked from commit 91699a9bb1fc59029a2605912f1e380eff7297fa) 
							
						 
						
							2024-03-26 19:04:26 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									wxiaoguang 
								
							 
						 
						
							
							
								
							
							
	
	
	c758c5612e 
 
						 
						
							
							
								
								
								Remove unnecessary ".Link" usages ( #29909 )  
							
							... 
							
							
							
							
							In HTML, `?key=val` already means "use the current link with new query parameters"
(cherry picked from commit 4c476fa41dc29dc24afda0925023ae3d0b9707cd)
Conflicts:
	templates/repo/issue/filter_list.tmpl
	templates/shared/issuelist.tmpl
	trivial context conflict because the lines in Forgejo have rel=nofollow 
							
						 
						
							2024-03-26 19:04:26 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	4711d3311b 
 
						 
						
							
							
								
								
								Migrate border and margin classes to Tailwind ( #29828 )  
							
							... 
							
							
							
							
							Used all existing css vars, other migrations are 1:1.
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 34290a00c4501ffeba26db267be71ab68e3ec97f)
Conflicts:
	templates/repo/issue/filter_list.tmpl
	web_src/js/components/DashboardRepoList.vue
	trivial context conflicts 
							
						 
						
							2024-03-26 19:04:25 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Earl Warren 
								
							 
						 
						
							
							
								
							
							
	0bfd4ca532  
						 
						
							
							
								
								
								Merge pull request 'Allow users to hide all "Add more units..." hints' ( #2533 ) from algernon/forgejo:less-is-more into forgejo  
							
							... 
							
							
							
							
							Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2533 
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> 
							
						 
						
							2024-03-24 05:42:37 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Earl Warren 
								
							 
						 
						
							
							
								
							
							
	33ede09135  
						 
						
							
							
								
								
								Merge pull request '[PORT] Unify search boxes (gitea#29530)' ( #2688 ) from snematoda/port-29530 into forgejo  
							
							... 
							
							
							
							
							Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2688 
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> 
							
						 
						
							2024-03-24 05:33:13 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Rafael Heard 
								
							 
						 
						
							
							
								
							
							
	
	
	3acea02eb6 
 
						 
						
							
							
								
								
								Move all login and account creation page labels to be above inputs ( #29432 )  
							
							... 
							
							
							
							
							There are a few inconsistencies within Gitea and this PR addresses one
of them. This PR updates the sign-in page layout, including the register
and openID tabs, to match the layout of the settings pages
(/user/settings) for more consistency.
This PR updates the following routes:
`/user/login`
`/user/sign_up`
`/user/login/openid`
`/user/forgot_password`
`/user/link_account`
`/user/recover_account`
**Before**
<img width="968" alt="Screenshot 2024-02-05 at 8 27 24 AM"
src="https://github.com/go-gitea/gitea/assets/6152817/fb0cb517-57c0-4eed-be1d-56f36bd1960d ">
**After**
<img width="968" alt="Screenshot 2024-02-05 at 8 26 39 AM"
src="https://github.com/go-gitea/gitea/assets/6152817/428d691d-0a42-4a67-a646-05527f2a7b41 ">
This PR addresses a revert of the original PR due to this
[comment](https://github.com/go-gitea/gitea/pull/28753#issuecomment-1956596817 ).
---------
Co-authored-by: rafh <rafaelheard@gmail.com> 
							
						 
						
							2024-03-23 12:36:12 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Gergely Nagy 
								
							 
						 
						
							
							
								
							
							
	
	
	36147f580c 
 
						 
						
							
							
								
								
								Allow users to hide all "Add more units..." hints  
							
							... 
							
							
							
							
							Repositories displaying an "Add more..." tab on the header is a neat way
to let people discover they can enable more units. However, displaying
it all the time for repository owners, even when they deliberately do
not want to enable more units gets noisy very fast.
As such, this patch introduces a new setting which lets people disable
this hint under the appearance settings.
Fixes  #2378 .
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu> 
							
						 
						
							2024-03-21 08:15:51 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Denys Konovalov 
								
							 
						 
						
							
							
								
							
							
	847f03b6a6  
						 
						
							
							
								
								
								Unify search boxes ( #29530 )  
							
							... 
							
							
							
							
							Unify all but a few search boxes to use uniform style, uniform
translations and shared templates where possible.
Remove a few duplicated search templates, e. g. code search.
<details><summary>Example after screenshots:</summary>




</details>
Also includes #29700 
Co-authored-by: 6543 <6543@obermui.de>
---------
Co-authored-by: 6543 <m.huber@kithara.com>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
Conflicts:
	routers/web/repo/search.go
	templates/repo/home.tmpl
	templates/repo/search.tmpl
	templates/shared/repo_search.tmpl 
							
						 
						
							2024-03-20 12:31:05 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Earl Warren 
								
							 
						 
						
							
							
								
							
							
	6d340bcfea  
						 
						
							
							
								
								
								Merge pull request 'Update look of repo/org tabs on homepage' ( #2593 ) from 0ko/forgejo:hometab into forgejo  
							
							... 
							
							
							
							
							Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2593 
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org> 
							
						 
						
							2024-03-20 11:45:17 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Earl Warren 
								
							 
						 
						
							
							
								
							
							
	2f78daa3af  
						 
						
							
							
								
								
								Merge pull request '[gitea] week 12 cherry-pick' ( #2679 ) from algernon/forgejo:wcp/week-12 into forgejo  
							
							... 
							
							
							
							
							Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2679 
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> 
							
						 
						
							2024-03-20 08:15:06 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									silverwind 
								
							 
						 
						
							
							
								
							
							
	
	
	5a16c9d9c0 
 
						 
						
							
							
								
								
								Add <overflow-menu>, rename webcomponents ( #29400 )  
							
							... 
							
							
							
							
							1. Add `<overflow-menu>` web component
2. Rename `<gitea-origin-url>` to `<origin-url>` and make filenames
match.
<img width="439" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/2fbe4ca4-110b-4ad2-8e17-c1e116ccbd74 ">
<img width="444" alt="Screenshot 2024-03-02 at 21 36 52"
src="https://github.com/go-gitea/gitea/assets/115237/aa8f786e-dc8c-4030-b12d-7cfb74bdfd6e ">
<img width="537" alt="Screenshot 2024-03-03 at 03 05 06"
src="https://github.com/go-gitea/gitea/assets/115237/fddd50aa-adf1-4b4b-bd7f-caf30c7b2245 ">


TODO:
- [x] Check if removal of `requestAnimationFrame` is possible to avoid
flash of content. Likely needs a `MutationObserver`.
- [x] Hide tippy when button is removed from DOM.
- [x] ~~Implement right-aligned items
(https://github.com/go-gitea/gitea/pull/28976 )~~. Not going to do it.
- [x] Clean up CSS so base element has no background and add background
via tailwind instead.
- [x] Use it for org and user page.
---------
Co-authored-by: Giteabot <teabot@gitea.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 256a1eeb9a67b18c62a10f5909b584b7b220848a)
Conflicts:
	options/locale/locale_en-US.ini
	templates/package/content/cargo.tmpl
	templates/package/content/cran.tmpl
	templates/package/content/debian.tmpl
	templates/package/content/maven.tmpl 
							
						 
						
							2024-03-20 08:46:29 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									wxiaoguang 
								
							 
						 
						
							
							
								
							
							
	
	
	071d871dcf 
 
						 
						
							
							
								
								
								Fix incorrect locale Tr for gpg command ( #29754 )  
							
							... 
							
							
							
							
							(cherry picked from commit df60dbfb9918081962614d063485337fb42e0ee7) 
							
						 
						
							2024-03-20 08:46:29 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									0ko 
								
							 
						 
						
							
							
								
							
							
	
	
	26e4af4268 
 
						 
						
							
							
								
								
								Fix heatmap localization  
							
							... 
							
							
							
							
							Fixes  #2552 
(cherry picked from commit 708f4bc3b6 
						
							2024-03-20 08:20:08 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Earl Warren 
								
							 
						 
						
							
							
								
							
							
	
	
	ba75514887 
 
						 
						
							
							
								
								
								Revert "Fix heatmap localization"  
							
							... 
							
							
							
							
							It conflicts with unmerged translations.
This reverts commit 708f4bc3b6 
							
						 
						
							2024-03-20 07:31:23 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Gusted 
								
							 
						 
						
							
							
								
							
							
	7cfdd51dd9  
						 
						
							
							
								
								
								Merge pull request 'Use separate keys for tabs on login screen' ( #2630 ) from 0ko/forgejo:signintabs into forgejo  
							
							... 
							
							
							
							
							Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2630 
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org> 
							
						 
						
							2024-03-19 14:56:03 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Earl Warren 
								
							 
						 
						
							
							
								
							
							
	2c80727e8f  
						 
						
							
							
								
								
								Merge pull request 'Plurals and translations for heatmap' ( #2612 ) from 0ko/forgejo:oneisone into forgejo  
							
							... 
							
							
							
							
							Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2612 
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org> 
							
						 
						
							2024-03-19 13:24:12 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									0ko 
								
							 
						 
						
							
							
								
							
							
	708f4bc3b6  
						 
						
							
							
								
								
								Fix heatmap localization  
							
							... 
							
							
							
							
							Fixes  #2552  
						
							2024-03-19 14:37:03 +05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Gusted 
								
							 
						 
						
							
							
								
							
							
	cd7cdf06ed  
						 
						
							
							
								
								
								Merge pull request 'Fix milestone sorting translation keys' ( #2644 ) from 0ko/forgejo:fix-the-sort-milestones-bug-noone-have-noticed-in-a-half-of-a-year into forgejo  
							
							... 
							
							
							
							
							Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2644 
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org> 
							
						 
						
							2024-03-14 19:06:59 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									0ko 
								
							 
						 
						
							
							
								
							
							
	ec5c68da4f  
						 
						
							
							
								
								
								[I18N] Use separate keys for tabs on login screen  
							
							
							
							
						 
						
							2024-03-13 21:03:09 +05:00