Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added mermaid graphics to allmark like seen on gitlab, minor CSS twea… #31

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

added mermaid graphics to allmark like seen on gitlab, minor CSS twea… #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
286b601
added mermaid graphics to allmark like seen on gitlab, minor CSS twea…
elWyatt May 10, 2020
5dd58e2
fixed int overflows in 32 bit compiles on windows and arm
elWyatt May 29, 2020
d0f2ee1
modified include paths from andreaskoch to elWyatt
elWyatt Jun 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,13 @@ crosscompile:
GOOS=linux GOARCH=arm GOARM=5 go build -o bin/files/allmark_linux_arm_5 ./cli
GOOS=linux GOARCH=arm GOARM=6 go build -o bin/files/allmark_linux_arm_6 ./cli
GOOS=linux GOARCH=arm GOARM=7 go build -o bin/files/allmark_linux_arm_7 ./cli
GOOS=aix GOARCH=ppc64 GOARM=7 go build -o bin/files/allmark_aix_ppc64 ./cli
GOOS=darwin GOARCH=amd64 go build -o bin/files/allmark_darwin_amd64 ./cli
GOOS=windows GOARCH=amd64 go build -o bin/files/allmark_windows_amd64 ./cli
GOOS=windows GOARCH=386 go build -o bin/files/allmark_windows_386 ./cli

arm7:
GOOS=linux GOARCH=arm GOARM=7 go build -o bin/files/allmark_linux_arm_7 ./cli

