Skip to content

Commit

Permalink
Merge branch 'master' into workspace-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
rusq committed Sep 10, 2024
2 parents 0aa6418 + da76f90 commit 0710607
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ clean:
test:
go test -race -cover -count=3 ./...

aurtest:
GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" go build -o 'deleteme' ./cmd/slackdump
rm deleteme
.PHONY: aurtest

docker_test:
docker build .

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Quick Start
===========

#. Download the latest release for your operating system from the releases_
page. (If you're using **macOS**, download **Darwin** executable).
page.
#. Unpack the archive to any directory.
#. Run the ``./slackdump`` or ``slackdump.exe`` executable (see note below).
#. You know the drill: use arrow keys to select the menu item, and Enter (or
Expand Down
4 changes: 2 additions & 2 deletions internal/viewer/templates/styles.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
border-radius: 5px;
}

.slack-files img {
max-width: 320px;
.slack-files img, .slack-files video {
max-width: 50%;
max-height: 320px;
}

Expand Down

0 comments on commit 0710607

Please sign in to comment.