Commit Graph

641 Commits

Author SHA1 Message Date
mike12345567 7743384f77 re-write, to use the ideas that Rory put in place, still WIP, un-tested but all implemented. 2021-08-02 18:34:43 +01:00
Budibase Release Bot 0f4df3cc85 v0.9.90 2021-08-02 14:49:04 +00:00
Budibase Release Bot c0e1f29788 v0.9.89 2021-08-02 14:36:56 +00:00
Budibase Staging Release Bot 22db140dcf v0.9.87-alpha.4 2021-08-02 13:02:24 +00:00
mike12345567 f6d0db4c4b Updating API endpoints, to include the new system one, updating hosting envoy yaml to cover these. 2021-08-02 12:09:03 +01:00
Budibase Release Bot e332003cb7 v0.9.88 2021-07-30 18:07:23 +00:00
Budibase Release Bot 2bfe7866cf v0.9.87 2021-07-30 17:25:31 +00:00
mike12345567 61de20616f Fixing worker dev script to not overwrite env file everytime. 2021-07-30 15:40:39 +01:00
mike12345567 8bcce17cd7 Removing unused mock. 2021-07-30 14:25:38 +01:00
mike12345567 79c5f01267 Fixing config test case. 2021-07-30 14:23:40 +01:00
Budibase Staging Release Bot 03e66795e4 v0.9.87-alpha.3 2021-07-30 11:04:41 +00:00
Budibase Staging Release Bot ffbcaf1777 v0.9.87-alpha.2 2021-07-30 10:33:02 +00:00
Rory Powell 1dec11e76c Merge pull request #2182 from Budibase/feature/watchtower-hooks
Add watchtower hooks
2021-07-30 11:25:38 +01:00
Budibase Staging Release Bot 699c1964dc v0.9.87-alpha.1 2021-07-29 21:44:52 +00:00
Rory Powell 648661877a Add watchtower hooks 2021-07-29 20:32:18 +01:00
Budibase Staging Release Bot 96d11ef07f v0.9.87-alpha.0 2021-07-29 10:20:04 +00:00
Rory Powell da3dfe6266 Merge master -> develop version bump 0.9.86 2021-07-29 10:55:31 +01:00
Budibase Staging Release Bot 4f2a2d3090 v0.9.86-alpha.0 2021-07-29 09:19:25 +00:00
Budibase Release Bot 9778ce8f98 v0.9.86 2021-07-29 09:17:21 +00:00
Budibase Release Bot 1799502520 v0.9.85 2021-07-28 21:57:53 +00:00
Budibase Release Bot 4c86d5558d v0.9.84 2021-07-28 09:34:03 +00:00
mike12345567 5dfeb9b3ca Limiting use of query string to a few select endpoints for determining tenant ID. 2021-07-27 18:02:59 +01:00
Budibase Release Bot a682cffbec v0.9.83 2021-07-27 16:13:27 +00:00
mike12345567 adf6d18cb1 Fixing some issues with public endpoints causing logout loop. 2021-07-27 16:17:02 +01:00
Budibase Staging Release Bot 58b1d81d88 v0.9.83-alpha.0 2021-07-27 14:50:45 +00:00
mike12345567 615053f201 Fixing some issues with org not being correctly detected. 2021-07-27 15:35:26 +01:00
Martin McKeaveney 775bcc631c Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-27 12:03:20 +01:00
Budibase Release Bot b8ca801b6a v0.9.82 2021-07-27 11:01:29 +00:00
Martin McKeaveney 2c2e46f26b merge 2021-07-27 11:58:41 +01:00
mike12345567 1b40740709 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-27 10:32:18 +01:00
Budibase Release Bot 7de10f6db3 v0.9.81 2021-07-27 09:20:57 +00:00
Budibase Staging Release Bot 31a7414333 v0.9.80-alpha.9 2021-07-27 09:11:15 +00:00
Budibase Release Bot 535a28eb83 v0.9.80 2021-07-27 09:07:05 +00:00
Budibase Staging Release Bot 1d8a5da6cc v0.9.80-alpha.8 2021-07-26 21:20:37 +00:00
mike12345567 219962cb8a Adding ability to disable/enable multi-tenancy flags easily. 2021-07-26 16:17:56 +01:00
mike12345567 dd1f1fec3b Linting. 2021-07-26 13:31:39 +01:00
mike12345567 d03229caba Adding in admin API backwards compat. 2021-07-26 13:23:11 +01:00
mike12345567 4606248ffd Fixing up everything found when testing with Cypress. 2021-07-26 13:19:47 +01:00
Budibase Staging Release Bot 5421768521 v0.9.80-alpha.7 2021-07-26 09:34:02 +00:00
Budibase Staging Release Bot 074ebfde63 v0.9.80-alpha.6 2021-07-26 08:23:08 +00:00
Budibase Staging Release Bot d44bafba06 v0.9.80-alpha.5 2021-07-26 07:42:30 +00:00
Budibase Staging Release Bot 1b54e53ec6 v0.9.80-alpha.4 2021-07-25 11:22:12 +00:00
Michael Drury 8c359ca76d Merge pull request #2086 from Budibase/fix/edit-roles-modal
Fixes for issue #2077
2021-07-25 12:14:31 +01:00
Budibase Staging Release Bot cfec959384 v0.9.80-alpha.3 2021-07-25 10:58:35 +00:00
Michael Drury 6d5f697142 Adding checks around the edit roles modal. 2021-07-25 11:46:40 +01:00
Budibase Staging Release Bot 054740398f v0.9.80-alpha.2 2021-07-24 11:22:42 +00:00
mike12345567 c63ee57bbd Linting. 2021-07-23 20:03:11 +01:00
mike12345567 4d0faa38e3 Changing how apps are retrieved to be more efficient. 2021-07-23 20:01:53 +01:00
mike12345567 9a9c552629 Adding mechanism for lookup of userId/email to tenantId. 2021-07-23 19:22:04 +01:00
Budibase Staging Release Bot 306ad55c99 v0.9.80-alpha.1 2021-07-23 17:41:06 +00:00
Rory Powell 75bda99e00 Fix staging version 2021-07-23 18:31:45 +01:00
Budibase Staging Release Bot 255bea8553 v0.9.79-alpha.5 2021-07-23 16:55:34 +00:00
mike12345567 bd301cf972 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-23 17:52:30 +01:00
mike12345567 82e43e0008 Removing accidental symbols. 2021-07-23 17:26:54 +01:00
mike12345567 9377c7b0f3 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-23 17:20:41 +01:00
Budibase Staging Release Bot f0163b3942 v0.9.79-alpha.4 2021-07-23 16:13:42 +00:00
Budibase Release Bot c47d08bb4a v0.9.79 2021-07-23 16:08:58 +00:00
mike12345567 7588bfde39 Adjusting how redis modules are loaded, making sure client is always set, before init. 2021-07-23 16:53:22 +01:00
Budibase Staging Release Bot 69b2bee2e1 v0.9.79-alpha.3 2021-07-23 15:46:11 +00:00
Rory Powell eb8d857864 Require https callback in production, allow for http otherwise 2021-07-23 15:47:48 +01:00
Budibase Staging Release Bot 32cf132022 v0.9.79-alpha.2 2021-07-23 14:05:23 +00:00
Rory Powell 9958625814 Merge pull request #2073 from Budibase/fix/google-button
Mark google activated by default for old configs
2021-07-23 14:56:44 +01:00
Rory Powell 418637cb6b Linting 2021-07-23 14:42:28 +01:00
Rory Powell f95b550b15 Mark google activated by default for old configs 2021-07-23 14:40:22 +01:00
Budibase Staging Release Bot 885d3003fe v0.9.79-alpha.1 2021-07-23 11:08:21 +00:00
Rory Powell 249df46770 Mark google activated by default for old configs 2021-07-23 11:38:17 +01:00
Budibase Staging Release Bot f3f60aee78 v0.9.79-alpha.0 2021-07-23 09:37:21 +00:00
mike12345567 3f7bafe23d Linting. 2021-07-22 22:37:20 +01:00
mike12345567 313302cae2 Fixing test cases and bugs that they raised. 2021-07-22 22:36:16 +01:00
mike12345567 24012c2fba Linting. 2021-07-22 16:37:50 +01:00
mike12345567 1d6a350311 Changing how flags are handled. 2021-07-22 16:36:21 +01:00
mike12345567 b21fe320c5 Adding fallbacks for oidc and google. 2021-07-22 15:26:14 +01:00
mike12345567 1b6a73c250 Linting. 2021-07-22 14:29:30 +01:00
mike12345567 27b2a13817 Swapping admin -> global in worker to reduce confusion in API url naming. 2021-07-22 12:56:47 +01:00
mike12345567 3305400c83 Fixing saving of oidc and google auth, neither should require the callbackURL property with the tenancy update. 2021-07-21 11:10:26 +01:00
mike12345567 b09c2d45f9 Linting and adding tenancy API. 2021-07-20 18:03:16 +01:00
mike12345567 129ff3fef2 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-20 15:56:12 +01:00
Peter Clement 3f42ed74b9 Merge remote-tracking branch 'origin/develop' into oidc-config-management 2021-07-20 12:57:58 +01:00
Peter Clement 0fa68a2d50 Add activated toggle and login functionality to support this 2021-07-20 09:27:12 +01:00
mike12345567 83db31f899 A lot of general fixes around getting logged in, setting up users etc. 2021-07-19 19:00:53 +01:00
mike12345567 358b2aef89 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-19 17:35:48 +01:00
mike12345567 e026375f50 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-19 16:24:19 +01:00
Budibase Release Bot d8136d0704 v0.9.78 2021-07-19 14:23:03 +00:00
mike12345567 e56a0f5aa3 Fixing some tenancy issues. 2021-07-19 12:57:52 +01:00
Budibase Release Bot ec19ff23c2 v0.9.77 2021-07-16 18:52:46 +00:00
mike12345567 d157285918 Adding organisation page. 2021-07-16 18:24:32 +01:00
mike12345567 f3156fca06 Further work, tenancy now working but some more work to be done. 2021-07-16 18:04:49 +01:00
mike12345567 b7995dd61d Updating auth to utilise the tenant system. 2021-07-16 15:08:58 +01:00
Budibase Release Bot 2668f2ba40 v0.9.76 2021-07-15 23:23:00 +00:00
mike12345567 912659a8ad First version of multi-tenancy, work still to be done. 2021-07-15 17:57:02 +01:00
Rory Powell 5f51de257f Default public config.config when missing 2021-07-15 16:50:57 +01:00
Rory Powell 806957e462 Merge branch 'feature/oidc-support' of github.com:Budibase/budibase into feature/oidc-support 2021-07-15 16:21:03 +01:00
Rory Powell 33b352c3ef Store OIDC config in cookie instead of URL 2021-07-15 16:20:31 +01:00
Peter Clement 70ab4e4dc5 add new logic to support oauth and oidc buttons 2021-07-15 15:49:10 +01:00
Rory Powell 239e39e5ed Merge branch 'develop' into feature/oidc-support 2021-07-15 14:05:30 +01:00
Budibase Release Bot 2bd7934518 v0.9.75 2021-07-15 10:12:28 +00:00
Michael Drury fd76e532c7 Merge pull request #1989 from Budibase/fix/email-explanation
Email template descriptions/information
2021-07-15 11:04:36 +01:00
mike12345567 3eb82b5a63 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-14 13:54:39 +01:00
mike12345567 ae3a09d560 Merge branch 'master' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-14 13:53:57 +01:00
mike12345567 a9160f5914 Rewording email template descriptions. 2021-07-14 13:24:46 +01:00
mike12345567 a31cce0ff9 Linting. 2021-07-14 13:18:27 +01:00
mike12345567 c20fde41ee Some quick fixes after a user had some confusion over how the email templating works, just adding some detail that should help explain. 2021-07-14 11:23:24 +01:00
Peter Clement 283698f8c5 Fix config form saving bugs 2021-07-13 21:47:36 +01:00
Budibase Release Bot 23bb4215c2 v0.9.74 2021-07-13 16:53:42 +00:00
Rory Powell 0973394208 Update config checklist to handle multiple sso sources 2021-07-13 17:30:17 +01:00
mike12345567 cc08b4fc4e Linting. 2021-07-13 17:28:05 +01:00
mike12345567 004f719dde Renaming groups to workspaces. 2021-07-13 17:27:04 +01:00
Rory Powell dd306d59c5 Load oidc config by id 2021-07-13 17:07:48 +01:00
Peter Clement 9dd05ec96e Add UUID to each oidc config to distinguish each provider 2021-07-13 15:52:21 +01:00
Peter Clement af792cc09e improve structure of OIDC config 2021-07-13 14:55:14 +01:00
Rory Powell 5f5fe92807 Refactor auth controller tests to reuse common behaviour 2021-07-13 10:28:15 +01:00
Martin McKeaveney bebfe4c6e1 merge with master 2021-07-11 18:07:46 +01:00
Rory Powell 4d3f44f982 Unit test auth controller oidc functions 2021-07-11 17:54:18 +01:00
Budibase Release Bot 1f5b3b4467 v0.9.73 2021-07-09 17:29:06 +00:00
Kyle Harrison 2d451bb3a9 apply fixes for common spelling mistakes 2021-07-09 17:54:49 +01:00
Peter Clement b94348dddc Fix OIDC logo conditional display 2021-07-09 15:50:46 +01:00
Peter Clement 5a86d6bb6d Linting and Optimisation 2021-07-09 15:05:39 +01:00
Peter Clement 7138070e4c Fix bug where OIDC icon was not being displayed due to misconfiguration 2021-07-09 14:18:03 +01:00
Peter Clement bcfbca0f08 Add oidc icon and name to public api for login page 2021-07-09 09:49:16 +01:00
Rory Powell 73c8dcf71b Merge branch 'develop' into feature/oidc-support 2021-07-08 20:15:16 +01:00
Rory Powell 1c18b4c6ac remove duplicate scope definition
scope can be defined both within the strategy declaration or when invoking passport
2021-07-08 15:21:54 +01:00
Rory Powell c16cfc328f Linting 2021-07-08 13:12:25 +01:00
Rory Powell ec93d15462 Integrate with configuration ui / support for email usernames 2021-07-08 13:04:04 +01:00
Rory Powell f0016f4bde Merge branch 'feature/oidc-support' of github.com:Budibase/budibase into feature/oidc-support 2021-07-08 11:12:45 +01:00
Rory Powell 25f1368227 Merge google/oidc user authentication and surface user relevant error messages during authentication 2021-07-08 11:12:34 +01:00
mike12345567 b0fb7ae991 Fixing test cases. 2021-07-08 00:30:55 +01:00
mike12345567 93302cb667 Linting. 2021-07-07 23:30:14 +01:00
mike12345567 4916ff7eb8 Adding sessions API. 2021-07-07 23:29:19 +01:00
Peter Clement 2e49686eab Merge branch 'feature/oidc-support' of https://github.com/Budibase/budibase into oidc-config-management 2021-07-07 17:42:31 +01:00
Peter Clement 7a51eba93c Add OIDC icon to login page 2021-07-07 17:39:26 +01:00
mike12345567 93cc9530ed Merge branch 'develop' of github.com:Budibase/budibase into feature/user-session 2021-07-07 17:17:16 +01:00
Peter Clement 37b1200051 Allow user uploaded icons in oidc config 2021-07-07 13:41:09 +01:00
Rory Powell c15051462e Add info to 403 responses 2021-07-07 13:28:55 +01:00
Budibase Release Bot f4f2a03503 v0.9.72 2021-07-07 12:19:03 +00:00
Budibase Release Bot 330fd8b922 v0.9.71 2021-07-07 10:52:11 +00:00
mike12345567 b847f85d91 WIP - first version of user sessions. 2021-07-06 18:10:04 +01:00
Rory Powell 7803540399 Use configuration url to retrieve oidc endpoints
The /.well-known/openid-configuration endpoint can be used to
retrieve the majority of configuration needed for oidc

