Commit graph

6550 commits

Author SHA1 Message Date
dependabot[bot]
65f24c189b build(deps): bump slugify from 1.6.4 to 1.6.5 in /web
Bumps [slugify](https://github.com/simov/slugify) from 1.6.4 to 1.6.5.
- [Release notes](https://github.com/simov/slugify/releases)
- [Commits](https://github.com/simov/slugify/compare/v1.6.4...v1.6.5)

---
updated-dependencies:
- dependency-name: slugify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-04 14:36:44 +00:00
dependabot[bot]
ce48f532c5 build(deps): bump @types/node from 17.0.5 to 17.0.7 in /web
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 17.0.5 to 17.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-04 14:36:36 +00:00
dependabot[bot]
d785d41c32 build(deps): bump @types/jest from 27.0.3 to 27.4.0 in /web
Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 27.0.3 to 27.4.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest)

---
updated-dependencies:
- dependency-name: "@types/jest"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-31 14:37:33 +00:00
dependabot[bot]
371b8e55f6 build(deps): bump react-app-rewired from 2.1.10 to 2.1.11 in /web
Bumps [react-app-rewired](https://github.com/timarney/react-app-rewired) from 2.1.10 to 2.1.11.
- [Release notes](https://github.com/timarney/react-app-rewired/releases)
- [Commits](https://github.com/timarney/react-app-rewired/compare/v2.1.10...v2.1.11)

---
updated-dependencies:
- dependency-name: react-app-rewired
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-31 14:22:48 +00:00
dependabot[bot]
c2d67d80c8 build(deps): bump antd from 4.17.4 to 4.18.2 in /web
Bumps [antd](https://github.com/ant-design/ant-design) from 4.17.4 to 4.18.2.
- [Release notes](https://github.com/ant-design/ant-design/releases)
- [Changelog](https://github.com/ant-design/ant-design/blob/master/CHANGELOG.en-US.md)
- [Commits](https://github.com/ant-design/ant-design/compare/4.17.4...4.18.2)

---
updated-dependencies:
- dependency-name: antd
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-31 14:22:39 +00:00
dependabot[bot]
fd89418968 build(deps): bump react-app-rewired from 2.1.9 to 2.1.10 in /web
Bumps [react-app-rewired](https://github.com/timarney/react-app-rewired) from 2.1.9 to 2.1.10.
- [Release notes](https://github.com/timarney/react-app-rewired/releases)
- [Commits](https://github.com/timarney/react-app-rewired/compare/v2.1.9...v2.1.10)

---
updated-dependencies:
- dependency-name: react-app-rewired
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-30 13:55:48 +00:00
dependabot[bot]
c5ecafd012 build(deps): bump @types/react from 17.0.37 to 17.0.38 in /web
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 17.0.37 to 17.0.38.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-30 13:55:39 +00:00
dependabot[bot]
63cc141a1b build(deps): bump @types/node from 17.0.1 to 17.0.5 in /web
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 17.0.1 to 17.0.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-29 15:23:04 +00:00
dependabot[bot]
701a5d5088 build(deps): bump react-app-rewired from 2.1.8 to 2.1.9 in /web
Bumps [react-app-rewired](https://github.com/timarney/react-app-rewired) from 2.1.8 to 2.1.9.
- [Release notes](https://github.com/timarney/react-app-rewired/releases)
- [Commits](https://github.com/timarney/react-app-rewired/compare/2.1.8...v2.1.9)

---
updated-dependencies:
- dependency-name: react-app-rewired
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-29 15:22:57 +00:00
dependabot[bot]
a85308ab96 build(deps): bump Npgsql.EntityFrameworkCore.PostgreSQL
Bumps [Npgsql.EntityFrameworkCore.PostgreSQL](https://github.com/npgsql/efcore.pg) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/npgsql/efcore.pg/releases)
- [Commits](https://github.com/npgsql/efcore.pg/compare/v6.0.1...v6.0.2)

---
updated-dependencies:
- dependency-name: Npgsql.EntityFrameworkCore.PostgreSQL
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-29 15:22:42 +00:00
dependabot[bot]
3902d470eb build(deps): bump Microsoft.EntityFrameworkCore.Proxies
Bumps [Microsoft.EntityFrameworkCore.Proxies](https://github.com/dotnet/efcore) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/dotnet/efcore/releases)
- [Commits](https://github.com/dotnet/efcore/compare/v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: Microsoft.EntityFrameworkCore.Proxies
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-29 15:22:01 +00:00
dependabot[bot]
c3d9b26321 build(deps): bump Microsoft.EntityFrameworkCore.Design
Bumps [Microsoft.EntityFrameworkCore.Design](https://github.com/dotnet/efcore) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/dotnet/efcore/releases)
- [Commits](https://github.com/dotnet/efcore/compare/v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: Microsoft.EntityFrameworkCore.Design
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-29 15:21:52 +00:00
Azure Pipelines EF Migration Bot
7e887dc47c feat(data): migrate PR #2730 2021-12-20 10:23:48 +00:00
Yuki2718
3da5b14f1c Partly revert #2534 and remove a few lists 2021-12-20 10:23:48 +00:00
dependabot[bot]
6b2e0dff54 build(deps): bump antd from 4.17.3 to 4.17.4 in /web
Bumps [antd](https://github.com/ant-design/ant-design) from 4.17.3 to 4.17.4.
- [Release notes](https://github.com/ant-design/ant-design/releases)
- [Changelog](https://github.com/ant-design/ant-design/blob/master/CHANGELOG.en-US.md)
- [Commits](https://github.com/ant-design/ant-design/compare/4.17.3...4.17.4)

---
updated-dependencies:
- dependency-name: antd
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-20 10:23:14 +00:00
dependabot[bot]
b52c864a82 build(deps): bump Hangfire.AspNetCore
Bumps [Hangfire.AspNetCore](https://github.com/HangfireIO/Hangfire) from 1.7.27 to 1.7.28.
- [Release notes](https://github.com/HangfireIO/Hangfire/releases)
- [Commits](https://github.com/HangfireIO/Hangfire/compare/v1.7.27...v1.7.28)

---
updated-dependencies:
- dependency-name: Hangfire.AspNetCore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-20 10:23:06 +00:00
dependabot[bot]
741bff9a7b build(deps): bump @types/node from 17.0.0 to 17.0.1 in /web
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 17.0.0 to 17.0.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-20 10:22:55 +00:00
dependabot[bot]
9cd7fae94e build(deps): bump Microsoft.ApplicationInsights.AspNetCore
Bumps [Microsoft.ApplicationInsights.AspNetCore](https://github.com/Microsoft/ApplicationInsights-dotnet) from 2.19.0 to 2.20.0.
- [Release notes](https://github.com/Microsoft/ApplicationInsights-dotnet/releases)
- [Changelog](https://github.com/microsoft/ApplicationInsights-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/ApplicationInsights-dotnet/compare/2.19.0...2.20.0)

---
updated-dependencies:
- dependency-name: Microsoft.ApplicationInsights.AspNetCore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-17 13:14:55 +00:00
dependabot[bot]
9ca434f1b6 build(deps): bump slugify from 1.6.3 to 1.6.4 in /web
Bumps [slugify](https://github.com/simov/slugify) from 1.6.3 to 1.6.4.
- [Release notes](https://github.com/simov/slugify/releases)
- [Commits](https://github.com/simov/slugify/compare/v1.6.3...v1.6.4)

---
updated-dependencies:
- dependency-name: slugify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-17 13:14:45 +00:00
dependabot[bot]
90f4b7a941 build(deps): bump @types/node from 16.11.13 to 17.0.0 in /web
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 16.11.13 to 17.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-16 14:02:41 +00:00
dependabot[bot]
01cf17cadc build(deps): bump Microsoft.Extensions.Http.Polly
Bumps [Microsoft.Extensions.Http.Polly](https://github.com/dotnet/aspnetcore) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: Microsoft.Extensions.Http.Polly
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-15 13:29:55 +00:00
dependabot[bot]
b92aa321ab build(deps): bump @types/node from 16.11.12 to 16.11.13 in /web
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 16.11.12 to 16.11.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-15 13:29:41 +00:00
dependabot[bot]
2030464594 build(deps): bump typescript from 4.5.3 to 4.5.4 in /web
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.5.3 to 4.5.4.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.5.3...v4.5.4)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-14 13:48:10 +00:00
dependabot[bot]
99d57b3c40 build(deps): bump FluentValidation.DependencyInjectionExtensions
Bumps [FluentValidation.DependencyInjectionExtensions](https://github.com/JeremySkinner/fluentvalidation) from 10.3.5 to 10.3.6.
- [Release notes](https://github.com/JeremySkinner/fluentvalidation/releases)
- [Changelog](https://github.com/FluentValidation/FluentValidation/blob/main/Changelog.txt)
- [Commits](https://github.com/JeremySkinner/fluentvalidation/compare/10.3.5...10.3.6)

---
updated-dependencies:
- dependency-name: FluentValidation.DependencyInjectionExtensions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-14 13:48:02 +00:00
dependabot[bot]
0cab6f7b4b build(deps): bump typescript from 4.5.2 to 4.5.3 in /web
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.5.2 to 4.5.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/commits)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-10 14:27:43 +00:00
dependabot[bot]
4a9a47f493 build(deps): bump antd from 4.17.2 to 4.17.3 in /web
Bumps [antd](https://github.com/ant-design/ant-design) from 4.17.2 to 4.17.3.
- [Release notes](https://github.com/ant-design/ant-design/releases)
- [Changelog](https://github.com/ant-design/ant-design/blob/master/CHANGELOG.en-US.md)
- [Commits](https://github.com/ant-design/ant-design/compare/4.17.2...4.17.3)

---
updated-dependencies:
- dependency-name: antd
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-09 13:41:56 +00:00
Azure Pipelines EF Migration Bot
6514315524 feat(data): migrate PR #2709 2021-12-08 14:48:19 +00:00
JohnyP
b03ab3a431 Add 2 mirrors
Is this enough or is there another file I have to change if I want to add mirrors to my filterlist (https://github.com/collinbarrett/FilterLists/pull/2508)
2021-12-08 14:48:19 +00:00
dependabot[bot]
33c61462e4 build(deps): bump @types/node from 16.11.11 to 16.11.12 in /web
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 16.11.11 to 16.11.12.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-08 13:57:45 +00:00
dependabot[bot]
8cc476108a build(deps): bump Hellang.Middleware.ProblemDetails
Bumps [Hellang.Middleware.ProblemDetails](https://github.com/khellang/Middleware) from 6.2.0 to 6.3.0.
- [Release notes](https://github.com/khellang/Middleware/releases)
- [Commits](https://github.com/khellang/Middleware/compare/v6.2.0...v6.3.0)

---
updated-dependencies:
- dependency-name: Hellang.Middleware.ProblemDetails
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-07 12:49:32 +00:00
dependabot[bot]
8ee1cf8033 build(deps): bump @testing-library/jest-dom in /web
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.16.0 to 5.16.1.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.16.0...v5.16.1)

---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-07 12:49:24 +00:00
Collin M. Barrett
7b4174b984 feat(dir): validate ViewUrl segmentNumber & primariness for new FilterLists 2021-12-06 11:36:14 -06:00
Collin M. Barrett
fbd5edbbea feat(dir): validate related IDs for new FilterLists 2021-12-06 11:28:30 -06:00
Collin M. Barrett
53985dac58 feat(dir): validate URLs for new FilterLists 2021-12-06 09:54:48 -06:00
dependabot[bot]
48bf2a87cd build(deps): bump @testing-library/jest-dom in /web
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.15.1 to 5.16.0.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.15.1...v5.16.0)

---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-06 13:52:55 +00:00
dependabot[bot]
c1e259b02f build(deps): bump Npgsql.EntityFrameworkCore.PostgreSQL
Bumps [Npgsql.EntityFrameworkCore.PostgreSQL](https://github.com/npgsql/efcore.pg) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/npgsql/efcore.pg/releases)
- [Commits](https://github.com/npgsql/efcore.pg/compare/v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: Npgsql.EntityFrameworkCore.PostgreSQL
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-06 13:52:39 +00:00
dependabot[bot]
cdc9c41d28 build(deps): bump prettier from 2.5.0 to 2.5.1 in /web
Bumps [prettier](https://github.com/prettier/prettier) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.5.0...2.5.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-06 13:52:29 +00:00
Collin M. Barrett
721926c8b5 fix(dir): 🐛 capture new ViewUrlId in Change using hi/lo to predetermine id 2021-12-05 11:58:27 -06:00
Collin M. Barrett
ccb7ca3c03 refactor(dir): ♻ make ViewUrl owned by FilterList 2021-12-05 09:52:35 -06:00
Collin M. Barrett
8d5040400c feat(dir): capture add'l FilterList props in change value object 2021-12-05 06:45:20 -06:00
Collin M. Barrett
eb6b3170e5 fix(dir): 🐛 self-ref'ing many-to-many config 2021-12-05 06:24:40 -06:00
Collin M. Barrett
d517e80ec0 refactor(dir): ♻ specify many-to-many join entity names 2021-12-05 05:37:27 -06:00
Collin M. Barrett
45f63a0766 refactor(dir): ♻ extract explicit collection nav backing props 2021-12-05 05:36:41 -06:00
Collin M. Barrett
5b0bc6abe5 chore(dir): ♻ re-gen migrations 2021-12-05 04:42:25 -06:00
Azure Pipelines EF Migration Bot
d3baec9326 feat(data): migrate PR #2700 2021-12-03 14:17:45 +00:00
BPower0036
b5702ef7ad Added Mirrors for my filterlists 2021-12-03 14:17:45 +00:00
dependabot[bot]
522133f794 build(deps): bump FluentValidation.DependencyInjectionExtensions
Bumps [FluentValidation.DependencyInjectionExtensions](https://github.com/JeremySkinner/fluentvalidation) from 10.3.4 to 10.3.5.
- [Release notes](https://github.com/JeremySkinner/fluentvalidation/releases)
- [Changelog](https://github.com/FluentValidation/FluentValidation/blob/main/Changelog.txt)
- [Commits](https://github.com/JeremySkinner/fluentvalidation/compare/10.3.4...10.3.5)

---
updated-dependencies:
- dependency-name: FluentValidation.DependencyInjectionExtensions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-01 11:01:06 +00:00
dependabot[bot]
14e8614c8b build(deps): bump @types/node from 16.11.10 to 16.11.11 in /web
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 16.11.10 to 16.11.11.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-30 13:39:52 +00:00
Collin M. Barrett
04e593b44a refactor(dir): ♻ sync local names 2021-11-29 17:04:26 -06:00
Collin M. Barrett
723106e10c fix(dir): 🐛 ICommandContext many-to-many configs 2021-11-29 16:59:07 -06:00