Allow admin to add paragraph breaks to transcript #20

Open

mike wants to merge 6 commits from json-upload-work into json-upload

pull from: json-upload-work

merge into: oe:json-upload

oe:master

oe:json-upload-memory

oe:json-upload-memory-redo

oe:paragraph-break-removal-menu

oe:paragraph-breaks-split

oe:better-controls-3.1

oe:better-controls-3

oe:better-controls-2

oe:better-controls-7

oe:better-controls-6

oe:better-controls-5

oe:better-controls-4

oe:sep-filename-metadata

oe:split-5

oe:split-4

oe:json-upload-2

oe:json-upload-1

oe:v1-better-controls

oe:rename-speakers

oe:json-upload

oe:v1-plan

oe:rebrand-open-easthampton-transcripts

Conversation 0 Commits 6 Files changed 23 +2166 -700

mike commented 2026-09-10 12:59:38 -04:00

Owner

Copy link

No description provided.

mike added 2 commits 2026-09-10 12:59:38 -04:00

Add transcript paragraph breaks 7b92fdbbb9

Store paragraph breaks with working segments d0c8edabab

All checks were successful

Hide checks

ci/crow/pr/build Pipeline was successful

Details

This pull request has changes conflicting with the target branch.

• DESIGN.md
• e2e/transcript.spec.ts
• handlers/store.go
• handlers/templates/pages/admin.html
• handlers/templates/pages/transcript.html
• handlers/test_helpers_test.go
• handlers/transcript_upload.go
• handlers/transcripts.go
• handlers/transcripts_test.go
• store/sqlite/migrations/001-initial-tables.sql
• store/sqlite/sqlite_test.go
• store/sqlite/transcripts.go
• store/test_sqlite/db.go
• transcripts/transcripts.go
• transcripts/transcripts_test.go

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Allow admin to add paragraph breaks to transcript (#20)

Merge commit body Reviewed-on: https://code.openeasthampton.com/oe/transcripts/pulls/20

Allow admin to add paragraph breaks to transcript (#20) Reviewed-on: https://code.openeasthampton.com/oe/transcripts/pulls/20 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin json-upload-work:json-upload-work

git switch json-upload-work

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 json-upload

git merge --no-ff json-upload-work

git switch json-upload-work

git rebase json-upload

git switch json-upload

git merge --ff-only json-upload-work

git switch json-upload-work

git rebase json-upload

git switch json-upload

git merge --no-ff json-upload-work

git switch json-upload

git merge --squash json-upload-work

git switch json-upload

git merge --ff-only json-upload-work

git switch json-upload

git merge json-upload-work

git push origin json-upload

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

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

oe/transcripts!20

No description provided.