diff --git a/.drone1.yml b/.drone1.yml index 9d607c8319..7b87d86eef 100644 --- a/.drone1.yml +++ b/.drone1.yml @@ -554,4 +554,4 @@ steps: from_secret: RANCHER_SECRET_KEY service: vikunja-website/docs docker_image: vikunja/docs - confirm: true \ No newline at end of file + confirm: true diff --git a/go.mod b/go.mod index d02ee3a6ed..7b78359ca3 100644 --- a/go.mod +++ b/go.mod @@ -75,7 +75,7 @@ require ( src.techknowlogick.com/xormigrate v0.0.0-20190321151057-24497c23c09c ) -//replace ( -// github.com/labstack/echo/v4 => ../../github.com/labstack/echo // Branch: feature/report-method, PR https://github.com/labstack/echo/pull/1332 -// github.com/samedi/caldav-go => ../../github.com/samedi/caldav-go // Branch: feature/dynamic-supported-components, PR: https://github.com/samedi/caldav-go/pull/6 -//) +replace ( + github.com/labstack/echo/v4 => github.com/kolaente/echo/v4 v4.0.0-20190507190305-3725a216d803 // Branch: feature/report-method, PR https://github.com/labstack/echo/pull/1332 + github.com/samedi/caldav-go => github.com/kolaente/caldav-go v3.0.1-0.20190515182556-0537fdbe9340+incompatible // Branch: feature/dynamic-supported-components, PR: https://github.com/samedi/caldav-go/pull/6 +) diff --git a/go.sum b/go.sum index 9ae9264005..248330641b 100644 --- a/go.sum +++ b/go.sum @@ -16,7 +16,6 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/beevik/etree v0.0.0-20171015221209-af219c0c7ea1/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= @@ -112,16 +111,17 @@ github.com/jgautheron/goconst v0.0.0-20170703170152-9740945f5dcb/go.mod h1:82Txj github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/kolaente/caldav-go v3.0.1-0.20190515182556-0537fdbe9340+incompatible h1:jS8lhZO9A2UuKdtqahyLbYvP5dRIB+ze7u6kxtkKIUI= +github.com/kolaente/caldav-go v3.0.1-0.20190515182556-0537fdbe9340+incompatible/go.mod h1:y1UhTNI4g0hVymJrI6yJ5/ohy09hNBeU8iJEZjgdDOw= +github.com/kolaente/echo/v4 v4.0.0-20190507190305-3725a216d803 h1:SmVrdODUE6KErl2Xo7nqNOqGG1X8UaXnTeU7zzJiNQw= +github.com/kolaente/echo/v4 v4.0.0-20190507190305-3725a216d803/go.mod h1:3LbYC6VkwmUnmLPZ8WFdHdQHG77e9GQbjyhWdb1QvC4= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/labstack/echo/v4 v4.1.5 h1:RztCXCvfMljychg0G/IzW5T7hL6ADqqwREwcX279Q1g= -github.com/labstack/echo/v4 v4.1.5/go.mod h1:3LbYC6VkwmUnmLPZ8WFdHdQHG77e9GQbjyhWdb1QvC4= github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0= github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4= -github.com/laurent22/ical-go v0.0.0-20170824131750-e4fec3492969/go.mod h1:4LATl0uhhtytR6p9n1AlktDyIz4u2iUnWEdI3L/hXiw= github.com/laurent22/ical-go v0.1.0 h1:4vZHBD3/+ne+IN+c3B+v6d9Ff8+70pzTjCWsjfDRvL0= github.com/laurent22/ical-go v0.1.0/go.mod h1:4LATl0uhhtytR6p9n1AlktDyIz4u2iUnWEdI3L/hXiw= github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= @@ -181,8 +181,6 @@ github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jO github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/samedi/caldav-go v3.0.0+incompatible h1:OrYCCUPvQTyGybtf64G232NPkWuQRl5hc2CC6rQNT/U= -github.com/samedi/caldav-go v3.0.0+incompatible/go.mod h1:zY411fqgoxSEcCL75WxwchM+8p4n/MnRUPfVusQke3Q= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE= diff --git a/vendor/github.com/samedi/caldav-go/README.md b/vendor/github.com/samedi/caldav-go/README.md index af4e61cedb..be85e1476a 100644 --- a/vendor/github.com/samedi/caldav-go/README.md +++ b/vendor/github.com/samedi/caldav-go/README.md @@ -176,6 +176,18 @@ The default storage used (if none is explicitly set) is the `data.FileStorage` w The resources can be of two types: collection and non-collection. A collection resource is basically a resource that has children resources, but does not have any data content. A non-collection resource is a resource that does not have children, but has data. In the case of a file storage, collections correspond to directories and non-collection to plain files. The data of a caldav resource is all the info that shows up in the calendar client, in the [iCalendar](https://en.wikipedia.org/wiki/ICalendar) format. +### Configuration + +You can set the caldav types your storage engine supports like so: + +```go +caldav.SetupSupportedComponents([]string{lib.VCALENDAR, lib.VEVENT}) +``` + +The default is `lib.VCALENDAR` and `lib.VEVENT`. + +`caldav-go` will report these supported types to the client. + ### Features Please check the **CHANGELOG** to see specific features that are currently implemented. diff --git a/vendor/github.com/samedi/caldav-go/config.go b/vendor/github.com/samedi/caldav-go/config.go index 52221a20df..5b9c831cf8 100644 --- a/vendor/github.com/samedi/caldav-go/config.go +++ b/vendor/github.com/samedi/caldav-go/config.go @@ -21,4 +21,4 @@ func SetupUser(username string) { // SetupSupportedComponents sets all components which are supported by this storage implementation. func SetupSupportedComponents(components []string) { global.SupportedComponents = components -} \ No newline at end of file +} diff --git a/vendor/github.com/samedi/caldav-go/data/resource.go b/vendor/github.com/samedi/caldav-go/data/resource.go index 9f6fdb9e3e..41dd27a2d8 100644 --- a/vendor/github.com/samedi/caldav-go/data/resource.go +++ b/vendor/github.com/samedi/caldav-go/data/resource.go @@ -2,7 +2,6 @@ package data import ( "fmt" - "github.com/laurent22/ical-go/ical" "io/ioutil" "log" "os" @@ -10,6 +9,8 @@ import ( "strings" "time" + "github.com/laurent22/ical-go" + "github.com/samedi/caldav-go/files" "github.com/samedi/caldav-go/lib" ) diff --git a/vendor/github.com/samedi/caldav-go/global/global.go b/vendor/github.com/samedi/caldav-go/global/global.go index 47eb72606d..371c8a6986 100644 --- a/vendor/github.com/samedi/caldav-go/global/global.go +++ b/vendor/github.com/samedi/caldav-go/global/global.go @@ -14,4 +14,4 @@ var Storage data.Storage = new(data.FileStorage) var User *data.CalUser // SupportedComponents contains all components which are supported by the current storage implementation -var SupportedComponents = []string{lib.VCALENDAR, lib.VEVENT} \ No newline at end of file +var SupportedComponents = []string{lib.VCALENDAR, lib.VEVENT} diff --git a/vendor/github.com/samedi/caldav-go/go.mod b/vendor/github.com/samedi/caldav-go/go.mod deleted file mode 100644 index 42d4b9445e..0000000000 --- a/vendor/github.com/samedi/caldav-go/go.mod +++ /dev/null @@ -1,8 +0,0 @@ -module github.com/samedi/caldav-go - -go 1.12 - -require ( - github.com/beevik/etree v0.0.0-20171015221209-af219c0c7ea1 - github.com/laurent22/ical-go v0.0.0-20170824131750-e4fec3492969 -) diff --git a/vendor/github.com/samedi/caldav-go/handlers/report.go b/vendor/github.com/samedi/caldav-go/handlers/report.go index 87238a64db..662bc02ae4 100644 --- a/vendor/github.com/samedi/caldav-go/handlers/report.go +++ b/vendor/github.com/samedi/caldav-go/handlers/report.go @@ -113,8 +113,8 @@ func (rh reportHandler) fetchResourcesByFilters(origin *data.Resource, filtersXM return reps, err } - for in, resource := range resources { - reps = append(reps, reportRes{resource.Path, &resources[in], true}) + for _, resource := range resources { + reps = append(reps, reportRes{resource.Path, &resource, true}) } } else { // the origin resource is not a collection, so returns just that as the result diff --git a/vendor/modules.txt b/vendor/modules.txt index 18c795cc2d..bb2015f017 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -80,7 +80,7 @@ github.com/inconshreveable/mousetrap # github.com/jgautheron/goconst v0.0.0-20170703170152-9740945f5dcb github.com/jgautheron/goconst/cmd/goconst github.com/jgautheron/goconst -# github.com/labstack/echo/v4 v4.1.5 => ../../github.com/labstack/echo +# github.com/labstack/echo/v4 v4.1.5 => github.com/kolaente/echo/v4 v4.0.0-20190507190305-3725a216d803 github.com/labstack/echo/v4 github.com/labstack/echo/v4/middleware # github.com/labstack/gommon v0.2.8 @@ -134,7 +134,7 @@ github.com/prometheus/procfs github.com/prometheus/procfs/nfs github.com/prometheus/procfs/xfs github.com/prometheus/procfs/internal/util -# github.com/samedi/caldav-go v3.0.0+incompatible => ../../github.com/samedi/caldav-go +# github.com/samedi/caldav-go v3.0.0+incompatible => github.com/kolaente/caldav-go v3.0.1-0.20190515182556-0537fdbe9340+incompatible github.com/samedi/caldav-go github.com/samedi/caldav-go/data github.com/samedi/caldav-go/errs