linux:
GOOS=linux GOARCH=amd64 go build -o bin/files/allmark_linux_amd64 ./cli
24 changes: 12 additions & 12 deletions cli/allmark.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ package main
import (
"fmt"

"github.com/andreaskoch/allmark/common/config"
"github.com/andreaskoch/allmark/common/logger/console"
"github.com/andreaskoch/allmark/common/logger/loglevel"
"github.com/andreaskoch/allmark/common/shutdown"
"github.com/andreaskoch/allmark/common/util/fsutil"
"github.com/andreaskoch/allmark/dataaccess/filesystem"
"github.com/andreaskoch/allmark/services/initialization"
"github.com/andreaskoch/allmark/services/parser"
"github.com/andreaskoch/allmark/services/thumbnail"
"github.com/andreaskoch/allmark/web/server"
"github.com/elWyatt/allmark/common/config"
"github.com/elWyatt/allmark/common/logger/console"
"github.com/elWyatt/allmark/common/logger/loglevel"
"github.com/elWyatt/allmark/common/shutdown"
"github.com/elWyatt/allmark/common/util/fsutil"
"github.com/elWyatt/allmark/dataaccess/filesystem"
"github.com/elWyatt/allmark/services/initialization"
"github.com/elWyatt/allmark/services/parser"
"github.com/elWyatt/allmark/services/thumbnail"
"github.com/elWyatt/allmark/web/server"
// "github.com/davecheney/profile"
"flag"
"os"
Expand All @@ -37,7 +37,7 @@ const (
CommandNameVersion = "version"
)

var version = "v0.10.0-dev"
var version = "v0.21.0-dev-TMT"

var (
serveFlags = flag.NewFlagSet("serve-flags", flag.ContinueOnError)
Expand Down Expand Up @@ -149,7 +149,7 @@ func printUsageInformation(args []string) {
fmt.Fprintf(os.Stderr, " %7s %s\n", CommandNameInit, "Initialize the configuration")
fmt.Fprintf(os.Stderr, " %7s %s\n", CommandNameServe, "Start serving the supplied repository via HTTP and HTTPs")
fmt.Fprintf(os.Stderr, "\n")
fmt.Fprintf(os.Stderr, "Fork me on GitHub %q\n", "https://github.com/andreaskoch/allmark")
fmt.Fprintf(os.Stderr, "Fork me on GitHub %q\n", "https://github.com/elWyatt/allmark")

os.Exit(2)
}
Expand Down
8 changes: 4 additions & 4 deletions common/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"os/exec"
"path/filepath"

"github.com/andreaskoch/allmark/common/certificates"
"github.com/andreaskoch/allmark/common/logger/loglevel"
"github.com/andreaskoch/allmark/common/ports"
"github.com/andreaskoch/allmark/common/util/fsutil"
"github.com/elWyatt/allmark/common/certificates"
"github.com/elWyatt/allmark/common/logger/loglevel"
"github.com/elWyatt/allmark/common/ports"
"github.com/elWyatt/allmark/common/util/fsutil"
"github.com/abbot/go-http-auth"
"github.com/mitchellh/go-homedir"
)
Expand Down
2 changes: 1 addition & 1 deletion common/logger/console/console.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package console

import (
"github.com/andreaskoch/allmark/common/logger/loglevel"
"github.com/elWyatt/allmark/common/logger/loglevel"
"fmt"
"io"
"log"
Expand Down
2 changes: 1 addition & 1 deletion common/logger/console/console_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package console

import (
"github.com/andreaskoch/allmark/common/logger/loglevel"
"github.com/elWyatt/allmark/common/logger/loglevel"
"bytes"
"strings"
"testing"
Expand Down
2 changes: 1 addition & 1 deletion common/logger/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package logger

import (
"github.com/andreaskoch/allmark/common/logger/loglevel"
"github.com/elWyatt/allmark/common/logger/loglevel"
)

type Logger interface {
Expand Down
2 changes: 1 addition & 1 deletion common/paths/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package paths

import (
"github.com/andreaskoch/allmark/common/route"
"github.com/elWyatt/allmark/common/route"
)

type PatherFactory interface {
Expand Down
2 changes: 1 addition & 1 deletion common/paths/paths.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package paths

import (
"github.com/andreaskoch/allmark/common/route"
"github.com/elWyatt/allmark/common/route"
)

type Pather interface {
Expand Down
2 changes: 1 addition & 1 deletion common/tree/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package tree

import (
"github.com/andreaskoch/allmark/common/route"
"github.com/elWyatt/allmark/common/route"
)

func RouteToPath(route route.Route) Path {
Expand Down
2 changes: 1 addition & 1 deletion common/tree/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package tree

import (
"github.com/andreaskoch/allmark/common/route"
"github.com/elWyatt/allmark/common/route"
"testing"
)

Expand Down
4 changes: 2 additions & 2 deletions dataaccess/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package dataaccess

import (
"github.com/andreaskoch/allmark/common/content"
"github.com/andreaskoch/allmark/common/route"
"github.com/elWyatt/allmark/common/content"
"github.com/elWyatt/allmark/common/route"
)

// A File represents a file ressource that is associated with an Item.
Expand Down
8 changes: 4 additions & 4 deletions dataaccess/filesystem/contentprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
package filesystem

import (
"github.com/andreaskoch/allmark/common/content"
"github.com/andreaskoch/allmark/common/route"
"github.com/andreaskoch/allmark/common/util/fsutil"
"github.com/andreaskoch/allmark/common/util/hashutil"
"github.com/elWyatt/allmark/common/content"
"github.com/elWyatt/allmark/common/route"
"github.com/elWyatt/allmark/common/util/fsutil"
"github.com/elWyatt/allmark/common/util/hashutil"
"fmt"
"io"
"io/ioutil"
Expand Down
6 changes: 3 additions & 3 deletions dataaccess/filesystem/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
package filesystem

import (
"github.com/andreaskoch/allmark/common/content"
"github.com/andreaskoch/allmark/common/route"
"github.com/andreaskoch/allmark/common/util/hashutil"
"github.com/elWyatt/allmark/common/content"
"github.com/elWyatt/allmark/common/route"
"github.com/elWyatt/allmark/common/util/hashutil"
"fmt"
)

Expand Down
8 changes: 4 additions & 4 deletions dataaccess/filesystem/fileprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
package filesystem

import (
"github.com/andreaskoch/allmark/common/logger"
"github.com/andreaskoch/allmark/common/route"
"github.com/andreaskoch/allmark/common/util/fsutil"
"github.com/andreaskoch/allmark/dataaccess"
"github.com/elWyatt/allmark/common/logger"
"github.com/elWyatt/allmark/common/route"
"github.com/elWyatt/allmark/common/util/fsutil"
"github.com/elWyatt/allmark/dataaccess"
"fmt"
"io/ioutil"
"path/filepath"
Expand Down
4 changes: 2 additions & 2 deletions dataaccess/filesystem/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package filesystem

import (
"github.com/andreaskoch/allmark/common/route"
"github.com/andreaskoch/allmark/dataaccess"
"github.com/elWyatt/allmark/common/route"
"github.com/elWyatt/allmark/dataaccess"
"fmt"
)

Expand Down
8 changes: 4 additions & 4 deletions dataaccess/filesystem/item.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
package filesystem

import (
"github.com/andreaskoch/allmark/common/content"
"github.com/andreaskoch/allmark/common/route"
"github.com/andreaskoch/allmark/common/util/hashutil"
"github.com/andreaskoch/allmark/dataaccess"
"github.com/elWyatt/allmark/common/content"
"github.com/elWyatt/allmark/common/route"
"github.com/elWyatt/allmark/common/util/hashutil"
"github.com/elWyatt/allmark/dataaccess"
"fmt"
)

Expand Down
10 changes: 5 additions & 5 deletions dataaccess/filesystem/itemprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
package filesystem

import (
"github.com/andreaskoch/allmark/common/config"
"github.com/andreaskoch/allmark/common/logger"
"github.com/andreaskoch/allmark/common/route"
"github.com/andreaskoch/allmark/common/util/fsutil"
"github.com/andreaskoch/allmark/dataaccess"
"github.com/elWyatt/allmark/common/config"
"github.com/elWyatt/allmark/common/logger"
"github.com/elWyatt/allmark/common/route"
"github.com/elWyatt/allmark/common/util/fsutil"
"github.com/elWyatt/allmark/dataaccess"
"fmt"
"path/filepath"
)
Expand Down
6 changes: 3 additions & 3 deletions dataaccess/filesystem/itemtree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
package filesystem

import (
"github.com/andreaskoch/allmark/common/route"
"github.com/andreaskoch/allmark/common/tree"
"github.com/andreaskoch/allmark/dataaccess"
"github.com/elWyatt/allmark/common/route"
"github.com/elWyatt/allmark/common/tree"
"github.com/elWyatt/allmark/dataaccess"
"fmt"
)

Expand Down
10 changes: 5 additions & 5 deletions dataaccess/filesystem/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"runtime"
"time"

"github.com/andreaskoch/allmark/common/config"
"github.com/andreaskoch/allmark/common/logger"
"github.com/andreaskoch/allmark/common/route"
"github.com/andreaskoch/allmark/common/util/fsutil"
"github.com/andreaskoch/allmark/dataaccess"
"github.com/elWyatt/allmark/common/config"
"github.com/elWyatt/allmark/common/logger"
"github.com/elWyatt/allmark/common/route"
"github.com/elWyatt/allmark/common/util/fsutil"
"github.com/elWyatt/allmark/dataaccess"
)

type Repository struct {
Expand Down
4 changes: 2 additions & 2 deletions dataaccess/filesystem/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package filesystem

import (
"github.com/andreaskoch/allmark/common/config"
"github.com/andreaskoch/allmark/common/util/fsutil"
"github.com/elWyatt/allmark/common/config"
"github.com/elWyatt/allmark/common/util/fsutil"
"io/ioutil"
"path/filepath"
"strings"
Expand Down
4 changes: 2 additions & 2 deletions dataaccess/filesystem/watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package filesystem

import (
"github.com/andreaskoch/allmark/common/logger"
"github.com/andreaskoch/allmark/common/route"
"github.com/elWyatt/allmark/common/logger"
"github.com/elWyatt/allmark/common/route"
"fmt"
"github.com/andreaskoch/go-fswatch"
)
Expand Down
4 changes: 2 additions & 2 deletions dataaccess/item.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package dataaccess

import (
"github.com/andreaskoch/allmark/common/content"
"github.com/andreaskoch/allmark/common/route"
"github.com/elWyatt/allmark/common/content"
"github.com/elWyatt/allmark/common/route"
)

type ItemType int
Expand Down
2 changes: 1 addition & 1 deletion dataaccess/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package dataaccess

import (
"github.com/andreaskoch/allmark/common/route"
"github.com/elWyatt/allmark/common/route"
"fmt"
)

Expand Down
2 changes: 1 addition & 1 deletion model/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package model

import (
"github.com/andreaskoch/allmark/dataaccess"
"github.com/elWyatt/allmark/dataaccess"
"strings"
)

Expand Down
4 changes: 2 additions & 2 deletions model/item.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"sort"
"strings"

"github.com/andreaskoch/allmark/common/route"
"github.com/andreaskoch/allmark/dataaccess"
"github.com/elWyatt/allmark/common/route"
"github.com/elWyatt/allmark/dataaccess"
)

type ItemType int
Expand Down
4 changes: 2 additions & 2 deletions services/converter/converter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package converter

import (
"github.com/andreaskoch/allmark/common/paths"
"github.com/andreaskoch/allmark/model"
"github.com/elWyatt/allmark/common/paths"
"github.com/elWyatt/allmark/model"
)

type Converter interface {
Expand Down
6 changes: 3 additions & 3 deletions services/converter/markdowntohtml/filetreerenderer/filetree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
package filetreerenderer

import (
"github.com/andreaskoch/allmark/common/route"
"github.com/andreaskoch/allmark/common/tree"
"github.com/andreaskoch/allmark/model"
"github.com/elWyatt/allmark/common/route"
"github.com/elWyatt/allmark/common/tree"
"github.com/elWyatt/allmark/model"
)

type FileNode struct {
Expand Down
6 changes: 3 additions & 3 deletions services/converter/markdowntohtml/filetreerenderer/renderer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"fmt"
"strings"

"github.com/andreaskoch/allmark/common/paths"
"github.com/andreaskoch/allmark/common/route"
"github.com/andreaskoch/allmark/model"
"github.com/elWyatt/allmark/common/paths"
"github.com/elWyatt/allmark/common/route"
"github.com/elWyatt/allmark/model"
)

func New(pathProvider paths.Pather, baseRoute route.Route, files []*model.File) *FileTreeRenderer {
Expand Down
6 changes: 3 additions & 3 deletions services/converter/markdowntohtml/imageprovider/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
package imageprovider

import (
"github.com/andreaskoch/allmark/common/paths"
"github.com/andreaskoch/allmark/common/route"
"github.com/andreaskoch/allmark/services/thumbnail"
"github.com/elWyatt/allmark/common/paths"
"github.com/elWyatt/allmark/common/route"
"github.com/elWyatt/allmark/services/thumbnail"
"fmt"
"strings"
)
Expand Down
12 changes: 6 additions & 6 deletions services/converter/markdowntohtml/markdowntohtml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
package markdowntohtml

import (
"github.com/andreaskoch/allmark/common/logger"
"github.com/andreaskoch/allmark/common/paths"
"github.com/andreaskoch/allmark/model"
"github.com/andreaskoch/allmark/services/converter/markdowntohtml/imageprovider"
"github.com/andreaskoch/allmark/services/converter/markdowntohtml/postprocessor"
"github.com/andreaskoch/allmark/services/converter/markdowntohtml/preprocessor"
"github.com/elWyatt/allmark/common/logger"
"github.com/elWyatt/allmark/common/paths"
"github.com/elWyatt/allmark/model"
"github.com/elWyatt/allmark/services/converter/markdowntohtml/imageprovider"
"github.com/elWyatt/allmark/services/converter/markdowntohtml/postprocessor"
"github.com/elWyatt/allmark/services/converter/markdowntohtml/preprocessor"
"github.com/russross/blackfriday"
)

Expand Down
Loading