mam/mamweb
13
1
Fork 0
Code Issues Pull requests 9 Projects Wiki Activity Actions

feature/lepsi-ui-k-odmenam #114

Open
ticvac wants to merge 8 commits from feature/lepsi-ui-k-odmenam into master
pull from: feature/lepsi-ui-k-odmenam
merge into: mam:master
Conversation 4 Commits 8 Files changed 9 +190 -26
ticvac commented 2026-02-18 01:04:56 +01:00
Owner
Copy link

je potreba kouknout jestli reálne dela to co chceme, nasadil jsem to na testweb
na discord jsem poslal obrázek z dnešní schůze...

je potreba kouknout jestli reálne dela to co chceme, nasadil jsem to na testweb na discord jsem poslal obrázek z dnešní schůze...
ledoian commented 2026-02-18 02:41:54 +01:00
Owner
Copy link

Navrhuji odkázat i z Archivu, ne jen z Orgorozcestníku

Navrhuji odkázat i z Archivu, ne jen z Orgorozcestníku
ledoian commented 2026-02-18 02:43:49 +01:00
Owner
Copy link

A jinak to posílá absurdní množství chybových e-mailů o neexistenci proměnné z.color v nějakém template (22 zpráv za jedno načtení /cislo/31.5/odmeny/), bylo bych velmi rádo, aby to nedělalo…

A jinak to posílá absurdní množství chybových e-mailů o neexistenci proměnné `z.color` v nějakém template (22 zpráv za jedno načtení `/cislo/31.5/odmeny/`), bylo bych velmi rádo, aby to nedělalo…
ledoian commented 2026-02-18 02:44:00 +01:00
Owner
Copy link

(A jinak jsem to ještě nečetlo)

(A jinak jsem to ještě nečetlo)
ticvac commented 2026-02-18 17:16:46 +01:00
Author
Owner
Copy link

opraveno

opraveno
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/lepsi-ui-k-odmenam:feature/lepsi-ui-k-odmenam
git switch feature/lepsi-ui-k-odmenam

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff feature/lepsi-ui-k-odmenam
git switch feature/lepsi-ui-k-odmenam
git rebase master
git switch master
git merge --ff-only feature/lepsi-ui-k-odmenam
git switch feature/lepsi-ui-k-odmenam
git rebase master
git switch master
git merge --no-ff feature/lepsi-ui-k-odmenam
git switch master
git merge --squash feature/lepsi-ui-k-odmenam
git switch master
git merge --ff-only feature/lepsi-ui-k-odmenam
git switch master
git merge feature/lepsi-ui-k-odmenam
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
ledoian
zelvuska
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
mam/mamweb!114
No description provided.