summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request '[v7.0/forgejo] disallow javascript: URI in the ↵v7.0.7Earl Warren2024-08-092-1/+5
|\ | | | | | | | | | | | | repository description' (#4900) from bp-v7.0/forgejo-bb448f3 into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4900 Reviewed-by: 0ko <0ko@noreply.codeberg.org>
| * disallow javascript: URI in the repository descriptionGusted2024-08-092-1/+5
|/ | | | | | | | | | | | | | | | | - Fixes an XSS that was introduced in https://codeberg.org/forgejo/forgejo/pulls/1433 - This XSS allows for `href`s in anchor elements to be set to a `javascript:` uri in the repository description, which would upon clicking (and not upon loading) the anchor element execute the specified javascript in that uri. - [`AllowStandardURLs`](https://pkg.go.dev/github.com/microcosm-cc/bluemonday#Policy.AllowStandardURLs) is now called for the repository description policy, which ensures that URIs in anchor elements are `mailto:`, `http://` or `https://` and thereby disallowing the `javascript:` URI. It also now allows non-relative links and sets `rel="nofollow"` on anchor elements. - Unit test added. (cherry picked from commit bb448f3dc2c4909d47b92b478d94c29546aa7f12)
* Merge pull request 'i18n: backport of #4568 #4668 and #4783 to v7' (#4882) ↵Earl Warren2024-08-0815-692/+1945
|\ | | | | | | | | | | | | from 0ko/forgejo:i18n-backport-20240808-v7 into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4882 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
| * [v7.0/forgejo] i18n: update of translations from WeblateCodeberg Translate2024-08-0813-349/+1146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of https://codeberg.org/forgejo/forgejo/pulls/4783. 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> (cherry picked from commit abc3364a7b44d35495813c72d49f524828226e65) (cherry picked from commit 32cf1077741c47c7e49a41400024a5100883f3e6)
| * [v7.0/forgejo] i18n: Translations update from WeblateCodeberg Translate2024-08-089-227/+523
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of https://codeberg.org/forgejo/forgejo/pulls/4668. Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org> Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org> Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com> Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org> Co-authored-by: mahlzahn <mahlzahn@posteo.de> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: lotigara <lotigara@users.noreply.translate.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: Anonymous <anonymous@users.noreply.translate.codeberg.org> Co-authored-by: caesar <caesar@users.noreply.translate.codeberg.org> Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org> Co-authored-by: Caesar Schinas <caesar@caesarschinas.com> Co-authored-by: leana8959 <leana8959@users.noreply.translate.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4668 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> (cherry picked from commit 3d3ddd7704714be330d7039115a2d699a7525289) (cherry picked from commit a7e414b0f17e643a5acb37841edd54d4c1a8d3b1)
| * [v7.0/forgejo] i18n: Translations update from WeblateCodeberg Translate2024-08-087-127/+287
|/ | | | | | | | | | | | | | | | | | | | Backport of https://codeberg.org/forgejo/forgejo/pulls/4568. Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org> Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: mahlzahn <mahlzahn@posteo.de> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-authored-by: leana8959 <leana8959@users.noreply.translate.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org> Co-authored-by: meskobalazs <meskobalazs@users.noreply.translate.codeberg.org> Co-authored-by: Bálint Gonda <balinteus@gmail.com> Co-authored-by: Beowulf <Beowulf@users.noreply.translate.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4568 Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org> Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org> (cherry picked from commit 7699d85f3be2e0be61a4a9b3cfaf1256df577839) (cherry picked from commit 6108a979e5519d3950072e07a2a31916fc997944)
* Merge pull request '[v7.0/forgejo] [BUG] Render references to cross-repo ↵Earl Warren2024-08-072-1/+17
|\ | | | | | | | | | | | | issues with external issues' (#4863) from bp-v7.0/forgejo-05e163a into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4863 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
| * [BUG] Render references to cross-repo issues with external issuesGusted2024-08-072-1/+17
|/ | | | | | | | | - If you have the external issue setting enabled, any reference would have been rendered as an external issue, however this shouldn't be happening to references that refer to issues in other repositories. - Unit test added. (cherry picked from commit 05e163aaf39307f1fa4e91c687633eb05d2a8f31)
* Merge pull request '[v7.0/forgejo] [CHORE] Remove SSH DSA tests' (#4833) ↵Earl Warren2024-08-051-3/+0
|\ | | | | | | | | | | | | from bp-v7.0/forgejo-eb8c125 into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4833 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
| * [CHORE] Remove SSH DSA testsGusted2024-08-051-3/+0
|/ | | | | | | - Partially resolves #4659 - Fixes CI. (cherry picked from commit eb8c1257889ecc1bc78aa0808ac965fe860979cd)
* [v7.0/forgejo] fix(ui): handle out-of-bounds end line in code selection (#4820)forgejo-backport-action2024-08-052-1/+55
| | | | | | | | | | | | | Backport of https://codeberg.org/forgejo/forgejo/pulls/4788. - fallback to the last line, preventing TypeError - add E2E test Co-authored-by: Solomon Victorino <git@solomonvictorino.com> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4820 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>
* Merge pull request '[gitea] week 2024-32-v7.0 cherry pick (release/v1.22 -> ↵Earl Warren2024-08-041-1/+1
|\ | | | | | | | | | | | | v7.0/forgejo)' (#4804) from earl-warren/wcp/2024-32-v7.0 into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4804 Reviewed-by: thefox <thefox@noreply.codeberg.org>
| * chore(lint): make testifylint happyEarl Warren2024-08-041-1/+1
|/
* enable linter testifylint on v7 (#4572)TheFox0x72024-07-30494-4554/+4897
| | | | | | Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4572 Co-authored-by: TheFox0x7 <thefox0x7@gmail.com> Co-committed-by: TheFox0x7 <thefox0x7@gmail.com>
* Merge pull request '[v7.0/forgejo] [UI] Show AGit label on merged PR' ↵v7.0.6Earl Warren2024-07-292-0/+21
|\ | | | | | | | | | | | | (#4731) from bp-v7.0/forgejo-358ec80 into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4731 Reviewed-by: Gusted <gusted@noreply.codeberg.org>
| * [UI] Show AGit label on merged PRGusted2024-07-292-0/+21
|/ | | | | | | - The label wasn't show on merged PRs. - Integration test added (cherry picked from commit 358ec8002e0c88fefb737af2f1b7c2a32d00afd1)
* Merge pull request '[gitea] week 2024-31-v7.0 cherry pick (release/v1.22 -> ↵Earl Warren2024-07-282-0/+4
|\ | | | | | | | | | | | | | | v7.0/forgejo)' (#4717) from earl-warren/wcp/2024-31-v7.0 into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4717 Reviewed-by: thefox <thefox@noreply.codeberg.org> Reviewed-by: 0ko <0ko@noreply.codeberg.org>
| * Enable direnv (#31672) (#31679)Giteabot2024-07-282-0/+4
|/ | | | | | | | | | Backport #31672 by @techknowlogick This lets developers who have direnv enabled to load our nix flake automatically when entering it Co-authored-by: techknowlogick <techknowlogick@gitea.com> (cherry picked from commit 17b04644edb4fd1ba6ef4698868f321fc11c4f4d)
* Merge pull request '[v7.0/forgejo] fix(api): issue state change is not ↵Earl Warren2024-07-254-12/+44
|\ | | | | | | | | | | | | idempotent' (#4688) from bp-v7.0/forgejo-e9e3b8c into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4688 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
| * fix(api): issue state change is not idempotentEarl Warren2024-07-254-12/+44
|/ | | | | | | | | | | | | | The PATCH if issue & pull request switched to use the service functions instead. However, the service function changing the state is not idempotent. Instead of doing nothing which changing from open to open or close to close, it will fail with an error like: Issue [2472] 0 was already closed Regression of: 6a4bc0289db5d5d791864f45ed9bb47b6bc8d2fe Fixes: https://codeberg.org/forgejo/forgejo/issues/4686 (cherry picked from commit e9e3b8c0f389e7a3674152e18a124b1967873935)
* Merge pull request '[v7.0/forgejo] [CHORE] Don't bundle `elkjs`' (#4679) ↵Earl Warren2024-07-251-0/+8
|\ | | | | | | | | | | | | from bp-v7.0/forgejo-510cbe2 into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4679 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
| * [CHORE] Don't bundle `elkjs`Gusted2024-07-251-0/+8
|/ | | | | | | | | | | | | | | | | | | - `elkjs` is a library that's imported by `mermaid`, although they have seperated this package to it's own mermaid package (https://github.com/mermaid-js/mermaid/pull/5654), the stable version doesn't have this patch. - `elkjs` is licensed under the EPL-2.0 license (copyleft), which isn't compatible with GPL unless the license author explcitly allow this via a so called "secondary license". At the end of the day it cannot be released under a MIT or GPL license. - Use webpack's `externals` option to avoid bundling `elkjs` and instead leave it as a `require` code. - This is a 'dirty' way to ensure elkjs isn't bundled and has to be tested manually to ensure this for every release (via the `webpack-bundle-analyzer` plugin). If someone tries to use the elkjs render, it will result in a non-descriptive error being shown. (cherry picked from commit 510cbe2c92d1b7d6ace6ea0ca3ea44fd4a3904a1)
* Merge pull request '[v7.0/forgejo] Replace Gitea with Forgejo' (#4674) from ↵Earl Warren2024-07-251-1/+1
|\ | | | | | | | | | | | | bp-v7.0/forgejo-9ad23f9 into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4674 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
| * Replace Gitea with Forgejoyonas2024-07-241-1/+1
| | | | | | | | (cherry picked from commit 9ad23f9ede0f183855c7c5d2d18ac0ee8ac0984a)
* | Merge pull request '[v7.0/forgejo] [UI] Fix scoped-access-token' (#4671) ↵Earl Warren2024-07-252-12/+13
|\ \ | |/ |/| | | | | | | | | from bp-v7.0/forgejo-aa5163d into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4671 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
| * [UI] Fix scoped-access-tokenGusted2024-07-242-12/+13
|/ | | | | | | | - Regression of #4571 - Refactor to not use the component API of Vue. The root cause is still unknown. (cherry picked from commit aa5163d5c4e72cb1e8a1632745c06a006d77537f)
* Merge pull request '[v7.0/forgejo] Reserve the `devtest` username' (#4647) ↵Gusted2024-07-232-0/+2
|\ | | | | | | | | | | | | from bp-v7.0/forgejo-859cc23-90c0e9d-93d0836 into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4647 Reviewed-by: Gusted <gusted@noreply.codeberg.org>
| * Add missing trailing commaIkuyo2024-07-231-1/+1
| | | | | | | | (cherry picked from commit 859cc23dc2b79e6ddbdbceb39e47c81fbbc46ad4)
| * Add devtest in reserved usernames testIkuyo2024-07-231-0/+1
| | | | | | | | (cherry picked from commit 90c0e9dace0dcf837a5cf07a19ef782ba5b2e5c0)
| * Reserve devtest usernameIkuyo2024-07-231-0/+1
|/ | | | (cherry picked from commit 93d083624125cdcb51769cefe781756b5ed4b760)
* Merge pull request '[v7.0/forgejo] Fix label selector popup width (issue ↵Earl Warren2024-07-234-27/+23
|\ | | | | | | | | | | | | creation)' (#4636) from gusted/forgejo-bp-labels into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4636 Reviewed-by: 0ko <0ko@noreply.codeberg.org>
| * [v7.0/forgejo] Fix label selector popup width (issue creation)Beowulf2024-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | **Backport:** https://codeberg.org/forgejo/forgejo/pulls/4551 This aligns the popup width of the label selector during issue creation to the width of the label selector in an already created issue. (The inherited width from "ui form" is reset to prevent width: 100% on the input element in the search box.) This is a follow-up to https://codeberg.org/forgejo/forgejo/pulls/4546 (cherry picked from commit b32a03531c1b78b2f7a3eb60c145fc2a2889ee76)
| * [v7.0/forgejo] ui: fix issue labels0ko2024-07-234-26/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes https://codeberg.org/forgejo/forgejo/issues/4522 * Fixes https://codeberg.org/forgejo/forgejo/issues/4522#issuecomment-2095542 * Fixes https://codeberg.org/forgejo/forgejo/issues/4544 * Fixes regression of https://codeberg.org/forgejo/forgejo/pulls/4486 * Fixes regression of some cherry-pick * Fixes an overflow that wasn't even reported * Revert changes done in https://codeberg.org/forgejo/forgejo/pulls/4486. * Apply changes proposed in https://codeberg.org/forgejo/forgejo/issues/3875#issuecomment-1840611. * Introduce new label `ugc-labels` to mark ui labels that are named by users and therefore need special care. Currently the generic label classes are used for too many things to work with them directly without affecting other UI.
* | Merge pull request '[v7.0/forgejo] [I18N] Add `common` section to new ↵Earl Warren2024-07-232-0/+2
|\ \ | | | | | | | | | | | | | | | | | | translation files' (#4639) from bp-v7.0/forgejo-a67e420 into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4639 Reviewed-by: 0ko <0ko@noreply.codeberg.org>
| * | [I18N] Add `common` section to new translation filesGusted2024-07-232-0/+2
|/ / | | | | | | | | | | | | | | - Follow up for #4576 - Weblate currently cannot parse ini files if they contain keys that don't belong to a section. (cherry picked from commit a67e420c38027fbf497abac0079a52730a5e5dd0)
* / [v7.0/forgejo] i18n: restore Malayalam and Serbian files, remove ml-IN from ↵forgejo-backport-action2024-07-233-1/+1535
|/ | | | | | | | | | | | | | | | | | | | | | | | | the language selector (#4626) Backport of https://codeberg.org/forgejo/forgejo/pulls/4576 * Closes #4563 * A followup to my 2024-February investigation in the Localization room * Restore Malayalam and Serbian locales that were deleted in 067b0c2664 and f91092453e. Bulgarian was also deleted, but we already have better Bulgarian translation. * Remove ml-IN from the language selector. It was not usable for 1.5 years, has ~18% completion and was not maintained in those ~1.5 years. It could also have placeholder bugs due to refactors. Restoring files gives the translators a base to work with and makes the project advertised on Weblate homepage for logged in users in the Suggestions tab. Unlike Gitea, we store our current translations directly in the repo and not on a separate platform, so it makes sense to add these files back. Removing selector entry avoids bugs and user confusion. I will make a followup for the documentation. Reviewed-on: #4576 Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org> (cherry picked from commit e819c1622e) Co-authored-by: 0ko <0ko@noreply.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4626 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>
* Merge pull request '[v7.0/forgejo] Fix panic on too high page number' ↵Gusted2024-07-222-0/+24
|\ | | | | | | | | | | | | (#4623) from gusted/forgejo-commit-panic-bp-bp into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4623 Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org>
| * [BUG] Fix panic on too high page numberGusted2024-07-222-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes a panic where the file history router would panic if the page number was set to a page where no commits would be returned. It now returns a 404 in such case. - Regresion of a5b1c1b0b32a3746690fc10c9a4594a5b5b5c54f - Panic log provided by @algernon. - Minimal integration test added. (cherry picked from commit 6a49e3f468455476a99c520deae7cb0526da00d1) Co-authored-by: Gergely Nagy <forgejo@gergo.csillger.hu>
* | Merge pull request '[v7.0/forgejo] Don't panic on empty blockquote' (#4624) ↵Gusted2024-07-223-0/+22
|\ \ | | | | | | | | | | | | | | | | | | from gusted/forgejo-commit-panic-bp-bp-bp into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4624 Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org>
| * | [v7.0/forgejo] Don't panic on empty blockquoteGusted2024-07-223-0/+22
| |/ | | | | | | | | | | | | | | | | | | - On a empty blockquote the callout feature would panic, as it expects to always have at least one child. - This panic cannot result in a DoS, because any panic that happens while rendering any markdown input will be recovered gracefully. - Adds a simple condition to avoid this panic. (cherry picked from commit efd63ec1d8c6df180f2d894fa82c53da9d1874f1)
* | Merge pull request '[v7.0/forgejo] fix(actions): no edited event triggered ↵Earl Warren2024-07-221-1/+11
|\ \ | |/ |/| | | | | | | | | when a title is changed' (#4620) from bp-v7.0/forgejo-f6000c3 into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4620 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
| * fix(actions): no edited event triggered when a title is changedTwenty Panda2024-07-221-1/+11
|/ | | | | | | | | | | | When the title of an issue or a pull request is changed, the edited event must be triggered, in the same way it is when the body of the description is changed. The web endpoints and the API endpoints for both pull requests and issues rely on issue_service.ChangeTitle which calls notify_service.IssueChangeTitle. (cherry picked from commit f6000c376070f3ae55b3ae4794488f9fbe37c72a)
* Merge pull request '[v7.0/forgejo] Remove APA as cite format' (#4600) from ↵Gusted2024-07-205-63/+8
|\ | | | | | | | | | | | | beowulf/v7.0/forgejo into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4600 Reviewed-by: Gusted <gusted@noreply.codeberg.org>
| * Remove APA as cite formatBeowulf2024-07-205-63/+8
| | | | | | | | | | | | | | This removes APA as cite format, because it depends on an copyleft dependency (https://github.com/Juris-M/citeproc-js). (cherry picked from commit 7dc0b2bab64bb237d4546e530de16972af32f273)
* | Merge pull request '[v7.0/forgejo] Update of translations from Weblate' ↵0ko2024-07-2011-101/+276
|\ \ | |/ |/| | | | | | | | | (#4594) from 0ko/forgejo:i18n-backport-20240720 into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4594 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
| * [v7.0/forgejo] i18n: update of translations from WeblateCodeberg Translate2024-07-2011-101/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org> Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org> Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org> Co-authored-by: manolosd <manolosd@users.noreply.translate.codeberg.org> Co-authored-by: Nifou <Nifou@users.noreply.translate.codeberg.org> Co-authored-by: kdh8219 <kdh8219@monamo.dev> Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com> Co-authored-by: Anonymous <anonymous@users.noreply.translate.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: ch0ccyra1n <ch0ccyra1n@users.noreply.translate.codeberg.org> Co-authored-by: mahlzahn <mahlzahn@users.noreply.translate.codeberg.org> Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-authored-by: Xinayder <Xinayder@users.noreply.translate.codeberg.org> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4451 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> (cherry picked from commit a9d32b588ac2d05a1a25b868be6ab68e5760038e) (cherry picked from commit c21ca66867684163ffb4bece318d43934a8123f4)
* | Merge pull request '[v7.0/forgejo] [UI] Replace `vue-bar-graph` with ↵Gusted2024-07-207-92/+121
|\ \ | |/ |/| | | | | | | | | `chart.js`' (#4593) from gusted/forgejo-bp-2-license into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4593 Reviewed-by: Beowulf <beowulf@noreply.codeberg.org>
| * [UI] Replace `vue-bar-graph` with `chart.js`Gusted2024-07-207-92/+121
|/ | | | | | | | | | | | | | | | - Backport of #4571 - The usage of the `vue-bar-graph` is complicated, because of the `GSAP` dependency they pull in, the dependency uses a non-free license. - The code is rewritten to use the `chart.js` library, which is already used to draw other charts in the activity tab. Due to the limitation of `chart.js`, we have to create a plugin in order to have images as labels and do click handling for those images. - The chart isn't the same as the previous one, once again simply due to how `chart.js` works, the amount of commits isn't drawn anymore in the bar, you instead have to hover over it or look at the y-axis. - Resolves #4569 (cherry picked from commit a83002679df5c1d72b41f2ca015c5cb3e0c6d10d)
* Merge pull request '[v7] i18n(*): freeze translations of register_notify' ↵0ko2024-07-1934-34/+34
|\ | | | | | | | | | | | | (#4566) from 0ko/forgejo:i18n-backport-20240718-freeze into v7.0/forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4566 Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org>
| * [v7] i18n(*): freeze translations of register_notify0ko2024-07-1834-34/+34
|/ | | | | | | | | This string has been in v9 (c773ca37ad31d4d728f360426924d859f1588387) and now includes a template for app name instead of hardcoded software name. v7 and v8 do not expect this string to have any templates. Prevent breaking translations by backports by freezing translations of this string for v7 and v8. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4562 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> (cherry picked from commit f07d1aed2ec8de39f22c37d665889ba929659342)