2898 commits

Author	SHA1	Message	Date
Otto	ca2c850122	Merge pull request 'fix: correct Discord webhook JSON for issue events' (#5492) from kidsan/forgejo:discord-api-conformance into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5492 Reviewed-by: Otto <otto@codeberg.org>	2024-10-09 16:02:49 +00:00
JakobDev	1fc5e41592	[Feat]Add link to show all Issues/PullRequests (#4125) ... The Issue and PullRequest list has 3 states: - open: This lists all open Issues/PullRequests - closed: This lists all closed Issues/PullRequests - all: This lists all open and closed Issues/PullRequests If you want to get to the all state, you need to click Open while in open state or Closed while in closed state, which is very unintuitive. This PR adss a third button to get to this state.  I'm not sure if the eye icon fits well, but I couldn't find a better one. Tests will be added once #4124 is merged. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4125 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: JakobDev <jakobdev@gmx.de> Co-committed-by: JakobDev <jakobdev@gmx.de>	2024-10-09 04:56:40 +00:00
TimedIn	2feb3d03d7	feat: "assign to me" button on PRs and issues ... includes: Tests for assignees on issues Move assignees selector of new Issue to assignees.tmpl	2024-10-08 18:36:37 +02:00
Kidsan	cf3ebab4ba	fix: add length limit to discord webhook icon_url	2024-10-08 17:22:27 +02:00
voltagex	d17db93fbf	i18n: improve 'Verify' error message, stopgap for #2809 (#5479) ... Signed-off-by: Adam Baxter <codeberg@voltagex.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5479 Reviewed-by: Otto <otto@codeberg.org> Co-authored-by: voltagex <voltagex@noreply.codeberg.org> Co-committed-by: voltagex <voltagex@noreply.codeberg.org>	2024-10-07 16:11:07 +00:00
Otto	f7f7800460	Merge pull request 'feat: support regexp in git-grep search' (#4968) from yoctozepto/git-grep-regexp into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4968 Reviewed-by: Shiny Nematoda <snematoda@noreply.codeberg.org>	2024-10-04 17:10:14 +00:00
Codeberg Translate	aca00fa346	i18n: update of translations from Codeberg Translate (#5413) ... Translations update from [Codeberg Translate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/). Current translation status:  Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: fnetX <otto@codeberg.org> Co-authored-by: be4zad <be4zad@users.noreply.translate.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org> Co-authored-by: kwoot <kwoot@users.noreply.translate.codeberg.org> Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org> Co-authored-by: xtex <xtexchooser@duck.com> Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org> Co-authored-by: WithLithum <WithLithum@users.noreply.translate.codeberg.org> Co-authored-by: yeziruo <yeziruo@users.noreply.translate.codeberg.org> Co-authored-by: kecrily <kecrily@users.noreply.translate.codeberg.org> Co-authored-by: overloop <overloop@users.noreply.translate.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5413 Reviewed-by: Otto <otto@codeberg.org> Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org> Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>	2024-10-03 21:23:07 +00:00
Radosław Piliszek	19672407f0	ui(git-grep): adapt the hint per the comments	2024-09-29 11:10:50 +02:00
Codeberg Translate	e40554f89b	i18n: update of translations from Codeberg Translate (#5355) ... Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org> Co-authored-by: Vaclovas Intas <Gateway_31@protonmail.com> Co-authored-by: Zughy <Zughy@users.noreply.translate.codeberg.org> Co-authored-by: aleksi <aleksi@users.noreply.translate.codeberg.org> Co-authored-by: Application-Maker <Application-Maker@users.noreply.translate.codeberg.org> Co-authored-by: Salif Mehmed <mail@salif.eu> Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: Panagiotis \"Ivory\" Vasilopoulos <git@n0toose.net> Co-authored-by: claudep <claudep@users.noreply.translate.codeberg.org> Co-authored-by: vri <vri@users.noreply.translate.codeberg.org> Co-authored-by: nicokaiser <nicokaiser@users.noreply.translate.codeberg.org> Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org> Co-authored-by: robines <robines@users.noreply.translate.codeberg.org> Co-authored-by: nazrin <nazrin@users.noreply.translate.codeberg.org> Co-authored-by: Kaede Fujisaki <ledyba@users.noreply.translate.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5355 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org> Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>	2024-09-28 09:40:29 +00:00
Earl Warren	89d9307d56	Merge pull request '[gitea] week 2024-39 cherry pick (gitea/main -> forgejo)' (#5372) from earl-warren/wcp/2024-39 into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5372 Reviewed-by: Gusted <gusted@noreply.codeberg.org>	2024-09-27 08:12:43 +00:00
wxiaoguang	1ae3b127fc	Refactor CSRF protector (#32057) ... Remove unused CSRF options, decouple "new csrf protector" and "prepare" logic, do not redirect to home page if CSRF validation falis (it shouldn't happen in daily usage, if it happens, redirecting to home doesn't help either but just makes the problem more complex for "fetch") (cherry picked from commit 1fede04b83288d8a91304a83b7601699bb5cba04) Conflicts: options/locale/locale_en-US.ini tests/integration/repo_branch_test.go trivial context conflicts	2024-09-27 08:42:48 +02:00
Otto Richter	dc9a268d3c	i18n: UX improvements: Team permissions and issue closing ... Change word order for issue comment actions - An attempt to address https://codeberg.org/forgejo/forgejo/issues/2650 Org team permissions improvements - consistency: added missing dot - clarity: explain what external units mean - use dedicated keys to explain the permissions. - split in read/write permissions - use explicit labels for accessibility - ext_wiki.desc and ext_issues.desc are no longer in use.	2024-09-24 19:03:30 +02:00
Earl Warren	64d3fcd403	Merge pull request '[gitea] week 2024-38 cherry pick (gitea/main -> forgejo)' (#5325) from algernon/wcp/2024-38 into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5325 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-09-20 05:06:42 +00:00
Codeberg Translate	6d57cbe5c8	i18n: update of translations from Codeberg Translate (#5309) ... Translations update from [Codeberg Translate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/). Current translation status:  <!--start release-notes-assistant--> ## Draft release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Localization - [PR](https://codeberg.org/forgejo/forgejo/pulls/5309): <!--number 5309 --><!--line 0 --><!--description aTE4bjogdXBkYXRlIG9mIHRyYW5zbGF0aW9ucyBmcm9tIENvZGViZXJnIFRyYW5zbGF0ZQ==-->i18n: update of translations from Codeberg Translate<!--description--> <!--end release-notes-assistant--> Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org> Co-authored-by: aleksi <aleksi@users.noreply.translate.codeberg.org> Co-authored-by: Vaclovas Intas <Gateway_31@protonmail.com> Co-authored-by: toasterbirb <toasterbirb@users.noreply.translate.codeberg.org> Co-authored-by: Salif Mehmed <mail@salif.eu> Co-authored-by: Zughy <Zughy@users.noreply.translate.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5309 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org> Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>	2024-09-19 06:08:33 +00:00
Shiny Nematoda	663e957d3d	ui(git-grep): expose regexp mode in dropdown	2024-09-16 16:20:55 +02:00
GiteaBot	af3fbb397a	[skip ci] Updated licenses and gitignores ... (cherry picked from commit 972eae358db0c20bda23833ca94b4324d6d343cb)	2024-09-14 17:05:52 +02:00
0ko	6c448ae37e	fix(email): add missing string for password reset email (#5305) ... Fixes https://codeberg.org/forgejo/forgejo/issues/5293. `mail.reset_password.text` has been deleted unintentionally in 4383da91bd (diff-05e7a0ff464b6cb2ab45b456433c872221d1f06a), however, it is still used in email template: fbbaecf25a/templates/mail/auth/reset_passwd.tmpl (L11) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5305 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Reviewed-by: Otto <otto@codeberg.org>	2024-09-12 15:13:15 +00:00
0ko	3f48625560	i18n(*): fix placeholders in dashboard.new_version_hint	2024-09-12 17:52:46 +05:00
Gergely Nagy	d3417688d6	Remove URLs from translations, part two ... Followup to gitea#31950, replacing URLs in translations with placeholders, for all languages Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>	2024-09-12 17:33:30 +05:00
Gergely Nagy	1c896b94b9	locale: Fix auths.tip.discord in the hu-HU translation ... Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>	2024-09-12 17:29:52 +05:00
Gergely Nagy	b6b5d47dca	Remove HTML tags from create branch and tag translations ... This is a followup to gitea#31973, and removes the HTML tags for the rest of the languages too. Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>	2024-09-12 17:29:52 +05:00
Denys Konovalov	8857da871e	Remove urls from translations (#31950) ... Part of #27700 Removes all URLs from translation strings to easy up changing them in the future and to exclude people injecting malicious URLs through translations. First measure as long as #24402 is out of scope. (cherry picked from commit 83f37f630246e381eefd650fc2d4b1f3976ea882) Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu> Conflicts: - options/locale/locale_en-US.ini Resolved by manually applying the URL->%s changes to our translations. - routers/web/admin/hooks.go templates/repo/settings/protected_branch.tmpl templates/status/500.tmpl Manually resolved. - templates/repo/settings/webhook/settings.tmpl Applied the change to templates/webhook/shared-settings.tmpl instead Additional changes: Gitea-specific URLs have been replaced by their Forgejo counterparts, lifted from the original translation text.	2024-09-12 17:28:58 +05:00
Lunny Xiao	32320bbf32	Remove html tags from create tag and branch translation (#31973) ... Follow #31950 and Fix the display bug of #31966 . This will only fix the English version. I will update all these translation files in crowdin after this merged so that all the languages can be fixed. And all these files should be backported together. This PR remove the bold effect around the name when creating a new tag or branch. (cherry picked from commit a366af4b7a067227386184067e203091923b5b10)	2024-09-12 17:28:58 +05:00
Codeberg Translate	2d3fc00d02	i18n: update of translations from Codeberg Translate (#5231) ... Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org> Co-authored-by: xtex <xtexchooser@duck.com> Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org> Co-authored-by: Monti <contact@montidaproot.xyz> Co-authored-by: muhaaliss <muhaaliss@users.noreply.translate.codeberg.org> Co-authored-by: EssGeeEich <EssGeeEich@users.noreply.translate.codeberg.org> Co-authored-by: Zughy <Zughy@users.noreply.translate.codeberg.org> Co-authored-by: Marco Ciampa <ciampix@users.noreply.translate.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5231 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org> Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>	2024-09-12 12:26:49 +00:00
Codeberg Translate	fb4a8b24cc	i18n: update of translations from Codeberg Translate (#5182) ... Translations update from [Codeberg Translate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/). Current translation status:  <!--start release-notes-assistant--> ## Draft release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Localization - [PR](https://codeberg.org/forgejo/forgejo/pulls/5182): <!--number 5182 --><!--line 0 --><!--description aTE4bjogdXBkYXRlIG9mIHRyYW5zbGF0aW9ucyBmcm9tIENvZGViZXJnIFRyYW5zbGF0ZQ==-->i18n: update of translations from Codeberg Translate<!--description--> <!--end release-notes-assistant--> Co-authored-by: Vaclovas Intas <Gateway_31@protonmail.com> Co-authored-by: Monti <contact@montidaproot.xyz> Co-authored-by: sclu1034 <sclu1034@users.noreply.translate.codeberg.org> Co-authored-by: Dirk <Dirk@users.noreply.translate.codeberg.org> Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5182 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org> Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>	2024-09-05 05:41:41 +00:00
Codeberg Translate	45198cef64	i18n: update of translations from Codeberg Translate (#5070) ... Translations update from [Codeberg Translate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/). Current translation status:  <!--start release-notes-assistant--> ## Draft release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Localization - [PR](https://codeberg.org/forgejo/forgejo/pulls/5070): <!--number 5070 --><!--line 0 --><!--description aTE4bjogdXBkYXRlIG9mIHRyYW5zbGF0aW9ucyBmcm9tIENvZGViZXJnIFRyYW5zbGF0ZQ==-->i18n: update of translations from Codeberg Translate<!--description--> <!--end release-notes-assistant--> Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org> Co-authored-by: Xinayder <Xinayder@users.noreply.translate.codeberg.org> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: hugoalh <hugoalh@users.noreply.translate.codeberg.org> Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org> Co-authored-by: Eryk Michalak <gnu.ewm@protonmail.com> Co-authored-by: Caesar Schinas <caesar@caesarschinas.com> Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5070 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org> Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>	2024-08-29 04:54:39 +00:00
0ko	3c00c60b84	i18n(en): remove 15 unused strings	2024-08-27 10:31:35 +05:00
Gusted	1a68d14cf8	[FIX] Don't allow SSH authentication without ssh executable ... - Follow up of #4819 - When no `ssh` executable is present, disable the UI and backend bits that allow the creation of push mirrors that use SSH authentication. As this feature requires the usage of the `ssh` binary. - Integration test added.	2024-08-26 08:58:35 +02:00
Gusted	5c2445d643	[SKIP CI] Don't duplicate key ... - Follow up #4819. - It introduces a duplicate key, which is wrong. Move to a unique translation key to avoid conflicts.	2024-08-25 18:07:22 +02:00
Gusted	5dbacb70f4	Merge pull request 'Allow pushmirror to use publickey authentication' (#4819) from ironmagma/forgejo:publickey-auth-push-mirror into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4819 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-08-24 16:53:56 +00:00
Otto Richter	00276dfc30	feat(i18n): Branch protection improvements ... - adds a header to indicate creating a new rule - test that header is different between new and edit form - consistently avoids colons in the form - excludes some accessibility checks that require a global solution for forms	2024-08-22 22:05:12 +02:00
Philip Peterson	03508b33a8	[FEAT] Allow pushmirror to use publickey authentication ... - Continuation of https://github.com/go-gitea/gitea/pull/18835 (by @Gusted, so it's fine to change copyright holder to Forgejo). - Add the option to use SSH for push mirrors, this would allow for the deploy keys feature to be used and not require tokens to be used which cannot be limited to a specific repository. The private key is stored encrypted (via the `keying` module) on the database and NEVER given to the user, to avoid accidental exposure and misuse. - CAVEAT: This does require the `ssh` binary to be present, which may not be available in containerized environments, this could be solved by adding a SSH client into forgejo itself and use the forgejo binary as SSH command, but should be done in another PR. - CAVEAT: Mirroring of LFS content is not supported, this would require the previous stated problem to be solved due to LFS authentication (an attempt was made at forgejo/forgejo#2544). - Integration test added. - Resolves #4416	2024-08-22 17:05:07 +02:00
Codeberg Translate	d30be160c9	i18n: update of translations from Codeberg Translate (#4984) ... Translations update from [Codeberg Translate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/). Current translation status:  <!--start release-notes-assistant--> ## Draft release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Localization - [PR](https://codeberg.org/forgejo/forgejo/pulls/4984): <!--number 4984 --><!--line 0 --><!--description aTE4bjogdXBkYXRlIG9mIHRyYW5zbGF0aW9ucyBmcm9tIENvZGViZXJnIFRyYW5zbGF0ZQ==-->i18n: update of translations from Codeberg Translate<!--description--> <!--end release-notes-assistant--> Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org> Co-authored-by: qui <qui@users.noreply.translate.codeberg.org> Co-authored-by: hahahahacker2009 <hahahahacker2009@users.noreply.translate.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org> Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-authored-by: fnetX <otto@codeberg.org> Co-authored-by: Panagiotis \"Ivory\" Vasilopoulos <git@n0toose.net> Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4984 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org> Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>	2024-08-22 06:23:28 +00:00
Gusted	a054201e20	Merge pull request 'Fix naming consistency and remove unused strings in teams' (#5052) from 0ko/forgejo:i18n-admin into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5052 Reviewed-by: Otto <otto@codeberg.org>	2024-08-21 14:57:11 +00:00
0ko	b65a1312b3	i18n(en): remove unused strings related to team permissions ... Added in 72aa5a20ec. Dropped in cb41f5cae1.	2024-08-21 18:41:07 +05:00
0ko	a1c87db46f	i18n(en): fix administrator access naming consistency	2024-08-21 18:39:51 +05:00
Otto Richter	83d2b3b7fa	Implement CSS-only input toggling, refactor related forms ... UX/Translation changes: - new teams: remove redundant tooltips that don't add meaningful information - move general information to table fieldset - new teams: rename "general" to "custom" access for clarity - new teams: show labels beside options on mobile Accessibility: - semantic form elements allow easier navigation (fieldset, mostly) - improve better labelling of new teams table - fix accessibility scan issues - TODO: the parts that "disable" form elements were not yet touched and are not really accessible to screenreaders Technical: - replace two JavaScript solutions with one CSS standard - implement a simpler grid (.simple-grid) - simplify markup - remove some webhook settings specific CSS Testing: - check more form content for accessibility issues - but exclude tooltips from the scan :( - reuse existing form tests from previous PR	2024-08-21 15:03:19 +02:00
Otto Richter	2e9f4cece4	i18n: Improve clarity of confirmation email messages ... Fixes https://codeberg.org/forgejo/forgejo/issues/4399	2024-08-16 16:11:18 +02:00
Codeberg Translate	17fa75074d	i18n: update of translations from Codeberg Translate (#4889) ... Translations update from [Codeberg Translate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/). Current translation status:  Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org> Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org> Co-authored-by: Panagiotis \"Ivory\" Vasilopoulos <git@n0toose.net> Co-authored-by: dragon <dragon@users.noreply.translate.codeberg.org> Co-authored-by: hoovad <hoovad@users.noreply.translate.codeberg.org> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org> Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org> Co-authored-by: hugoalh <hugoalh@users.noreply.translate.codeberg.org> Co-authored-by: zub <zub@users.noreply.translate.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4889 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org> Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>	2024-08-16 07:19:03 +00:00
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
Panagiotis "Ivory" Vasilopoulos	57a2b99b3c	feat(i18n): make the test string more fun :D	2024-08-09 21:51:07 +02:00
Codeberg Translate	abc3364a7b	i18n: update of translations from Weblate (#4783) ... Translations update from [Weblate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/). Current translation status:  <!--start release-notes-assistant--> ## Draft release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Localization - [PR](https://codeberg.org/forgejo/forgejo/pulls/4783): <!--number 4783 --><!--line 0 --><!--description aTE4bjogdXBkYXRlIG9mIHRyYW5zbGF0aW9ucyBmcm9tIFdlYmxhdGU=-->i18n: update of translations from Weblate<!--description--> <!--end release-notes-assistant--> Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: natalie_drowned02 <k_letovskiy02@protonmail.com> Co-authored-by: leana8959 <leana8959@users.noreply.translate.codeberg.org> Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com> Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org> Co-authored-by: hugoalh <hugoalh@users.noreply.translate.codeberg.org> Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org> Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org> Co-authored-by: pswsm <pswsm@users.noreply.translate.codeberg.org> Co-authored-by: dragon <dragon@users.noreply.translate.codeberg.org> Co-authored-by: Zughy <Zughy@users.noreply.translate.codeberg.org> Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org> Co-authored-by: Marco Ciampa <ciampix@users.noreply.translate.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4783 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org> Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>	2024-08-08 07:16:13 +00:00
0ko	bad3b32037	feat(i18n): allow different translations of creation links and titles (#4829) ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4829 Reviewed-by: Gusted <gusted@noreply.codeberg.org>	2024-08-07 16:54:05 +00:00
Gusted	7faea490fc	Merge pull request '[UI] Do not include trailing EOL character when counting lines' (#4835) from gusted/forgejo-num-lines into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4835 Reviewed-by: Caesar Schinas <caesar@caesarschinas.com> Reviewed-by: Otto <otto@codeberg.org>	2024-08-06 12:23:24 +00:00
Earl Warren	517637137c	Merge pull request '[gitea] week 2024-32 cherry pick (gitea/main -> forgejo)' (#4801) from earl-warren/wcp/2024-32 into forgejo ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4801 Reviewed-by: Gusted <gusted@noreply.codeberg.org>	2024-08-06 05:47:20 +00:00
Gusted	5cf976739c	[UI] Do not include trailing EOL character when counting lines ... - Adjust the counting of the number of lines of a file to match the amount of rendered lines. This simply means that a file with the content of `a\n` will be shown as having `1 line` rather than `2 lines`. This matches with the amount of lines that are being rendered (the last empty line is never rendered) and matches more with the expecation of the user (a trailing EOL is a technical detail). - In the case there's no EOL, the reason why it was counting 'incorrectly' was to show if there was a trailing EOL or not, but now text is shown to tell the user this. - Integration test added. - Resolves Codeberg/Community#1612	2024-08-06 04:36:57 +02:00
0ko	7c74def6ff	i18n(en): remove unused strings (#4805) ... Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4805 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>	2024-08-05 05:54:29 +00:00
Jason Song	0c40cff9a4	Clear up old Actions logs (#31735) ... Part of #24256. Clear up old action logs to free up storage space. Users will see a message indicating that the log has been cleared if they view old tasks. <img width="1361" alt="image" src="https://github.com/user-attachments/assets/9f0f3a3a-bc5a-402f-90ca-49282d196c22"> Docs: https://gitea.com/gitea/docs/pulls/40 --------- Co-authored-by: silverwind <me@silverwind.io> (cherry picked from commit 687c1182482ad9443a5911c068b317a91c91d586) Conflicts: custom/conf/app.example.ini routers/web/repo/actions/view.go trivial context conflict	2024-08-04 18:24:10 +02:00
Jason Song	51f414d466	Improve names of cron jobs for Actions (#31736) ... Before: <img width="1641" alt="image" src="https://github.com/user-attachments/assets/60fa3f3e-cf19-4903-b080-616aef28057b"> After: <img width="1674" alt="image" src="https://github.com/user-attachments/assets/b04fd01e-838d-45c3-9655-cb39a2f7d1f2"> (cherry picked from commit 9ac57c957f9dc88b1394008d6efb79f29a4c3396) Conflicts: options/locale/locale_en-US.ini trivial context conflict	2024-08-04 18:23:54 +02:00
yp05327	c784a58740	Fix the display of project type for deleted projects (#31732) ... Fix: #31727 After:  (cherry picked from commit 75d0b61546e00390afdd850149de525dd64336a5) Conflicts: options/locale/locale_en-US.ini trivial conflict & fix excessive uppercase to unify with the other translations	2024-08-04 10:14:34 +02:00