Commit graph

14268 commits

Author SHA1 Message Date
Loïc Dachary 5b997b1c73
Revert "Hide 2FA status from other members in organization members list (#22999) (#23023)"
This reverts commit 660a83bd2e.

Refs: https://codeberg.org/forgejo/forgejo/issues/421
2023-02-23 09:38:47 +01:00
John Olheiser 96b3282321
Changelog 1.18.5 (#23045)
Signed-off-by: jolheiser <john.olheiser@gmail.com>
(cherry picked from commit 48eb5ac685)
2023-02-23 09:37:06 +01:00
Yarden Shoham 03864f78c5
Return empty url for submodule tree entries (#23043) (#23048)
Backport #23043

Close #22614.

Refer to [Github's
API](https://docs.github.com/en/rest/git/trees?apiVersion=2022-11-28#get-a-tree),
if a tree entry is a submodule, its url will be an empty string.

Co-authored-by: Zettat123 <zettat123@gmail.com>
Co-authored-by: delvh <leon@kske.dev>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
(cherry picked from commit 8f5b2f1ddf)
2023-02-23 09:37:06 +01:00
John Olheiser 9ae12687e6
Display attachments of review comment when comment content is blank (#23035) (#23046)
Backport #23035

Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com>
(cherry picked from commit bbfd34575a)
2023-02-23 09:37:06 +01:00
Kyle D ad317ec0cf
Use beforeCommit instead of baseCommit (#22949) (#22996)
Backport #22949
Fixes https://github.com/go-gitea/gitea/issues/22946
Probably related to https://github.com/go-gitea/gitea/issues/19530

Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
(cherry picked from commit 760cf419ba)
2023-02-23 09:37:06 +01:00
Yarden Shoham 2c3a5a89ae
Render access log template as text instead of HTML (#23013) (#23025)
Backport #23013

Fix https://github.com/go-gitea/gitea/pull/22906#discussion_r1112106675

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit 8fa62be905)
2023-02-23 09:37:06 +01:00
wxiaoguang b9d5451b8f
Fix the Manually Merged form (#23015) (#23017)
Backport #23015

---------

Co-authored-by: Jason Song <i@wolfogre.com>
(cherry picked from commit 7b3ffe5745)
2023-02-23 09:37:06 +01:00
wxiaoguang 0f0f775737
Use --message=%s for git commit message (#23028) (#23029)
Backport #23028

This backport is done by manually because the git module is different.

(cherry picked from commit c50d4202ef)
2023-02-23 09:37:05 +01:00
Yarden Shoham c19a5e6bc0
Hide 2FA status from other members in organization members list (#22999) (#23023)
Backport #22999

This is rather private information that should not be given to all
members in the same organization. Only show it to organization owners.

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
(cherry picked from commit 660a83bd2e)
2023-02-23 09:37:05 +01:00
Loïc Dachary 68f009f329
Merge remote-tracking branch 'forgejo/v1.18/forgejo-development' into v1.18/forgejo 2023-02-23 09:22:59 +01:00
Loïc Dachary 1a5a50c479 Merge pull request '[SECURITY] default to pbkdf2 with 320,000 iterations' (#407) from dachary/forgejo:wip-v1.18-default-hash into v1.18/forgejo-development
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/407
2023-02-22 13:01:15 +00:00
Loïc Dachary 0995034558
[SECURITY] default to pbkdf2 with 320,000 iterations
Conflicts:
	modules/auth/password/hash/setting.go
	modules/auth/password/hash/setting_test.go
2023-02-21 01:35:14 +01:00
Loïc Dachary c70177613e
[CI] set PASSWORD_HASH_ALGO = argon2 for integration tests 2023-02-21 01:35:14 +01:00
Loïc Dachary 17d62fadfe
Revert "some refactor about code comments(#20821) (#22707)"
This reverts commit 1d191f9b5a.

Refs: https://codeberg.org/forgejo/forgejo/issues/395
2023-02-20 19:59:45 +01:00
Loïc Dachary cb7ea004ee
Revert "Improve trace logging for pulls and processes (#22633) (#22812)"
This reverts commit e4238583db.

Refs: https://codeberg.org/forgejo/forgejo/issues/395
2023-02-20 19:58:59 +01:00
Loïc Dachary cd299fc44d
Merge remote-tracking branch 'forgejo/v1.18/forgejo-a11y' into v1.18/forgejo 2023-02-20 19:57:07 +01:00
Loïc Dachary 758cf647cf
Merge remote-tracking branch 'forgejo/v1.18/forgejo-branding' into v1.18/forgejo 2023-02-20 19:56:09 +01:00
Loïc Dachary b63a871ca8
Merge remote-tracking branch 'forgejo/v1.18/forgejo-i18n' into v1.18/forgejo 2023-02-20 19:56:02 +01:00
fnetx 8e80efc771
[I18N] Move source locales to other folder
(cherry picked from commit 90bb00ef5b)
2023-02-20 17:04:00 +01:00
fnetx 9be232ae3a
[I18N] Makefile + gitignore
(cherry picked from commit 75da77f3d7)
2023-02-20 17:03:59 +01:00
fnetx ce880f20b6
[I18N] Add Locale merger script
(cherry picked from commit 84469b3c5c)
2023-02-20 17:03:59 +01:00
fnetx be72ef33e2
[I18N] Rename upstream files
(cherry picked from commit eea077bf7e)
2023-02-20 17:03:59 +01:00
crystal f1f7c119f3
[BRANDING] Change Swagger title to Forgejo API
(cherry picked from commit 79f6a70b53)
2023-02-20 17:00:31 +01:00
Gusted 7eb46fbc6b
[BRANDING] Update nodeinfo branding
- Change the values for the nodeinfo API, to use branded values.
- Resolves https://codeberg.org/forgejo/forgejo/issues/257

(cherry picked from commit fa5130a663)
2023-02-20 16:59:16 +01:00
Earl Warren 0f12ca9222
[BRANDING] define the forgejo webhook type
templates/swagger/v1_json.tmpl updated with `make generate-swagger`

(cherry picked from commit 0f9842fc58)
2023-02-20 16:59:16 +01:00
Earl Warren fd245037ea
[BRANDING] add X-Forgejo-* headers
(cherry picked from commit de86c5e6ef)
2023-02-20 16:59:16 +01:00
Earl Warren b032259089
[BRANDING] parse FORGEJO__* in the container environment
Add the FORGEJO__ prefix as equivalent to GITEA__ when interpreted by
environment-to-ini. It is used when running the Forgejo container like
so:

  docker run --name forgejo -e FORGEJO__security__INSTALL_LOCK=true \
             -d codeberg.org/forgejo/forgejo:1.18

Signed-off-by: Earl Warren <contact@earl-warren.org>
(cherry picked from commit b4665b0796)
2023-02-20 16:59:16 +01:00
Gusted 5c4cd14c4f
[BRANDING] Replace branding in Swagger
- "Gitea" is automatically being determined in Swagger and cannot be
overridden, therefor we override it after `swagger generate spec` is run.
- Resolves https://codeberg.org/forgejo/forgejo/issues/226

(cherry picked from commit ffc2db3d69)
2023-02-20 16:59:16 +01:00
TomZ 2b59a90146
[BRANDING] Rename usage of Gitea in user-visible places
As the docs of codeberg refer to the strings printed by the Forgejo
ssh servers, this is user-facing and is nice to update to the new
product name.

(cherry picked from commit 9c65f0d2ef)
2023-02-20 16:59:16 +01:00
Caesar Schinas 9578a1d83a
[BRANDING] Rebrand default meta tags
(cherry picked from commit fedeadb738)
2023-02-20 16:59:15 +01:00
Caesar Schinas 2716d78a43
[BRANDING] Add Forgejo light, dark, and auto themes
(cherry picked from commit 009bb07ad8)
2023-02-20 16:59:15 +01:00
Loïc Dachary 1d6499c888
[BRANDING] container images: set APP_NAME
(cherry picked from commit 7f4e98d3ab)
2023-02-20 16:59:15 +01:00
Caesar Schinas 97b9024336
[BRANDING] Custom loading animation for Forgejo
(cherry picked from commit 6372a5b1c1)
2023-02-20 16:59:15 +01:00
Caesar Schinas 5f47458a28
[BRANDING] Rebrand default config settings for new installs (#140)
Replaces `Gitea` with `Forgejo` in the default config settings for new installs.

This will not affect existing installs.

Co-authored-by: Caesar Schinas <caesar@caesarschinas.com>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/140
Co-authored-by: Caesar Schinas <caesar@noreply.codeberg.org>
Co-committed-by: Caesar Schinas <caesar@noreply.codeberg.org>
(cherry picked from commit bd7c076623)
2023-02-20 16:59:15 +01:00
Caesar Schinas 9bc830f1b4
[BRANDING] Add forgejo emoji
(cherry picked from commit 00603b03fe)
2023-02-20 16:59:15 +01:00
Caesar Schinas 2baac9684e
[BRANDING] Rebrand footer "powered by" links
(cherry picked from commit 02890c31f2)
2023-02-20 16:59:15 +01:00
Gusted 1224b202bf
[BRANDING] Rebrand systemd service (#137)
- We can rebrand this quite safely, as only new installations would likely look into this file and configure the correct folders(to use forgejo instead of gitea).

Co-authored-by: Gusted <postmaster@gusted.xyz>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/137
(cherry picked from commit 43e6d3cdf0)
2023-02-20 16:59:14 +01:00
Caesar Schinas ccf45e7e3f
[BRANDING] add Forgejo logo
(cherry picked from commit 04869eb95d)
2023-02-20 16:59:14 +01:00
Loïc Dachary a463dac5d1
Revert "Fixes accessibility of empty repository commit status (#22632)"
This reverts commit 638e6160e8.

Refs: https://codeberg.org/forgejo/forgejo/issues/361
2023-02-20 16:56:35 +01:00
wxiaoguang f320204ba2
Add ARIA support for Fomantic UI checkboxes (#22599)
Replace #22593

This is a general approach to add ARIA support for all Fomantic UI
checkboxes (including radioboxes)

* Pros:
* General approach, it works for all Fomantic UI checkboxes / radioboxes
    * No need to write IDs manually everywhere
    * No need to tell new contributors to write IDs again and again

* Cons:
* Slightly affects performance, but it's really trivial, because there
was already a heavy `$('.ui.checkbox').checkbox()` for Fomantic UI
before. So everything is still fine.

Screenshot (from the repo setting page, which has various checkboxes):

<details>

![image](https://user-images.githubusercontent.com/2114189/214480937-3a54d36f-55c3-49de-9c45-c4bb21f1f4c6.png)

</details>

(cherry picked from commit d4610480ee)
2023-02-20 16:54:01 +01:00
Felipe Leopoldo Sologuren Gutiérrez 0db7a0a3d1
Fixes accessibility behavior of Watching, Staring and Fork buttons (#22634)
Add tabindex to buttons of repository views.

(cherry picked from commit 6865635369)
2023-02-20 16:54:00 +01:00
Felipe Leopoldo Sologuren Gutiérrez fb45bf231e
Add main landmark to templates and adjust titles (#22670)
* Add main aria landmark to templates
 * Adjust some titles to improve understanding of location in navigation

Contributed by @Forgejo

(cherry picked from commit e6a557cae3)
2023-02-20 16:54:00 +01:00
Felipe Leopoldo Sologuren Gutiérrez 54eb9456be
Improve checkbox accessibility a bit by adding the title attribute (#22593)
EDIT: The main change of this PR was resolved by #22599. This
complements that PR for some cases without label and complicated layout
to be added.

NOTE: Contributed by @Forgejo.
(cherry picked from commit f016f0fa1e)
2023-02-20 16:54:00 +01:00
Felipe Leopoldo Sologuren Gutiérrez 820e26c22d
Improve accessibility of navigation bar and footer (#22635)
Added ARIA navigation landmark to navigation bar and aria label for both
nav bar and footer.

Contributed by @forgejo.

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit b0e3382834)
2023-02-20 16:54:00 +01:00
Felipe Leopoldo Sologuren Gutiérrez 42e27a4559
Fixes accessibility of empty repository commit status (#22632)
Avoid empty labelled anchor in repo without commits.

Contributed by @forgejo.

<!--

Please check the following:

1. Make sure you are targeting the `main` branch, pull requests on
release branches are only allowed for bug fixes.
2. Read contributing guidelines:
https://github.com/go-gitea/gitea/blob/main/CONTRIBUTING.md
3. Describe what your pull request does and which issue you're targeting
(if any)

-->

(cherry picked from commit 638e6160e8)
2023-02-20 16:54:00 +01:00
Gusted 70cf3e76b8
[PRIVACY] Add a DNS method to fetch new updates
- Use TXT records in order to determine the latest available version.
- This addresses a valid privacy issue, as with HTTP requests the server
can keep track(estimated) of how many instances are using Forgejo, with
DNS that's basically not possible as the server will never receive any
data, as the only ones receiving data are DNS resolvers.

(cherry picked from commit e68aaa0c16)
2023-02-20 16:38:08 +01:00
Gusted e4061e1010
[PRIVACY] Disable update_checker cron tasks
- This is being disabled as it will weekly connect to a domain.
- This only affects existing installations, as new installations will
have a explicit value being written into app.ini due to https://github.com/go-gitea/gitea/pull/21655

(cherry picked from commit 6c81fc8f9c)
2023-02-20 16:38:08 +01:00
Earl Warren 82edd2421c
[API] Forgejo API /api/forgejo/v1 2023-02-20 15:09:29 +01:00
Percy Ma af47016bad
[DOCS] LICENSE: add Forgejo Authors
(cherry picked from commit 7c98a4c54e)
2023-02-20 15:05:24 +01:00
Loïc Dachary 75bf53d14f
[DOCS] RELEASE-NOTES.md 2023-02-20 15:05:24 +01:00