Merge branch 'master' into utf8
Showing
- .dockerignore 2 additions, 0 deletions.dockerignore
- .gitignore 1 addition, 0 deletions.gitignore
- api/unstable/ipfs_download.go 7 additions, 24 deletionsapi/unstable/ipfs_download.go
- cmd/media_repo/main.go 4 additions, 0 deletionscmd/media_repo/main.go
- cmd/media_repo/reloads.go 16 additions, 0 deletionscmd/media_repo/reloads.go
- common/config/conf_min_shared.go 4 additions, 0 deletionscommon/config/conf_min_shared.go
- common/config/models_domain.go 7 additions, 1 deletioncommon/config/models_domain.go
- common/config/watch.go 7 additions, 0 deletionscommon/config/watch.go
- common/globals/reload.go 1 addition, 0 deletionscommon/globals/reload.go
- config.sample.yaml 28 additions, 3 deletionsconfig.sample.yaml
- controllers/data_controller/import_controller.go 2 additions, 2 deletionscontrollers/data_controller/import_controller.go
- controllers/download_controller/download_resource_handler.go 1 addition, 1 deletioncontrollers/download_controller/download_resource_handler.go
- controllers/upload_controller/upload_controller.go 43 additions, 9 deletionscontrollers/upload_controller/upload_controller.go
- docs/config.md 1 addition, 0 deletionsdocs/config.md
- docs/ipfs.md 12 additions, 0 deletionsdocs/ipfs.md
- go.mod 7 additions, 1 deletiongo.mod
- go.sum 244 additions, 0 deletionsgo.sum
- ipfs_proxy/api.go 66 additions, 0 deletionsipfs_proxy/api.go
- ipfs_proxy/iface.go 14 additions, 0 deletionsipfs_proxy/iface.go
- ipfs_proxy/ipfs_embedded/impl.go 158 additions, 0 deletionsipfs_proxy/ipfs_embedded/impl.go
Loading
Please register or sign in to comment