dependabot[bot]
6a1ec149d3
chore(deps): bump actions/github-script from 6 to 7 ( #7768 )
...
Bumps [actions/github-script](https://github.com/actions/github-script ) from 6 to 7.
- [Release notes](https://github.com/actions/github-script/releases )
- [Commits](https://github.com/actions/github-script/compare/v6...v7 )
---
updated-dependencies:
- dependency-name: actions/github-script
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-15 10:13:19 +00:00
dependabot[bot]
e613ad6453
chore(deps): bump codecov/codecov-action from 4.1.0 to 4.3.0 ( #7747 )
...
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action ) from 4.1.0 to 4.3.0.
- [Release notes](https://github.com/codecov/codecov-action/releases )
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codecov/codecov-action/compare/v4.1.0...v4.3.0 )
---
updated-dependencies:
- dependency-name: codecov/codecov-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-15 09:50:47 +00:00
Tim Möhlmann
fe9bb49caa
chore(deps): update all go deps ( #7773 )
...
This change updates all go modules, including oidc, a major version of go-jose and the go 1.22 release.
2024-04-15 09:17:36 +00:00
Elio Bischof
0267415126
chore: avoid latest on maintenance releases ( #7702 )
...
* chore: avoid latest on maintenance releases
* update semantic
---------
Co-authored-by: Livio Spring <livio.a@gmail.com>
2024-04-10 11:56:05 +00:00
Livio Spring
f862e43ede
chore(workflow): run e2e on non standard runners ( #7698 )
...
Co-authored-by: Elio Bischof <elio@zitadel.com>
2024-04-03 22:15:00 +00:00
Livio Spring
4c945f8bdc
chore(workflow): stop previous GH action pipeline on new changes and move back to public runners ( #7659 )
...
* chore(workflow): stop previous GH action pipeline on new changes
* skip previous code ql actions
* try running e2e on gh runner again
2024-03-28 07:15:03 +00:00
dependabot[bot]
47e5533f0f
chore(deps): bump actions/add-to-project from 0.6.0 to 0.6.1 ( #7628 )
...
Bumps [actions/add-to-project](https://github.com/actions/add-to-project ) from 0.6.0 to 0.6.1.
- [Release notes](https://github.com/actions/add-to-project/releases )
- [Commits](https://github.com/actions/add-to-project/compare/v0.6.0...v0.6.1 )
---
updated-dependencies:
- dependency-name: actions/add-to-project
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Livio Spring <livio.a@gmail.com>
2024-03-25 09:07:57 +00:00
Livio Spring
2bcc42c4cd
chore(workflow): fix homebrew update ( #7630 )
2024-03-25 09:29:54 +01:00
Silvan
5b301c7f96
chore: trigger update homebrew tap on latest release ( #7618 )
2024-03-22 13:38:18 +01:00
Livio Spring
bbb4dea0bd
chore: fix artifact upload for container build ( #7565 )
2024-03-14 11:10:53 +00:00
Livio Spring
5d2cfc06d5
chore: update github actions ( #7564 )
2024-03-14 09:26:31 +00:00
Silvan
4224c7ad3a
chore(core): update dependencies ( #7517 )
...
* chore(core): update dependencies
* chore(core): update dependencies
2024-03-11 10:43:56 +00:00
dependabot[bot]
213c425806
chore(deps): bump codecov/codecov-action from 3.1.4 to 4.1.0 ( #7470 )
...
* chore(deps): bump codecov/codecov-action from 3.1.4 to 4.1.0
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action ) from 3.1.4 to 4.1.0.
- [Release notes](https://github.com/codecov/codecov-action/releases )
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codecov/codecov-action/compare/v3.1.4...v4.1.0 )
---
updated-dependencies:
- dependency-name: codecov/codecov-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* add CODECOV_TOKEN
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Livio Spring <livio.a@gmail.com>
2024-03-08 08:20:33 +01:00
dependabot[bot]
87086c190b
chore(deps): bump docker/build-push-action from 4 to 5 ( #7469 )
...
Bumps [docker/build-push-action](https://github.com/docker/build-push-action ) from 4 to 5.
- [Release notes](https://github.com/docker/build-push-action/releases )
- [Commits](https://github.com/docker/build-push-action/compare/v4...v5 )
---
updated-dependencies:
- dependency-name: docker/build-push-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-03-08 06:52:49 +00:00
dependabot[bot]
37eea6940a
chore(deps): bump actions/cache from 3 to 4 ( #7473 )
...
Bumps [actions/cache](https://github.com/actions/cache ) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases )
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md )
- [Commits](https://github.com/actions/cache/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: actions/cache
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-03-08 07:38:32 +01:00
Livio Spring
98bd355ce2
chore(workflow): update github actions ( #7508 )
2024-03-07 15:38:38 +00:00
dependabot[bot]
c03c054aea
chore(deps): bump docker/setup-qemu-action from 2 to 3 ( #7474 )
...
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action ) from 2 to 3.
- [Release notes](https://github.com/docker/setup-qemu-action/releases )
- [Commits](https://github.com/docker/setup-qemu-action/compare/v2...v3 )
---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-03-06 08:29:51 +00:00
dependabot[bot]
a8dbb052de
chore(deps): bump actions/upload-artifact from 3 to 4 ( #7471 )
...
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact ) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases )
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: actions/upload-artifact
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-03-06 07:26:03 +00:00
Fabi
437c834a40
chore: update github action with correct dependabot actor ( #7485 )
2024-03-01 07:10:14 +00:00
Livio Spring
60a73df459
chore: add github-actions to dependabot ( #7468 )
2024-02-29 09:17:38 +00:00
Elio Bischof
585988bd83
chore(ci): merge test runs ( #7388 )
...
* chore(ci): merge test runs
* docs: improve CONTRIBUTING.md
* expect failure
* expect failure unit
* cleanup
* fix: correct binding in integration tests
* fix: correct binding in integration tests
---------
Co-authored-by: Stefan Benz <stefan@caos.ch>
2024-02-19 07:50:37 +01:00
Livio Spring
00d245eaf3
chore(codeql): use go version from go.mod ( #6807 )
...
* chore(codeql): use go version from go.mod
* try 2.15.0 explicitly
* tag version
* Update codeql.yml
* Update codeql.yml
* try make
* Update codeql.yml
* Update codeql.yml
* Update codeql.yml
* Update codeql.yml
* Update codeql.yml
* Update codeql.yml
* Update codeql.yml
* Update codeql.yml
* Update codeql.yml
* Update codeql.yml
* Update codeql.yml
* Update codeql.yml
* Update codeql.yml
* Update codeql.yml
* Update codeql.yml
* use make compile and remove matrix check
* Update codeql.yml
* Update codeql.yml
* retry autobuild
* Update codeql.yml
* try autobuild with generated stub
* chore: change init step for codeQL
* chore: codeql
* chore: try new codeql version
* chore: new codeql-action version
* chore: new codeql-action version
* chore: new codeql-action version
* chore: new codeql-action version
---------
Co-authored-by: Stefan Benz <stefan@caos.ch>
2024-02-16 10:54:41 +00:00
Fabi
e699103303
chore: update pm board action ( #7330 )
...
automatically ad prs of non engineers to board and label community prs
2024-02-02 10:59:37 +00:00
Livio Spring
8470649ecb
chore: pin crdb version for unit tests ( #7260 )
...
* chore: pin crdb version for unit tests
* use latest 23.1 version
* use latest available 23.1 version
2024-01-18 08:16:54 +00:00
Silvan
4e3936b5bf
ci: publish sha to docker registry ( #7127 )
2024-01-02 14:03:23 +00:00
Tim Möhlmann
115d944d38
chore: add database questions to bug report template ( #6975 )
...
* chore: add database questions to bug report template
Sometimes we get bug reports that are only reproducible when zitadel is running against a certain database.
This change adds database related questions to the issue template, as it is something people don't tend to describe in the detail fields.
* fix syntax error
2023-11-27 08:23:49 +01:00
mffap
8c20548db7
chore: update bug template ( #6924 )
...
Provide link to the product management in the issue's markdown instead of description. This allows people to actually follow the link when creating an issue.
2023-11-23 10:09:40 +00:00
Tim Möhlmann
ba9b807854
perf(oidc): optimize the introspection endpoint ( #6909 )
...
* get key by id and cache them
* userinfo from events for v2 tokens
* improve keyset caching
* concurrent token and client checks
* client and project in single query
* logging and otel
* drop owner_removed column on apps and authN tables
* userinfo and project roles in go routines
* get oidc user info from projections and add actions
* add avatar URL
* some cleanup
* pull oidc work branch
* remove storage from server
* add config flag for experimental introspection
* legacy introspection flag
* drop owner_removed column on user projections
* drop owner_removed column on useer_metadata
* query userinfo unit test
* query introspection client test
* add user_grants to the userinfo query
* handle PAT scopes
* bring triggers back
* test instance keys query
* add userinfo unit tests
* unit test keys
* go mod tidy
* solve some bugs
* fix missing preferred login name
* do not run triggers in go routines, they seem to deadlock
* initialize the trigger handlers late with a sync.OnceValue
* Revert "do not run triggers in go routines, they seem to deadlock"
This reverts commit 2a03da2127
.
* add missing translations
* chore: update go version for linting
* pin oidc version
* parse a global time location for query test
* fix linter complains
* upgrade go lint
* fix more linting issues
---------
Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
2023-11-21 13:11:38 +01:00
Silvan
0948a0b9ae
ci: set runner group on parallel jobs ( #6916 )
2023-11-14 10:48:41 +00:00
adlerhurst
bd23a7a56f
merge main into next
2023-10-19 12:34:00 +02:00
adlerhurst
9c069806c4
ci(lint): use ref_base instead of main
2023-10-19 10:47:37 +02:00
Max Peintner
0a2e6dcfb3
chore(console): npm dependencies ( #6626 )
...
* chore(deps-dev): bump eslint from 8.46.0 to 8.50.0 in /console (#6618 )
Bumps [eslint](https://github.com/eslint/eslint ) from 8.46.0 to 8.50.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.46.0...v8.50.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @types/node from 18.16.10 to 20.6.5 in /console (#6617 )
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node ) from 18.16.10 to 20.6.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:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump protobufjs from 7.2.3 to 7.2.5 in /console (#6584 )
Bumps [protobufjs](https://github.com/protobufjs/protobuf.js ) from 7.2.3 to 7.2.5.
- [Release notes](https://github.com/protobufjs/protobuf.js/releases )
- [Changelog](https://github.com/protobufjs/protobuf.js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/protobufjs/protobuf.js/compare/protobufjs-v7.2.3...protobufjs-v7.2.5 )
---
updated-dependencies:
- dependency-name: protobufjs
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
* chore(deps-dev): bump @types/jasmine from 4.3.5 to 4.3.6 in /console (#6581 )
Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine ) from 4.3.5 to 4.3.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine )
---
updated-dependencies:
- dependency-name: "@types/jasmine"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump @grpc/grpc-js from 1.8.14 to 1.9.3 in /console (#6578 )
Bumps [@grpc/grpc-js](https://github.com/grpc/grpc-node ) from 1.8.14 to 1.9.3.
- [Release notes](https://github.com/grpc/grpc-node/releases )
- [Commits](https://github.com/grpc/grpc-node/compare/@grpc/grpc-js@1.8.14...@grpc/grpc-js@1.9.3 )
---
updated-dependencies:
- dependency-name: "@grpc/grpc-js"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @types/qrcode from 1.5.0 to 1.5.2 in /console (#6477 )
Bumps [@types/qrcode](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/qrcode ) from 1.5.0 to 1.5.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/qrcode )
---
updated-dependencies:
- dependency-name: "@types/qrcode"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump prettier from 2.8.8 to 3.0.3 in /console (#6476 )
Bumps [prettier](https://github.com/prettier/prettier ) from 2.8.8 to 3.0.3.
- [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.8.8...3.0.3 )
---
updated-dependencies:
- dependency-name: prettier
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump socket.io-parser from 4.2.2 to 4.2.4 in /console (#6376 )
Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser ) from 4.2.2 to 4.2.4.
- [Release notes](https://github.com/socketio/socket.io-parser/releases )
- [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md )
- [Commits](https://github.com/socketio/socket.io-parser/compare/4.2.2...4.2.4 )
---
updated-dependencies:
- dependency-name: socket.io-parser
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump semver from 5.7.1 to 5.7.2 in /console (#6375 )
Bumps [semver](https://github.com/npm/node-semver ) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases )
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md )
- [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2 )
---
updated-dependencies:
- dependency-name: semver
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* lint
* node types
* use node 20
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-28 14:59:58 +02:00
Livio Spring
e17b49e4ca
feat: add apple as idp ( #6442 )
...
* feat: manage apple idp
* handle apple idp callback
* add tests for provider
* basic console implementation
* implement flow for login UI and add logos / styling
* tests
* cleanup
* add upload button
* begin i18n
* apple logo positioning, file upload component
* fix add apple instance idp
* add missing apple logos for login
* update to go 1.21
* fix slice compare
* revert permission changes
* concrete error messages
* translate login apple logo -y-2px
* change form parsing
* sign in button
* fix tests
* lint console
---------
Co-authored-by: peintnermax <max@caos.ch>
2023-08-31 08:39:16 +02:00
Livio Spring
f03a9d03b6
chore(workflow): exclude console dist folder from cache ( #6414 )
...
* empty line for test
* chore: exclude console dist folder from cache
2023-08-22 07:31:41 +02:00
Stefan Benz
4e0c3115fe
chore: delete ignore paths to run required jobs ( #6356 )
...
Co-authored-by: Florian Forster <florian@zitadel.com>
2023-08-11 14:46:28 +00:00
Stefan Benz
77e561af72
chore: add assets to releases ( #6346 )
...
* chore: change pipeline to add assets to the release
2023-08-11 14:49:28 +02:00
Stefan Benz
3b9dabcf36
chore: build image for digest and release on workflow_dispatch ( #6287 )
2023-08-10 12:21:01 +00:00
Livio Spring
702dfaf314
chore: build release on next
branch ( #6266 )
2023-07-25 08:43:06 +02:00
Livio Spring
01dce17b14
chore: remove on push and merge_group from pipeline execution ( #6254 )
2023-07-21 12:37:07 +00:00
Silvan
ebb7a90ca7
ci: run pipeline on every push ( #6221 )
...
* ci: run pipeline on every push
* ci: run pipeline on every push on all branches
---------
Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
2023-07-18 14:32:23 +02:00
Silvan
ecf9835cb8
ci: run pipeline on every push ( #6219 )
2023-07-17 10:55:41 +02:00
Silvan
1c354ca977
ci: improve performance ( #5953 )
...
* pipeline runs on ubuntu instead of docker
* added Makefile to build zitadel core (backend) and console (frontend)
* pipeline runs in parallel where possible
* pipeline is split into multiple jobs
* removed goreleaser
* added command to check if zitadel instance is running
2023-07-17 10:08:20 +02:00
Livio Spring
80961125a7
feat(API): support V2 token and session token usage ( #6180 )
...
This PR adds support for userinfo and introspection of V2 tokens. Further V2 access tokens and session tokens can be used for authentication on the ZITADEL API (like the current access tokens).
2023-07-14 11:16:16 +00:00
Livio Spring
14b8cf4894
feat(api): add OIDC session service ( #6157 )
...
This PR starts the OIDC implementation for the API V2 including the Implicit and Code Flow.
Co-authored-by: Livio Spring <livio.a@gmail.com>
Co-authored-by: Tim Möhlmann <tim+github@zitadel.com>
Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
2023-07-10 13:27:00 +00:00
Elio Bischof
bb756482c7
feat: push telemetry ( #6027 )
...
* document analytics config
* rework configuration and docs
* describe HandleActiveInstances better
* describe active instances on quotas better
* only projected events are considered
* cleanup
* describe changes at runtime
* push milestones
* stop tracking events
* calculate and push 4 in 6 milestones
* reduce milestone pushed
* remove docs
* fix scheduled pseudo event projection
* push 5 in 6 milestones
* push 6 in 6 milestones
* ignore client ids
* fix text array contains
* push human readable milestone type
* statement unit tests
* improve dev and db performance
* organize imports
* cleanup
* organize imports
* test projection
* check rows.Err()
* test search query
* pass linting
* review
* test 4 milestones
* simplify milestone by instance ids query
* use type NamespacedCondition
* cleanup
* lint
* lint
* dont overwrite original error
* no opt-in in examples
* cleanup
* prerelease
* enable request headers
* make limit configurable
* review fixes
* only requeue special handlers secondly
* include integration tests
* Revert "include integration tests"
This reverts commit 96db9504ec
.
* pass reducers
* test handlers
* fix unit test
* feat: increment version
* lint
* remove prerelease
* fix integration tests
2023-07-06 08:38:13 +02:00
Fabi
af4ef9ed59
docs: update issue templates ( #5957 )
...
* Update proposal.yaml
* docs: issue template improvement
* docs: issue template docs
* Update config.yml
* Update config.yml
2023-06-08 10:16:45 +00:00
Tim Möhlmann
f456168a74
feat: session v2 passkey authentication ( #5952 )
2023-06-07 17:28:42 +02:00
Fabi
7a0fa2aad0
docs: improvement issue template ( #5955 )
...
* docs: improvement issue template
* docs: add issue template for docs
* docs: add issue template for proposal
* delete file
* docs: update bug template
2023-05-31 13:55:30 +02:00
Fabi
2e29226c2f
chore: add dry to pr template ( #5907 )
...
docs: add dry to pr template
2023-05-22 09:33:23 +02:00
Tim Möhlmann
62e35b266d
chore: exclude generated files from coverage ( #5884 )
2023-05-17 14:22:16 +00:00