Earl Warren
1b74f8a266
Merge pull request '[CI] FORGEJO_VERSION drop "g" prefix' ( #2694 ) from oliverpool/forgejo:drop_g_prefix_from_version into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2694
Reviewed-by: Otto <otto@codeberg.org>
2024-03-19 13:25: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
erik
9337274334
Revert to input
2024-03-19 13:56:12 +01:00
erik
abc7aa0972
Display data on text area
2024-03-19 13:53:00 +01:00
erik
048ff5da11
Fix typos
2024-03-19 13:52:14 +01:00
erik
4c1d12b2e4
Use textarea as we expect lots of input
2024-03-19 13:52:00 +01:00
erik
09cac163e0
Add a field for listing the federated repos
2024-03-19 13:17:27 +01:00
Gusted
37172e792a
Merge pull request 'Delete redundant snap packaging receipe' ( #2693 ) from popey/forgejo:forgejo into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2693
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-19 11:28:24 +00:00
erik
a6d45f8b97
Implement FederationEnabled function for templates
2024-03-19 11:56:25 +01:00
0ko
708f4bc3b6
Fix heatmap localization
...
Fixes #2552
2024-03-19 14:37:03 +05:00
oliverpool
f3180fa1d6
[CI] FORGEJO_VERSION drop "g" prefix
...
Added by git describe, but is confusing
2024-03-19 10:36:45 +01:00
Alan Pope
0095dff5e8
Merge branch 'forgejo' into forgejo
2024-03-19 09:29:19 +00:00
Mirco
26eb01b509
corr var label name
2024-03-19 10:25:20 +01:00
Alan Pope
f5e3a13f44
Delete redundant snap packaging receipe
...
I'm working on the snap packaging over at https://codeberg.org/forgejo-contrib/snap which makes this snapcraft.yaml outdated, redundant and potentially confusing for other developers.
Signed-off-by: Alan Pope <popey@noreply.codeberg.org>
2024-03-19 09:16:02 +00:00
Mirco
3018769d26
Federation settigs :: set label name for internationalisation
2024-03-19 10:05:31 +01:00
oliverpool
ce6db31efe
Merge pull request '[Port] Sync branches to DB immediately when handle git hook calling gitea#29493' ( #2684 ) from oliverpool/forgejo:sync_branch into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2684
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-19 08:37:30 +00:00
Earl Warren
e05396fcdd
Merge pull request 'Fixes for project selector in sidebar' ( #2608 ) from 0ko/forgejo:projectsfix into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2608
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-03-19 08:16:42 +00:00
Earl Warren
55f81e5a2e
Merge pull request '[port] Improve CSV rendering (gitea#29638)' ( #2687 ) from algernon/forgejo:gitea/port/29638 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2687
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-19 08:14:20 +00:00
Earl Warren
c16866d4a5
Merge pull request 'English fixes and improvements' ( #2631 ) from 0ko/forgejo:english20240311 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2631
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-19 08:09:27 +00:00
Michael Jerger
6901ae4b99
wip: found backend for settings update
2024-03-19 08:29:57 +01:00
Ada
41676a8634
Fix #2512 /api/forgejo/v1/version auth check ( #2582 )
...
Add the same auth check and middlewares as the /v1/ API.
It require to export some variable from /v1 API, i am not sure if is the correct way to do
Co-authored-by: oliverpool <git@olivier.pfad.fr>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2582
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Ada <ada@gnous.eu>
Co-committed-by: Ada <ada@gnous.eu>
2024-03-19 07:16:19 +00:00
Gusted
1e292e9005
Merge pull request '[BUG] Make write and preview tabs interactive' ( #2681 ) from gusted/forgejo-a11y-tabs into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2681
Reviewed-by: Otto <otto@codeberg.org>
2024-03-18 21:57:36 +00:00
Jason Song
375222a145
Sync branches first (gitea#29714)
...
Follow gitea#29493.
Sync branches to DB first, then trigger push events.
2024-03-18 17:39:34 +01:00
oliverpool
66a135f6f2
[BUG] Restore deleted branches
2024-03-18 17:39:14 +01:00
oliverpool
0a53eb838d
use gitRepo.GetCommit directly
...
and give it a commitID instead of a branchName (a bit more correct and faster)
2024-03-18 17:38:58 +01:00
Jason Song
286d09203f
Sync branches to DB immediately when handle git hook calling (gitea#29493)
...
Unlike other async processing in the queue, we should sync branches to
the DB immediately when handling git hook calling. If it fails, users
can see the error message in the output of the git command.
It can avoid potential inconsistency issues, and help #29494 .
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2024-03-18 17:38:01 +01:00
Gusted
7db592b9fd
Merge pull request 'Fix must-change-password help dialog' ( #2676 ) from famfo/forgejo:forgejo into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2676
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-03-18 16:22:00 +00:00
Gusted
847d969a8f
Merge pull request 'routers: Minor code cleanup in UsernameSubRoute' ( #2685 ) from algernon/forgejo:cleanup/UsernameSubRoute into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2685
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-18 16:19:01 +00:00
Gergely Nagy
f756c3c8d0
Do not override the background for .repository .data-table tr
...
A previous commit (via gitea#29638) changed the `.repository .data-table
.tr` CSS rule to forcibly override the background to `none`. This, in
turn, disabled the even-odd row coloring.
Doing so should be a preference of the theme used, and should not be
enforced by the core CSS rules. This patch removes the override.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-03-18 14:15:27 +01:00
silverwind
602a6a92c2
Improve CSV rendering ( #29638 )
...
Before:
<img width="1332" alt="Screenshot 2024-03-06 at 21 42 17"
src="https://github.com/go-gitea/gitea/assets/115237/0ea07eee-31f8-4783-bd56-37bd8396f00d ">
After:
<img width="1336" alt="Screenshot 2024-03-06 at 21 41 58"
src="https://github.com/go-gitea/gitea/assets/115237/eb7f9cc9-587f-4e3b-92bd-cc67ca639963 ">
2024-03-18 13:52:41 +01:00
Gergely Nagy
921d1283ed
routers: Minor code cleanup in UsernameSubRoute
...
The `reloadParam` function already calls `context.UserAssignmentWeb`
with the same parameters, there's no need to do it again.
Change cherry picked from gitea#29751.
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
2024-03-18 13:28:20 +01:00
6543
d5319feb85
Refactor code_indexer to use an SearchOptions struct for PerformSearch ( #29724 )
...
similar to how it's already done for the issue_indexer
---
*Sponsored by Kithara Software GmbH*
Conflicts:
routers/web/repo/search.go
2024-03-18 12:25:05 +00:00
Mai-Lapyst
ed8e8a792e
Run make fmt
2024-03-18 06:23:12 +01:00
Mai-Lapyst
db6f6281fc
Add copyright & license header to file_preview.go
2024-03-18 06:21:35 +01:00
Mai-Lapyst
10bca456a9
Remove rel
and id
attributes that only add the linenumber to elements
2024-03-18 06:19:27 +01:00
Gusted
b90fda395a
[BUG] Make write and preview tabs interactive
...
- Make the 'Write' and 'Preview' tabs of the markdown editor interactive
by adding `href="#"`, this causes it to appear in the document order and
that while focused pressing `Enter` fires a click event (which isn't the
case by doing `tabindex="0"`).
- Resolves #2675
2024-03-17 23:38:10 +01:00
0ko
4c1af0d9a6
[I18N] Fix capitalization in English and reword a few strings
...
fixes #2551
2024-03-17 21:04:11 +05:00
famfo
e9bdca5f09
Fix must-change-password help dialog
2024-03-17 12:08:27 +01:00
Michael Jerger
9dcdf8d828
Locales, field & action
2024-03-16 12:46:43 +01:00
Mai-Lapyst
8218e80bfc
Fix linting issues
2024-03-16 08:18:47 +01:00
Mai-Lapyst
d789d33229
Split filePreviewPatternProcessor into a new type FilePreview and some functions to make code more maintainable
2024-03-16 08:09:49 +01:00
Mai-Lapyst
562e5cdf32
Get locales directly from context like the other code; add translations for subtitle
2024-03-16 01:17:04 +01:00
Mai-Lapyst
6721cba75b
Fix filePreviewPattern
2024-03-16 00:37:46 +01:00
Mai-Lapyst
fae8d9f70d
Accept at minimum 4 chars for the commit sha
2024-03-15 23:54:07 +01:00
Mai-Lapyst
8309f008c2
Fix some code issues
2024-03-15 23:52:38 +01:00
Mai-Lapyst
781a37fbe1
Check error in GetRepoFileContent for io.ReadAll
2024-03-15 23:49:13 +01:00
Gusted
65f9319c8f
Merge pull request '[Windows] prevent ? in testdata path' ( #2668 ) from oliverpool/forgejo:prevent_windows_incompatibles_paths into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2668
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-03-15 14:40:53 +00:00
Gusted
314e5188d8
Merge pull request '[FIX] Display error message if doer is unable to fork' ( #2649 ) from snematoda/fix-2504 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2649
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-03-15 14:12:59 +00:00
Mai-Lapyst
1d3240887c
Render inline file permalinks
2024-03-15 14:00:34 +01:00
oliverpool
a3cdb5f2d3
[Windows] prevent ? in testdata path
2024-03-15 13:15:46 +01:00