back interdiff of round #2 and #1

appview/state: Move /knots & /spindles under /settings #660

merged
opened by 5jiji.com targeting master from 5jiji.com/tangled-core: master

Closes https://tangled.org/@tangled.org/core/issues/248

I hope this go code is fine, because i have no damn clue how go works, so i just tried something and it worked If there is a better solution, i would like to know it!

NB: (I've checked if it compiled and worked, by removing commit '3ebdcd: knotserver: improve the logging situation', as for some reason, that commit is uncompilable (even your spindle is complaining))

options
unified split
files
appview
knots
knots.go
pages
pages.go
templates
knots
dashboard.html
fragments
addMemberModal.html
knotListing.html
index.html
layouts
fragments
topbar.html
repo
fork.html
new.html
spindles
dashboard.html
fragments
addMemberModal.html
spindleListing.html
index.html
settings
settings.go
spindles
spindles.go
state
router.go
docs
hacking.md
knot-hosting.md
migrations.md
REBASED
appview/knots/knots.go

This patch was likely rebased, as context lines do not match.

REBASED
appview/pages/pages.go

This patch was likely rebased, as context lines do not match.

ERROR
appview/pages/templates/knots/dashboard.html

Failed to calculate interdiff for this file.

REBASED
appview/pages/templates/knots/fragments/addMemberModal.html

This patch was likely rebased, as context lines do not match.

ERROR
appview/pages/templates/knots/fragments/knotListing.html

Failed to calculate interdiff for this file.

ERROR
appview/pages/templates/knots/index.html

Failed to calculate interdiff for this file.

REBASED
appview/pages/templates/layouts/fragments/topbar.html

This patch was likely rebased, as context lines do not match.

REBASED
appview/pages/templates/repo/fork.html

This patch was likely rebased, as context lines do not match.

REBASED
appview/pages/templates/repo/new.html

This patch was likely rebased, as context lines do not match.

ERROR
appview/pages/templates/spindles/dashboard.html

Failed to calculate interdiff for this file.

REBASED
appview/pages/templates/spindles/fragments/addMemberModal.html

This patch was likely rebased, as context lines do not match.

ERROR
appview/pages/templates/spindles/fragments/spindleListing.html

Failed to calculate interdiff for this file.

ERROR
appview/pages/templates/spindles/index.html

Failed to calculate interdiff for this file.

ERROR
appview/settings/settings.go

Failed to calculate interdiff for this file.

REBASED
appview/spindles/spindles.go

This patch was likely rebased, as context lines do not match.

REBASED
appview/state/router.go

This patch was likely rebased, as context lines do not match.

ERROR
docs/hacking.md

Failed to calculate interdiff for this file.

ERROR
docs/knot-hosting.md

Failed to calculate interdiff for this file.

ERROR
docs/migrations.md

Failed to calculate interdiff for this file.