a1012112796 e5f8d144f2

[PORT] Add warning message in merge instructions when AutodetectManualMerge was not enabled (gitea#31805) ...

---

Conflict resolution: trivial
Things done differently: Improve localization message, use the paragraph
element instead of the div element, fix passing this variable to the
template and add a integration test

(cherry picked from commit 9633f336c87947dc7d2a5e76077a10699ba5e50d)

2024-08-11 19:15:37 +02:00

..

admin

[UI] Fix admin layout

2024-07-30 23:35:22 +02:00

api/packages/pypi

Update templates/api/packages/pypi/simple.tmpl

2024-04-12 16:43:30 +00:00

base

Update module github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker to v3

2024-08-09 21:03:37 +02:00

custom

[FEAT] Repository flags

2024-02-05 16:09:42 +01:00

devtest

Fix some URLs whose sub-path is missing (#31289)

2024-06-09 16:04:57 +02:00

explore

[I18N] Injected updated time in translation string (#3837)

2024-05-20 18:47:35 +00:00

htmx

Update module github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker to v3

2024-08-09 21:03:37 +02:00

mail

Merge pull request '[SEC] Notify owner about TOTP enrollment' (#4704) from gusted/sec-more-totp into forgejo

2024-07-27 20:53:47 +00:00

org

Update module github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker to v3

2024-08-09 21:03:37 +02:00

package

Arch packages implementation (#4785)

2024-08-04 06:16:29 +00:00

projects

Merge pull request 'Replace gt-word-break with tw-break-anywhere' (#4102) from 0ko/forgejo:ui-replace-gt-word-break into forgejo

2024-06-11 10:39:03 +00:00

repo

[PORT] Add warning message in merge instructions when AutodetectManualMerge was not enabled (gitea#31805)

2024-08-11 19:15:37 +02:00

shared

Update module github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker to v3

2024-08-09 21:03:37 +02:00

status

feat(quota): Quota enforcement

2024-08-02 11:10:34 +02:00

swagger

Merge pull request '[gitea] week 2024-32 cherry pick (gitea/main -> forgejo)' (#4801) from earl-warren/wcp/2024-32 into forgejo

2024-08-06 05:47:20 +00:00

user

[UI] Fix inconsitencies in link/login account page

2024-08-09 10:52:17 +02:00

webhook

webhook: matrix access_token helper text

2024-04-16 08:59:56 +02:00

home.tmpl

Add slogan config (#3752)

2024-06-07 17:12:48 +00:00

install.tmpl

A few cosmetic improvements to the installation page (#4170)

2024-06-18 09:49:56 +00:00

post-install.tmpl

[BRANDING] Custom loading animation for Forgejo

2024-02-05 16:02:13 +01:00