Additionally refactor the callback url to be generated on the server
side as this is a fixed endpoint.

Add linting fixes
2021-07-06 10:03:40 +01:00
Bernhard Hayden baab7141c0 Proof of concept OIDC implementation 2021-07-06 10:03:40 +01:00
Budibase Release Bot 1532fee301 v0.9.70 2021-07-05 14:38:21 +00:00
Peter Clement 0e6fb73b9e Add validation to backend for OIDC configuration 2021-07-05 14:27:19 +01:00
Budibase Release Bot b4c2e3cd31 v0.9.69 2021-07-01 10:51:59 +00:00
Michael Drury 235f76d805 Merge pull request #1893 from Budibase/fix/user-app-role-list
Fixing user roles administration - getting full list of apps
2021-07-01 11:43:59 +01:00
Budibase Release Bot 9b1530ff87 v0.9.68 2021-07-01 10:41:50 +00:00
mike12345567 ae84345d27 Fixing issue with full list of apps not appearing in user administration, meaning couldn't update roles. 2021-07-01 11:29:27 +01:00
Budibase Release Bot 4abd23f6ff v0.9.67 2021-06-29 16:46:33 +00:00
Budibase Release Bot e80e2c6a7b v0.9.66 2021-06-29 13:24:30 +00:00
Budibase Release Bot 4eedbe7890 v0.9.65 2021-06-25 11:32:56 +00:00
Budibase Release Bot 6f280e389a v0.9.64 2021-06-24 11:37:19 +00:00
Budibase Release Bot 01bd23f45e v0.9.63 2021-06-23 22:43:56 +00:00
Budibase Release Bot 8d740bd199 v0.9.62 2021-06-23 22:27:33 +00:00
Budibase Release Bot b63a901a47 v0.9.61 2021-06-23 19:53:30 +00:00
Budibase Release Bot e25c6d4f3f v0.9.60 2021-06-23 12:53:57 +00:00
Budibase Release Bot e141a17e87 v0.9.59 2021-06-23 11:09:48 +00:00
Budibase Release Bot ce2abff002 v0.9.58 2021-06-23 09:13:01 +00:00
Budibase Release Bot e93c40a0d7 v0.9.57 2021-06-23 08:45:22 +00:00
Budibase Release Bot a61abb0476 v0.9.56 2021-06-23 07:33:05 +00:00
Budibase Release Bot ee825b3728 v0.9.55 2021-06-22 16:31:57 +00:00
Budibase Release Bot 42d18b8d7f v0.9.54 2021-06-22 16:03:40 +00:00
Michael Drury abc5a6687c Merge pull request #1781 from Budibase/fix/mike-fixes
Fixes and making login/forgot/reset password pages respect logo and company name
2021-06-21 19:43:05 +01:00
mike12345567 f4757aeee1 Fixing issues discovered by cypress tests. 2021-06-21 18:37:14 +01:00
mike12345567 7039b8d7eb Linting. 2021-06-21 18:02:09 +01:00
mike12345567 61d810edfe Implementing feature #1700 and making it possible to remove logo. 2021-06-21 18:01:25 +01:00
mike12345567 ed5dd08c66 Fixing authentication with API key issue. 2021-06-21 17:13:06 +01:00
Martin McKeaveney 8844275357 consolidate build 2021-06-21 16:44:54 +01:00
Martin McKeaveney 9deeef2d9e add develop tag and update docker push script 2021-06-21 16:25:12 +01:00
Martin McKeaveney 72a61e4555 adding docker staging tag to CI build to avoid polluting latest 2021-06-21 11:35:39 +01:00
Martin McKeaveney 88a3fd7d4c merge 2021-06-21 11:16:44 +01:00
Budibase Release Bot 5dcc469e8c v0.9.53 2021-06-20 16:45:30 +00:00
Budibase Release Bot 744dd2b777 v0.9.52 2021-06-20 10:15:48 +00:00
mike12345567 052d14ad38 Fixing issue with 1:N relationships and multiple fields, issue #1753. 2021-06-20 10:53:55 +01:00
Andrew Kingston 49abab36c9 Merge branch 'master' of github.com:Budibase/budibase into feature/layout-poc 2021-06-18 13:10:10 +01:00
Budibase Release Bot aa1d7ad7aa v0.9.51 2021-06-17 05:20:27 +00:00
Budibase Release Bot f19fa7ab8b v0.9.50 2021-06-16 09:04:00 +00:00
Andrew Kingston d5e40fc090 Merge branch 'master' of github.com:Budibase/budibase into feature/layout-poc 2021-06-16 09:35:11 +01:00
Budibase Release Bot 024bce7354 v0.9.49 2021-06-16 08:29:17 +00:00
Andrew Kingston ab6e31811b Merge pull request #1712 from Budibase/fix/eslint-prettier
Fix eslint, update eslint and prettier versions and update package scripts
2021-06-16 09:22:07 +01:00
Andrew Kingston 32a3c2bbb6 Lint with prettier 2021-06-15 19:39:40 +01:00
Budibase Release Bot 6153fa74f1 v0.9.48 2021-06-15 12:43:29 +00:00
mike12345567 290cf98704 Adding longer timeout for real email tests. 2021-06-15 13:22:38 +01:00
Andrew Kingston 27009438c8 Merge branch 'master' of github.com:Budibase/budibase into feature/layout-poc 2021-06-14 09:54:11 +01:00
Budibase Release Bot afcab1af1b v0.9.47 2021-06-11 13:03:19 +00:00
Budibase Release Bot b58e8925d1 v0.9.46 2021-06-11 08:48:36 +00:00
Keviin Åberg Kultalahti 76954b948d remove unused components in builder settings 2021-06-11 09:19:44 +02:00
Budibase Release Bot e91bab560d v0.9.45 2021-06-10 13:17:08 +00:00
Budibase Release Bot 0c935fb5fa v0.9.44 2021-06-10 12:54:14 +00:00
Budibase Release Bot 989ff250b1 v0.9.43 2021-06-10 11:21:35 +00:00
Michael Drury cb43edb640 Merge pull request #1690 from Budibase/fix/smtp-tls
Adding options to SMTP form for configuring TLS/STARTTLS
2021-06-10 12:14:00 +01:00
Budibase Release Bot fac53fe92f v0.9.42 2021-06-10 10:51:32 +00:00
mike12345567 86f13557ca Adding options to SMTP form for configuring TLS/STARTTLS. 2021-06-10 11:25:06 +01:00
Budibase Release Bot 968c4dabb7 v0.9.41 2021-06-09 18:01:31 +00:00
Budibase Release Bot aed973681e v0.9.40 2021-06-09 15:26:30 +00:00
mike12345567 22431a4ea2 Updating SMTP config to show better errors. 2021-06-09 15:45:54 +01:00
Budibase Release Bot ad45781228 v0.9.39 2021-06-09 13:51:07 +00:00
Budibase Release Bot 123f5d390f v0.9.38 2021-06-09 11:37:37 +00:00
Budibase Release Bot 70de6b34fc v0.9.37 2021-06-09 11:22:57 +00:00
dependabot[bot] 40914306df Bump ws from 7.4.5 to 7.4.6 in /packages/worker
Bumps [ws](https://github.com/websockets/ws) from 7.4.5 to 7.4.6.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/7.4.5...7.4.6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 10:42:49 +00:00
Budibase Release Bot 03ad1f0312 v0.9.36 2021-06-09 10:41:59 +00:00
Martin McKeaveney 79952987a7 Merge pull request #1671 from Budibase/dependabot/npm_and_yarn/packages/worker/normalize-url-4.5.1
Bump normalize-url from 4.5.0 to 4.5.1 in /packages/worker
2021-06-09 11:34:25 +01:00
Budibase Release Bot 8b1895f10c v0.9.35 2021-06-09 10:12:38 +00:00
dependabot[bot] 08ed1c53ea Bump normalize-url from 4.5.0 to 4.5.1 in /packages/worker
Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/sindresorhus/normalize-url/releases)
- [Commits](https://github.com/sindresorhus/normalize-url/commits)

---
updated-dependencies:
- dependency-name: normalize-url
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 10:02:46 +00:00