Commit Graph

9682 Commits

Author SHA1 Message Date
Budibase Staging Release Bot cf3e0f0fdc v1.0.49-alpha.8 2022-02-02 10:59:16 +00:00
Michael Drury 6037cb19b8 Merge branch 'develop' of github.com:Budibase/budibase into develop 2022-02-02 10:51:59 +00:00
Michael Drury 6063ab03b0 Fixing issue with sql API after refactor. 2022-02-01 20:59:26 +00:00
Budibase Staging Release Bot 61e3877e08 v1.0.49-alpha.7 2022-02-01 20:38:50 +00:00
Michael Drury 4b23a78bc9 Fixing a typescript issue in server. 2022-02-01 20:29:12 +00:00
Andrew Kingston 298be3d931 Merge branch 'frontend-core' of github.com:Budibase/budibase into experimental-hbs-caching 2022-02-01 16:53:12 +00:00
Andrew Kingston 378ddc5753 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-01 16:52:26 +00:00
Andrew Kingston 14eca1b461 Merge branch 'frontend-core' of github.com:Budibase/budibase into experimental-hbs-caching 2022-02-01 16:49:59 +00:00
Andrew Kingston e0ed191f49 Update lock files 2022-02-01 16:46:38 +00:00
Andrew Kingston de12e0dc79 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-01 16:46:00 +00:00
Andrew Kingston eb1edcd1cc Simply and improve core client library logic 2022-02-01 16:32:37 +00:00
Budibase Staging Release Bot 7852960a03 v1.0.49-alpha.6 2022-02-01 16:32:31 +00:00
mike12345567 b847b578c7 Making sure worker runs through ts-node in cypress, locally, then built in CI. 2022-02-01 16:02:44 +00:00
mike12345567 e642268364 Merge branch 'develop' of github.com:Budibase/budibase into lab-day/refactor-app-db 2022-02-01 14:33:02 +00:00
Andrew Kingston 27c2b62223 Remove log statements 2022-02-01 11:55:31 +00:00
Martin McKeaveney c11e26cb2e merge 2022-02-01 11:22:14 +01:00
Budibase Staging Release Bot bc781128d6 v1.0.49-alpha.5 2022-02-01 10:11:29 +00:00
Martin McKeaveney 7fb9b33f6c remove more references to envoy 2022-02-01 11:02:37 +01:00
Rory Powell ec3c196c03 Revert "build app before running e2e tests"
This reverts commit 6eca23541f.
2022-02-01 06:40:07 +00:00
Maurits Lourens 6eca23541f build app before running e2e tests 2022-01-31 23:13:42 +01:00
Rory Powell 33e19c49a0 Reorder jest mock and import statements for email mocking 2022-01-31 21:05:14 +00:00
Rory Powell 995c36e8c7 Merge branch 'develop' into worker_typescript 2022-01-31 20:29:20 +00:00
Budibase Staging Release Bot 9abefd5b63 v1.0.49-alpha.4 2022-01-31 19:12:15 +00:00
Andrew Kingston 249520bdb2 Merge pull request #4228 from pueding/fix/query-pagination-on-production
Fix not showing pagination of query on production
2022-01-31 19:06:00 +00:00
Andrew Kingston 21a771ff70 Merge in client bundle size reductions 2022-01-31 19:02:59 +00:00
Andrew Kingston fcd79ed70a Merge branch 'client-bundle-size-reduction' into experimental-hbs-caching 2022-01-31 18:58:19 +00:00
Andrew Kingston caf8991d92 Cache the determination of client component settings and simplify initialisationlogic 2022-01-31 18:54:04 +00:00
Budibase Staging Release Bot 7aab9d3e40 v1.0.49-alpha.3 2022-01-31 17:55:54 +00:00
mike12345567 72534c6ed2 Refactoring backend-core tenancy to context, splitting out tenancy functionality to its own area. 2022-01-31 17:53:19 +00:00
mike12345567 dbc048b365 Review comments, renaming deployed -> prod in terms of app IDs. 2022-01-31 17:42:51 +00:00
Rory Powell b63aa71366 Tolerate missing app metadata in app url migration 2022-01-31 17:28:45 +00:00
mike12345567 1095ad17c6 Adding comments to areas that need to keep using old db creation method. 2022-01-31 17:27:47 +00:00
mike12345567 476f34fb93 Merge branch 'develop' of github.com:Budibase/budibase into lab-day/refactor-app-db 2022-01-31 17:16:59 +00:00
mike12345567 9198439f7f Merge branch 'develop' of github.com:Budibase/budibase into lab-day/refactor-app-db 2022-01-31 17:00:22 +00:00
Budibase Staging Release Bot a063274133 v1.0.49-alpha.2 2022-01-31 16:54:48 +00:00
Rory Powell 9295317d6c Merge pull request #4220 from Budibase/feature/migrations-2.0
Migrations 2.0
2022-01-31 16:47:38 +00:00
Rory Powell 662727ccc6 Merge pull request #4261 from Budibase/fix/csrf-post-login
Fix CSRF token not present using local auth
2022-01-31 16:41:43 +00:00
Martin McKeaveney fdf5795444 Merge pull request #4242 from mslourens/add_url_to_templates
Adds a url to the templates
2022-01-31 16:37:46 +00:00
Martin McKeaveney 7b644dd8f3 merge 2022-01-31 17:02:27 +01:00
Budibase Staging Release Bot 4596464b5a v1.0.49-alpha.1 2022-01-31 16:01:59 +00:00
Martin McKeaveney b521721642 fixing cypress setup 2022-01-31 16:35:23 +01:00
mike12345567 d0bd9d2d62 Merge branch 'develop' of github.com:Budibase/budibase into lab-day/refactor-app-db 2022-01-31 15:33:36 +00:00
mike12345567 f9c7877e02 Merge branch 'develop' of github.com:Budibase/budibase into feature/formula-filtering 2022-01-31 15:21:15 +00:00
Hwansoo 241d04ed38 fix: check if fields exists 2022-02-01 00:03:25 +09:00
Budibase Staging Release Bot 4b9acb21ae v1.0.49-alpha.0 2022-01-31 14:39:05 +00:00
mike12345567 d55005d327 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-01-31 14:29:02 +00:00
mike12345567 8d02fabb35 Review comments. 2022-01-31 14:16:03 +00:00
mike12345567 e718b18127 Merge branch 'develop' of github.com:Budibase/budibase into lab-day/refactor-app-db 2022-01-31 14:09:07 +00:00
Budibase Release Bot 86ffa65d93 v1.0.48 2022-01-31 13:43:13 +00:00
mike12345567 9b4f684f05 Cypress setup, allowing option for using typescript locally. 2022-01-31 11:51:52 +00:00
Rory Powell bdc37b6ff7 Fix CSRF token not present using local auth 2022-01-31 11:07:54 +00:00
Andrew Kingston e5ca73a5d9 Merge branch 'frontend-core' of github.com:Budibase/budibase into experimental-hbs-caching 2022-01-31 10:34:04 +00:00
Andrew Kingston 9b1754ad70 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-31 09:40:33 +00:00
Andrew Kingston 22bb99357a Remove lodash and sort dependencies out 2022-01-31 09:32:06 +00:00
Rory Powell 54a32b41ef Merge branch 'develop' into feature/migrations-2.0 2022-01-30 22:37:11 +00:00
Budibase Staging Release Bot 6246ae61f9 v1.0.46-alpha.8 2022-01-30 21:43:10 +00:00
Rory Powell 5e8a1b2c29 Merge branch 'develop' into feature/migrations-2.0 2022-01-30 21:38:15 +00:00
Rory Powell 0089fb06d9 Merge branch 'develop' into csrf 2022-01-30 21:20:48 +00:00
Martin McKeaveney cca6d18af4 point to MinIO instance instead of through proxy 2022-01-30 21:25:56 +01:00
Martin McKeaveney 7c4d7e0e8f nginx prod config, security headers and content-security policies 2022-01-30 21:11:59 +01:00
Andrew Kingston 4b7fe15598 Add experimental support for caching the creation of HBS template functions 2022-01-29 18:53:21 +00:00
mike12345567 91a90e62b2 Fixing some issues discovered by the cypress tests, cleaning up how Couch is used. 2022-01-28 18:52:34 +00:00
mike12345567 d5f8cc1023 Tests updating, all now passing, fixed some issues discovered by them. 2022-01-28 15:43:51 +00:00
Andrew Kingston fab27eea77 Fix issue with backend UI not refreshing when adding a row 2022-01-28 15:17:21 +00:00
Budibase Staging Release Bot dbaede79f6 v1.0.46-alpha.7 2022-01-28 15:12:31 +00:00
Maurits Lourens 24b2fc65a0 Adds a url to the templates 2022-01-28 16:06:46 +01:00
Rory Powell a70894e065 Merge branch 'fix/app-update' into feature/migrations-2.0 2022-01-28 13:32:26 +00:00
Rory Powell c96573069e Fix app update endpoint 2022-01-28 13:27:19 +00:00
Rory Powell e001376e6d Fix loop early exit 2022-01-28 11:32:28 +00:00
Michael Drury d3a90acc55 Final pass refactoring - need to test but all code in server converted. 2022-01-28 00:05:39 +00:00
mike12345567 d2fe119d90 Main body of work, refactoring most usages. 2022-01-27 18:18:31 +00:00
Hwansoo 35671cb120 Fix not showing pagination of query on production 2022-01-28 01:31:10 +09:00
Andrew Kingston f8378e551d Redirect if opening a locked app 2022-01-27 13:44:09 +00:00
Andrew Kingston 62860c3e9b Disable jest tests in builder for now 2022-01-27 13:26:39 +00:00
Rory Powell 758a8a023f Merge branch 'develop' into feature/migrations-2.0 2022-01-27 10:49:52 +00:00
Rory Powell 767354ad60 Add app db support + app url migration 2022-01-27 10:40:31 +00:00
mike12345567 412b7e5f06 Fixing #4205 - making sure builder loads the correct role for the query. 2022-01-26 18:59:41 +00:00
mike12345567 9b55ba8b13 Fixing #4192 - allowing switching between JSON and multi-select types, as well as not switching multi-select to JSON when fetching SQL tables. 2022-01-26 18:50:13 +00:00
Andrew Kingston 6af3e1ef7c Remove builder rollup alias from client as it is now fully decoupled 2022-01-26 17:55:45 +00:00
Andrew Kingston bfe209e3e6 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-26 17:49:27 +00:00
mike12345567 223b5a0e16 Fixing dynamic filter modal in client library to include static formula. 2022-01-26 17:49:02 +00:00
Andrew Kingston 0b5d26b28b Enable caching in client library 2022-01-26 17:45:35 +00:00
Andrew Kingston a3f13508d8 Disable API caching by default and deep clone data fetch config to avoid direct mutation side effects 2022-01-26 17:44:14 +00:00
Andrew Kingston 05e9f6088b Use frontend-core implementation of data fetching in backend UI 2022-01-26 17:43:48 +00:00
Budibase Staging Release Bot d8ab715267 v1.0.46-alpha.6 2022-01-26 17:11:44 +00:00
Martin McKeaveney 19d27c97a4 code review and merge with develop 2022-01-26 17:45:28 +01:00
Martin McKeaveney efde072e70 code review 2022-01-26 17:14:47 +01:00
Andrew Kingston c7cd6b923d Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-26 16:02:27 +00:00
Budibase Staging Release Bot 03b35d1e8d v1.0.46-alpha.5 2022-01-26 15:03:16 +00:00
Rory Powell e5d04d2830 Merge branch 'develop' into feature/migrations-2.0 2022-01-26 15:00:52 +00:00
Rory Powell 716a693552 Merge pull request #4137 from Budibase/feature/app-urls
Custom App URLs
2022-01-26 14:55:36 +00:00
Martin McKeaveney 1e179fec76 remove need for index from dynamo connector 2022-01-26 15:25:11 +01:00
Rory Powell 3d533d9f13 Handle undefined url 2022-01-26 13:39:40 +00:00
Rory Powell 20ec58b775 Don't apply csrf to existing sessions. Handle only supported content types 2022-01-26 12:52:53 +00:00
Rory Powell 0b9bb42817 Revert "Fix dev app preview return url"
This reverts commit 13d0bfb190.
2022-01-26 09:33:14 +00:00
Rory Powell f66a8b888f Handle unexpected errors during validation 2022-01-25 23:27:28 +00:00
Rory Powell 9db180b166 Fix cypress and update nodemon config to use backend-core 2022-01-25 23:26:39 +00:00
Rory Powell ffcf5354eb Add CSRF Token 2022-01-25 22:54:50 +00:00
Michael Drury 95e0c1aa1f Adding a possible fix for #4179. 2022-01-25 21:35:11 +00:00
Andrew Kingston 29f47198c6 Remove built-in patch functionality from core API client and instead manually patch client library API endpoints 2022-01-25 19:22:43 +00:00
mike12345567 ff6c81f265 Getting client side block search fields working with searching formulas. 2022-01-25 18:28:55 +00:00
Andrew Kingston bd04d627d2 Add missing API client documentation and fix S3 upload endpoints to make them consistent 2022-01-25 16:54:55 +00:00
mike12345567 b4eef68d71 Adding the formula bulk recalculation when adding/changing a formula field. 2022-01-25 16:01:04 +00:00
Andrew Kingston 9a813dbb29 Lint 2022-01-25 15:49:35 +00:00
Andrew Kingston 9d52841219 Refactor automation store to properly handle errors 2022-01-25 15:44:08 +00:00
Andrew Kingston 45547f1efc Improve handling of 403 logouts and return URL cookie 2022-01-25 15:28:31 +00:00
Andrew Kingston 7b32543537 Use core CookieUtils in client library 2022-01-25 15:28:14 +00:00
Michael Drury 37c29086b2 Merge pull request #4173 from Budibase/dependabot/npm_and_yarn/node-fetch-2.6.7
Bump node-fetch from 2.6.6 to 2.6.7
2022-01-25 14:12:41 +00:00
Michael Drury 69831e7662 Merge pull request #4174 from Budibase/dependabot/npm_and_yarn/packages/builder/node-fetch-2.6.7
Bump node-fetch from 2.6.6 to 2.6.7 in /packages/builder
2022-01-25 14:12:28 +00:00
Michael Drury 36b529f696 Merge pull request #4171 from Budibase/dependabot/npm_and_yarn/packages/backend-core/node-fetch-2.6.7
Bump node-fetch from 2.6.6 to 2.6.7 in /packages/backend-core
2022-01-25 14:12:19 +00:00
Andrew Kingston 604788a244 Fix issue with multiple enrichments before components mount without affecting other components 2022-01-25 11:22:26 +00:00
Andrew Kingston 57aa63a2d6 Don't render the active client app screen until the router is loaded to avoid a wasted render 2022-01-25 11:21:42 +00:00
Andrew Kingston d5ef915f39 Fix filtering no datetime fields in blocks 2022-01-25 08:42:07 +00:00
Andrew Kingston aec1f90412 Fix filter modal crashing when encountering an undefined option for a select field 2022-01-25 08:30:19 +00:00
Andrew Kingston 673deddc8c Fix JSON content missing from handled API errors 2022-01-25 08:25:16 +00:00
Andrew Kingston b0c03d8508 Improve style of data import modal 2022-01-25 08:22:53 +00:00
Andrew Kingston 9823534f80 Fix integration list not loading correctly 2022-01-25 08:13:28 +00:00
Andrew Kingston 25df85b91f Fix custom API response parsing not working 2022-01-25 08:10:49 +00:00
Andrew Kingston a8f9138001 Fix email template update endpoint 2022-01-25 08:04:56 +00:00
Andrew Kingston 5fa51005cf Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-25 07:51:47 +00:00
Andrew Kingston 7656887c1a Fix rare issue which could occur when enriching component props twice before an initial render has taken place 2022-01-24 19:25:19 +00:00
Andrew Kingston 611dc0ab48 Use correct casing for login error 2022-01-24 19:15:43 +00:00
Andrew Kingston 95488fd48d Don't show an error notification when failing API requests on the initial page load of the login page 2022-01-24 19:15:28 +00:00
Andrew Kingston b75401edfb Remove log 2022-01-24 19:15:06 +00:00
Andrew Kingston 591dafc336 Don't show a notification when failing an API request due to analytics failures 2022-01-24 19:14:57 +00:00
Andrew Kingston 4d9e7cac31 Fix crash when an app with a null name exists 2022-01-24 19:06:41 +00:00
Andrew Kingston bed1f0e092 Fix issue with create app endpoint sending json content type header 2022-01-24 19:06:18 +00:00
Andrew Kingston e1a1d47238 Don't show an error if analytics fails to activate 2022-01-24 18:58:22 +00:00
Andrew Kingston 81558588dc Clean up frontend store 2022-01-24 18:53:41 +00:00
Andrew Kingston 891bdefcb7 Remove all obscure error handling from stores and move it to the display level 2022-01-24 18:40:06 +00:00
mike12345567 da04db39c3 Fixing a couple of issues after testing, moving from deleting column to clearing. 2022-01-24 18:34:55 +00:00
mike12345567 ab5c7766b4 Bit of refactoring, adding in functionality to remove invalid static formula when the elements that the formula depends on are removed. 2022-01-24 18:22:59 +00:00
mike12345567 6a6fdbb8ff Refactoring bulk table formula work a bit. 2022-01-24 17:06:45 +00:00
Andrew Kingston ba669dbcf4 Include missing layout endpoints 2022-01-24 16:50:33 +00:00
Andrew Kingston b33a2aa662 Improve API error logging to differentiate between builder and client sources 2022-01-24 16:40:55 +00:00
Andrew Kingston c08fadc7b0 Move API client in builder to top level under src and fix some endpoints not being imported 2022-01-24 16:38:36 +00:00
mike12345567 da26761773 Make sure attachments are deleted when table is deleted, or column is removed. 2022-01-24 16:32:41 +00:00
mike12345567 3bc51864b4 Handling deletion of related rows in formula updates. 2022-01-24 16:31:18 +00:00
Budibase Release Bot e96b2b4d42 v1.0.47 2022-01-24 15:48:12 +00:00
Budibase Staging Release Bot 0b2564ff44 v1.0.46-alpha.4 2022-01-24 15:47:45 +00:00
Andrew Kingston 30fa72665a Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-24 15:46:54 +00:00
dependabot[bot] cde2174464 Bump node-fetch from 2.6.6 to 2.6.7 in /packages/builder
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 15:43:10 +00:00
dependabot[bot] c2d734db34 Bump node-fetch from 2.6.6 to 2.6.7
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 15:43:06 +00:00
dependabot[bot] ed90fd27e5 Bump node-fetch from 2.6.6 to 2.6.7 in /packages/backend-core
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 15:42:42 +00:00
Andrew Kingston b0defa8176 Merge pull request #4030 from Budibase/s3-upload
S3 file upload component
2022-01-24 15:41:46 +00:00
Andrew Kingston 8284e1d76c Filter out an S3 datasources which contain custom endpoints when selecting the datsource to use with the S3 upload component 2022-01-24 15:19:21 +00:00
Andrew Kingston f3d1035e23 Add info text to the S3 upload component 2022-01-24 15:18:54 +00:00
Andrew Kingston 3dccf1b299 Prevent generating presigned URLs for any S3 datasources that use custom endpoints 2022-01-24 15:18:42 +00:00
Andrew Kingston eeb18ac087 Fix issue with table and ignore node_modules in frontend-core 2022-01-24 14:39:32 +00:00
Andrew Kingston db3b4c0b8c Update remaining builder stores to use new core API and handle errors properly 2022-01-24 14:32:27 +00:00
Andrew Kingston 453386696f Refactor all backend stores and their usages to use new core API and handle errors 2022-01-24 12:37:22 +00:00
Rory Powell 36456189f4 Test fix 2022-01-24 10:53:30 +00:00
Rory Powell 3fdce44d56 Migrations 2.0 2022-01-24 10:48:59 +00:00
Andrew Kingston 816ced96df Update all API usages in builder components directory 2022-01-24 10:44:37 +00:00
Mitch-Budibase ca8eaf0df3 AutoScreens Test update
increasing wait time for createAutogeneratedScreens command
-associated with auto screens tests
2022-01-21 18:40:32 +00:00
Mitch-Budibase 5c972f4510 Lint
ignoring lint for entire query support files, rather than just ignoring a specific line
2022-01-21 17:50:16 +00:00
mike12345567 10a2915bcb Getting relationship re-enrichment working, so that static formulas will update when the value of the relationship changes. 2022-01-21 17:45:24 +00:00
Mitch-Budibase 6a0a92d7e1 Updates to query files
queryLevelTransformerFunction
-adding eslint-disable-next-line

queryLevelTransformerFunctionWithData
-adding eslint-disable-next-line
-Removing const stateCode - not required
2022-01-21 17:38:22 +00:00
Rory Powell 0eecab7eed Always lowercase the app url on search 2022-01-21 17:36:53 +00:00
Rory Powell 81e8ceff1a Merge branch 'develop' into feature/app-urls 2022-01-21 17:35:23 +00:00
Rory Powell e0dcc7648c Remove server -> worker request to retrieve apps, remove hosting endpoints and store 2022-01-21 17:31:18 +00:00
Mitch-Budibase 434460feb9 Oracle & Table pagination Test Env Only
createTable
-Pagination is now Test Env only

oracle
-Test Env only
-Removed smoke test tag

commands
-Fix for createApp command
-Increase wait for createRestQuery command
2022-01-21 17:28:33 +00:00
mike12345567 deb4a34c18 Adding the ability to filter using the filter drawer for formula fields, getting them based on the enriched contents of a row - adding functionality to denote to each table which other tables depend on them for formula. 2022-01-21 16:24:24 +00:00
Andrew Kingston 59349f2451 Add lots more work on refactoring builder to use core API 2022-01-21 15:09:27 +00:00
Mitch-Budibase 5d63dbd9a6 Commands Update & Query Files
-Updating Commands file to include all recent changes
-Added query files (2 of them) - required for query level transformers testing
-Cypress.json updated to remove "/builder/"
-Updating cypress version in package.json
-Missing }) within addmultioptiondatatype.spec.js
2022-01-21 14:41:53 +00:00
Andrew Kingston 9c38624d3a Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-21 13:38:06 +00:00
mike12345567 60e6cc3e9a Merge branch 'cypress-testing' of github.com:Budibase/budibase into cypress-testing 2022-01-21 13:37:25 +00:00
mike12345567 1dcd3ab3ba Merge branch 'develop' of github.com:Budibase/budibase into cypress-testing 2022-01-21 13:37:05 +00:00
Andrew Kingston a9d4e6a64e Fix rare issue which could occur when enriching component props twice before an initial render has taken place 2022-01-21 13:32:56 +00:00
Mitch-Budibase e39c5b4c25 lint changes 2022-01-21 13:12:16 +00:00
Mitch-Budibase daebee184d Merge branch 'cypress-testing' of https://github.com/Budibase/budibase into cypress-testing 2022-01-21 12:56:33 +00:00
mike12345567 87d5e0d39e Merge branch 'develop' of github.com:Budibase/budibase into feature/formula-filtering 2022-01-21 12:52:58 +00:00
Mitch-Budibase d71354d155 Merge branch 'develop' into cypress-testing 2022-01-21 12:52:13 +00:00
Mitch-Budibase 8b8cb21ec3 Adding tags to tests
Currently there is 'smoke' and 'all' tags
2022-01-21 12:43:27 +00:00
Budibase Staging Release Bot 58dc644ad8 v1.0.46-alpha.3 2022-01-21 11:27:13 +00:00
Rory Powell 04386bd1d8 Merge pull request #4000 from Budibase/fix/sync-apps-reset-rows-quotas
App and Row Quota Fixes
2022-01-21 11:20:14 +00:00
mike12345567 e2006a299d Merge branch 'develop' of github.com:Budibase/budibase into feature/formula-filtering 2022-01-21 10:21:14 +00:00
Martin McKeaveney 208ec7183a update scroll limit 2022-01-21 10:26:01 +01:00
Andrew Kingston f100ae42fd Add more work on API refactor in builder 2022-01-21 09:10:59 +00:00
Rory Powell 2b6f9e20f4 Add deprecation notice 2022-01-20 21:40:10 +00:00
Rory Powell b49be566b7 Remove cloud checks 2022-01-20 21:34:28 +00:00
Rory Powell 31ecb71070 Revert yarn.lock changes 2022-01-20 21:14:11 +00:00
Budibase Release Bot caebb066c3 v1.0.46 2022-01-20 19:58:40 +00:00
Andrew Kingston e6cddcca3e Add more builder API refactor updates 2022-01-20 19:53:55 +00:00
Andrew Kingston 358aed6d4f Update {{ now }} HBS helper to floor to the second instead of millisecond 2022-01-20 19:37:01 +00:00
Andrew Kingston 6319760b8c More work on builder API refactor 2022-01-20 19:27:15 +00:00
Andrew Kingston 2394f7faee Fix data fetch for nested providers, JSON arrays or array fields not working 2022-01-20 19:25:21 +00:00
Andrew Kingston 858d7b4b5a Revert changes to MultiFieldSelect 2022-01-20 19:24:57 +00:00
Andrew Kingston c578dedd51 Fix issue with array field validation 2022-01-20 19:24:48 +00:00
Andrew Kingston 56ef16665e Transform the output of JS expressions to be actual types rather than strings 2022-01-20 19:24:39 +00:00
Andrew Kingston 3c50a83de7 Derive safe array-like value as the default value for multi-select fields 2022-01-20 19:24:28 +00:00
mike12345567 14ec6ac205 Fixing an issue where old apps did not send up the values of the default parameters, the server should be able to handle this, enrich them in if they aren't there. 2022-01-20 19:06:08 +00:00
Budibase Staging Release Bot 36611280f2 v1.0.46-alpha.2 2022-01-20 18:57:06 +00:00
Michael Drury 321003a74c Merge pull request #4131 from Budibase/fix/data-filtering
Quick fix for data section filtering
2022-01-20 18:51:31 +00:00
Budibase Staging Release Bot 9dbadcd671 v1.0.46-alpha.1 2022-01-20 18:46:28 +00:00
Andrew Kingston e2fb5f51f5 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-20 18:44:04 +00:00
Andrew Kingston 6a7aed1c0d Update parts of builder with core API refactor 2022-01-20 18:42:30 +00:00
Andrew Kingston b0d24d7c07 Merge pull request #4086 from Budibase/ak-fixes
Fixes for multi-selects and data fetching
2022-01-20 18:39:40 +00:00
mike12345567 963cf5b4ed Merge branch 'fix/data-filtering' of github.com:Budibase/budibase into feature/formula-filtering 2022-01-20 18:07:51 +00:00
mike12345567 23a9fc709f Minor fix, when testing the filtering the data section noticed some stuff didn't work, like filtering by just a number (which is actually text) we fixed this previously but had to version the API to fix it, builder needed to send up the API version it desires to use. 2022-01-20 18:06:14 +00:00
mike12345567 50eff577f9 Getting the static formulas being processed on input, not re-processing on output. 2022-01-20 18:04:44 +00:00
Rory Powell 52a81ff75c Remove self hosted check 2022-01-20 17:36:54 +00:00
Rory Powell 4a5d4527e8 Remove self hosted check 2022-01-20 17:29:15 +00:00
Rory Powell 58bcba71f7 Send url to api and honour url on viewing published app 2022-01-20 17:27:56 +00:00
Budibase Staging Release Bot f927117582 v1.0.46-alpha.0 2022-01-20 17:10:09 +00:00
mike12345567 d565819494 Merge branch 'develop' of github.com:Budibase/budibase into feature/formula-filtering 2022-01-20 17:05:51 +00:00
mike12345567 8d95d9b603 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-01-20 17:03:21 +00:00
Budibase Release Bot 6c22ccb149 v1.0.45 2022-01-20 16:33:40 +00:00
Rory Powell 6e5957a01a validator tweak 2022-01-20 16:25:09 +00:00
Rory Powell 4fb9a4aa59 validator tweak 2022-01-20 16:20:58 +00:00
Rory Powell fe374c0439 Merge fix and linting 2022-01-20 16:17:09 +00:00
mike12345567 c66b9fb0b4 Renaming bindableOptions to bindings and replacing the query bindings variable with queryBindings. 2022-01-20 16:12:32 +00:00
Rory Powell 998afad950 Merge branch 'develop' into feature/app-urls 2022-01-20 16:09:14 +00:00
Rory Powell bc67974996 Share validation between app modals, add yup based validation framework, add url to app modals 2022-01-20 16:01:09 +00:00
mike12345567 06a6001f95 Fix for #4126 - wrong bindings were being passed to the drawer, making sure correct ones are available. 2022-01-20 15:44:39 +00:00
mike12345567 c04379eaea Fixing issue with dynamic/static formula types not being stored. 2022-01-20 15:16:27 +00:00
mike12345567 3075c7dbe7 Merge branch 'develop' of github.com:Budibase/budibase into feature/formula-filtering 2022-01-20 14:37:22 +00:00
Andrew Kingston b74815d41b Add URL to error objects 2022-01-20 14:27:43 +00:00
Maurits Lourens 186f1c9a7d Merge branch 'develop' into worker_typescript 2022-01-20 15:26:42 +01:00
Budibase Staging Release Bot 96d8e6d68e v1.0.44-alpha.9 2022-01-20 14:01:03 +00:00
Andrew Kingston 21443b0e53 Tidy core API client 2022-01-20 13:55:07 +00:00
Peter Clement 41b4045f7b Merge pull request #4112 from Budibase/fix/template-row-limit
Home Screen UI fixes
2022-01-20 13:53:52 +00:00
Andrew Kingston 9f180ca292 Fix issue with search fields in builder when not using a table 2022-01-20 13:37:33 +00:00
Andrew Kingston d3a4e34b3f Don't show a notification if there is no error message 2022-01-20 13:37:20 +00:00
Andrew Kingston 978c3984e9 Extract error mesages better when throwing errors in core api client 2022-01-20 13:37:06 +00:00
Budibase Staging Release Bot 62873fbb8d v1.0.44-alpha.8 2022-01-20 12:33:48 +00:00
Peter Clement 1b147bfad8 Merge remote-tracking branch 'origin/develop' into fix/template-row-limit 2022-01-20 12:30:41 +00:00
mike12345567 47799b8ef3 Adding fix to show the initial create table modal when a new app is created, the same as prod, when testing in cypress. 2022-01-20 12:29:28 +00:00
mike12345567 5638e92ab5 Fixing cypress tests, removing change which was added to try and fix reverted test cases. 2022-01-20 12:26:59 +00:00
Andrew Kingston 86e0e8acc2 Fix DND throwing errors due to browser API updates 2022-01-20 11:52:29 +00:00
Peter Clement bc521af082 fix cypress createApp command 2022-01-20 11:51:41 +00:00
Andrew Kingston d494e53786 Remove static functions from data fetch models 2022-01-20 11:50:18 +00:00
Andrew Kingston a3d6af7b9f Update usage of fetch client app route endpoint 2022-01-20 11:30:51 +00:00
Andrew Kingston c7e98623bc Update usage of DataFetching in client apps 2022-01-20 11:29:30 +00:00
Andrew Kingston 6a07e727cd Fix recursion issue with applying API method patches 2022-01-20 11:26:43 +00:00
Andrew Kingston 1ec3a91cae Update usages of utils and helpers in the builder 2022-01-20 11:19:37 +00:00
Andrew Kingston aab7adce03 Update remaining dependency issues in client 2022-01-20 10:16:13 +00:00
Andrew Kingston e3258a0caf Add helpers into BBUI rather than frontend core and fix A11y issue 2022-01-20 10:14:39 +00:00
Andrew Kingston 5fad127f94 Update remaining usage of API in client library 2022-01-20 09:57:57 +00:00
Peter Clement 09611d3aad Merge remote-tracking branch 'origin/develop' into fix/template-row-limit 2022-01-20 09:53:39 +00:00
Peter Clement 0802522106 Merge branch 'fix/template-row-limit' of github.com:Budibase/budibase into fix/template-row-limit 2022-01-20 09:45:31 +00:00
Peter Clement 27a8fefaa4 fix cypress 2022-01-20 09:44:40 +00:00
Andrew Kingston 6e58820b45 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-20 09:43:23 +00:00
Andrew Kingston ff97e5af43 Update builder to reference assets in frontend core 2022-01-20 09:41:05 +00:00
Andrew Kingston 6694bdc651 Add core API implementation and update most of client library to use it 2022-01-20 09:40:53 +00:00
Maurits Lourens 2577a6631a run prettier + lint over typescript files as well 2022-01-20 09:17:08 +01:00
Maurits Lourens 8fa522cff0 add typescript support to worker 2022-01-20 09:15:46 +01:00
Rory Powell 539bce8aed Add creatingApp && loaded checks 2022-01-20 07:23:13 +00:00
Maurits Lourens 000d2c5ad4 add typescript support 2022-01-19 23:44:17 +01:00
Peter Clement 094df5922d fix export button size 2022-01-19 19:45:19 +00:00
Peter Clement d4463fc0f3 add splash screen for apps page 2022-01-19 19:40:28 +00:00
mike12345567 249b10a605 Adding in static/dynamic select, as well as the ability to set a tooltip on a select. 2022-01-19 18:33:58 +00:00
Peter Clement b0b8e568ce remove uneeded app creation modal 2022-01-19 18:29:09 +00:00
Budibase Staging Release Bot e8915adc61 v1.0.44-alpha.7 2022-01-19 15:25:19 +00:00
Peter Clement a9d7a19cb5 fix issue with templates showing over more than two rows 2022-01-19 15:22:55 +00:00
Martin McKeaveney 5bacd7f62a Merge branch 'develop' of github.com:Budibase/budibase into develop 2022-01-19 16:19:42 +01:00
Martin McKeaveney 9c54872fa9 revert new cypress tests 2022-01-19 16:19:02 +01:00
Budibase Staging Release Bot d8c44be3c3 v1.0.44-alpha.6 2022-01-19 15:17:21 +00:00
Martin McKeaveney 8267d31626 Revert "Small changes associated with the smoke build" 2022-01-19 16:10:22 +01:00
Budibase Staging Release Bot ba3de70639 v1.0.44-alpha.5 2022-01-19 15:08:47 +00:00
Michael Drury 84f7405f02 Merge pull request #4090 from Budibase/fix/3721
Fixing issue with existing SQL relationships and deleting tables externally to Budibase
2022-01-19 15:02:15 +00:00
Budibase Staging Release Bot a870c5b327 v1.0.44-alpha.4 2022-01-19 14:59:39 +00:00
Andrew Kingston 937518228d Merge pull request #4105 from Budibase/fix/log-out-action
Fix log out action
2022-01-19 14:54:20 +00:00
Budibase Staging Release Bot b3670e6fff v1.0.44-alpha.3 2022-01-19 14:52:46 +00:00
Maurits Lourens f5732abe55 #3397 - select radio buttons alignment setting 2022-01-19 15:23:41 +01:00
Andrew Kingston 9d4f18f1ce Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-19 13:54:39 +00:00
mike12345567 a46de08d18 Making the worker tell the UI it is in production when running in Cypress. 2022-01-19 13:05:31 +00:00
Andrew Kingston 8be7018543 Rename return URL to redirect URL in log out action 2022-01-19 12:50:07 +00:00
Andrew Kingston ce3715ccad Update log out action text 2022-01-19 12:45:15 +00:00
Budibase Staging Release Bot dddeb80cee v1.0.44-alpha.2 2022-01-19 11:49:24 +00:00
Martin McKeaveney c25c88ae58 fix lint 2022-01-19 12:42:11 +01:00
Andrew Kingston baee67d2e8 Lint 2022-01-19 11:32:56 +00:00
Andrew Kingston fa2a958e73 Fix server crash when trying to log out and already logged out 2022-01-19 11:22:44 +00:00
Andrew Kingston f6396649b5 Update log out handling to work better, and add support for navigating to a return URL 2022-01-19 11:22:27 +00:00
Andrew Kingston 8be175843a Add return URL setting to log out button action 2022-01-19 11:22:04 +00:00
mike12345567 ec95d20b21 Merge branch 'develop' of github.com:Budibase/budibase into fix/3721 2022-01-19 10:48:23 +00:00
mike12345567 7d4bea8f22 Adding comments to a few SQL table schema building functions to explain their function. 2022-01-19 10:24:15 +00:00
Budibase Release Bot fafe6f5d40 v1.0.44 2022-01-19 10:13:22 +00:00
Martin McKeaveney ce3604695c Merge branch 'master' of github.com:Budibase/budibase into feature/envoy-nginx 2022-01-19 11:09:26 +01:00
Martin McKeaveney 3d5a3e7902 Merge pull request #4088 from mslourens/attachment_field_extensions
add extensions prop to specify accepted file extensions
2022-01-19 10:33:10 +01:00
Martin McKeaveney 875a577561 don't strip secrets from DB and only hide from client 2022-01-19 10:30:22 +01:00
Andrew Kingston 8bf91e6f21 Merge pull request #4084 from bastiaanterhorst/multi-options-default-fix
Update MultiFieldSelect to accept a defaultValue
2022-01-19 08:54:39 +00:00
Bastiaan Terhorst 5b58bd9be6 set defaultValue in Field component 2022-01-19 09:19:49 +01:00
Michael Drury 9d5d8284cb Quick fix for #4093 - make sure the App ID/App URL returned for deployed apps is always lowercase, as URLs are not case sensitive and should not be compared as such. 2022-01-18 20:54:19 +00:00
Andrew Kingston 603d38ad78 Merge pull request #4033 from Budibase/fix/dynamic-validators
Fix dynamic validators not correctly validating form components
2022-01-18 19:20:27 +00:00
Mitch-Budibase 3cd58a3250 Merge pull request #4091 from Budibase/cypress-testing
Small changes associated with the smoke build
2022-01-18 17:25:38 +00:00
Mitch-Budibase 9034f23fde Small changes associated with the smoke build
Removing a line from addMultiOptionDatatype

Also adding a wait when creating an app - smoke build looks to have a timing issue with some tests
-Just a 2 second wait for now
2022-01-18 17:25:09 +00:00
mike12345567 e0949b4ac3 Fix for #3721 - deleting invalid relationships if tables have been removed external to budibase - otherwise these could not be removed without deleting the datasource. 2022-01-18 17:21:29 +00:00
Michael Drury cdaab9e989 Merge pull request #4085 from Budibase/fix/4064
Allow deleting JSON fields in JSON schema
2022-01-18 17:14:20 +00:00
Martin McKeaveney 328aef00e1 tidy up 2022-01-18 17:41:38 +01:00
Mitch-Budibase 9e168d743c Merge branch 'cypress-testing' of https://github.com/Budibase/budibase into cypress-testing 2022-01-18 16:21:19 +00:00
Mitch-Budibase 2960867cb0 lint changes 2022-01-18 16:20:54 +00:00
Maurits Lourens a4fea9ab3c add extensions prop to specify accepted file extensions 2022-01-18 17:17:31 +01:00
Martin McKeaveney 85d672c5d7 table management functions 2022-01-18 17:15:29 +01:00
Mitch-Budibase a431f88dfc Merge branch 'develop' into cypress-testing 2022-01-18 16:13:51 +00:00
Mitch-Budibase bd82ce9704 Table Test fix - Add row to table
Fixing the command associated with adding a row to a table
2022-01-18 16:12:53 +00:00
Mitch-Budibase e4da48eb8a Merge branch 'cypress-testing' of https://github.com/Budibase/budibase into cypress-testing 2022-01-18 16:02:49 +00:00
Mitch-Budibase 9a7286568a Structural Changes + New Test
Structural changes surrounding data sources
-Cypress env file removed
-Text change for fetching tables
-Oracle tests organised
-PostgreSQL tests organised

New test is for skipping table fetch via button

There are a few other smaller changes
2022-01-18 16:02:42 +00:00
Rory Powell 604d316834 Add dryRun to automation row create and remove env conditional on delete 2022-01-18 15:53:55 +00:00
Bastiaan Terhorst 7ed18caa31 also set defaultValue 2022-01-18 16:48:08 +01:00
Rory Powell fc043e116d Support template and app import in quotas + logging 2022-01-18 15:37:16 +00:00
Budibase Staging Release Bot 3c4fee31e3 v1.0.44-alpha.1 2022-01-18 15:36:05 +00:00
Andrew Kingston 37a8d213e6 Fix data fetch for nested providers, JSON arrays or array fields not working 2022-01-18 15:34:10 +00:00
Michael Drury 8873cffb17 Merge pull request #4082 from mslourens/cancel_rename_column
reset field.name to originalName after cancel
2022-01-18 15:29:39 +00:00
Andrew Kingston 69d25e8a14 Merge branch 'develop' of github.com:Budibase/budibase into ak-fixes 2022-01-18 15:27:14 +00:00
Andrew Kingston 6870c3067a Revert changes to MultiFieldSelect 2022-01-18 15:25:43 +00:00
mike12345567 8092068aaa Fixing issue #4064 - making it possible to delete JSON fields. 2022-01-18 15:24:42 +00:00
Andrew Kingston 7b9d6c8849 Merge pull request #4083 from mslourens/save_non_required_multiselect
make empty array valid when not required
2022-01-18 15:24:12 +00:00
Rory Powell 439fa9a010 Refactor to allow for future quota migrations 2022-01-18 14:43:24 +00:00
Budibase Staging Release Bot 3a49483eca v1.0.44-alpha.0 2022-01-18 14:31:59 +00:00
mike12345567 d93617d3c7 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-01-18 14:25:30 +00:00
Bastiaan Terhorst d2ffc2e920 Update MultiFieldSelect to accept a defaultValue
This changes the multi select control to accept defaultValues. As these are passed in as strings (flattened arrays in the form of "1, 2, 3") they need to be split into an array to be accepted by the control.
2022-01-18 15:04:40 +01:00
Andrew Kingston c3450a3e1e Fix issue with array field validation 2022-01-18 13:20:28 +00:00
Andrew Kingston c8121ed0e3 Transform the output of JS expressions to be actual types rather than strings 2022-01-18 13:20:06 +00:00
Andrew Kingston c91439ac43 Derive safe array-like value as the default value for multi-select fields 2022-01-18 13:19:41 +00:00
Budibase Staging Release Bot 5004e81168 v1.0.27-alpha.24 2022-01-18 13:16:22 +00:00
Michael Drury 7cf78f8c8b Merge pull request #4073 from Budibase/feature/sql-relationship-filtering
SQL relationship filtering
2022-01-18 13:10:58 +00:00
Rory Powell 79c10fba7c Account for duplicate row ids caused by app import 2022-01-18 12:48:54 +00:00
Rory Powell 4d61e84c2b Handle table deletion and data import 2022-01-18 11:57:20 +00:00
mike12345567 63ffdc5d9b Updating variable naming in table fetch function to match more with what is actually being retrieved. 2022-01-18 10:43:21 +00:00
Maurits Lourens d9ecd3e3b3 make empty array valid when not required 2022-01-18 11:38:39 +01:00
Budibase Staging Release Bot 8798f5cf37 v1.0.27-alpha.23 2022-01-18 09:45:46 +00:00
Maurits Lourens 77d0a556bd reset field.name to originalName after cancel 2022-01-18 10:45:37 +01:00
Andrew Kingston 0201841b90 Add initial work on frontend-core refactor 2022-01-18 09:39:19 +00:00
Martin McKeaveney cd92edd736 Merge pull request #4079 from mslourens/delete_renamed_column
use deleteColName when deleting a column
2022-01-18 10:39:13 +01:00
Martin McKeaveney 4ff339cae2 removing comment 2022-01-18 10:30:54 +01:00
Martin McKeaveney 73262179ef refactored middleware to be more generic 2022-01-18 10:25:59 +01:00
Budibase Staging Release Bot 2c11661c61 v1.0.27-alpha.22 2022-01-18 08:59:52 +00:00
Maurits Lourens d2688124f4 use deleteColName when deleting a column 2022-01-18 09:53:15 +01:00
Maurits Lourens 68986fba3a fix schema constraint mapping to validation rule 2022-01-17 23:23:36 +01:00
mike12345567 332e5b2672 Adding SQL test case for SQL relationship filtering. 2022-01-17 18:20:37 +00:00
Rory Powell ff887f8f88 Sync row usage with app deletion 2022-01-17 18:07:26 +00:00
Budibase Staging Release Bot 7335a6ab5e v1.0.27-alpha.21 2022-01-17 18:01:17 +00:00
Michael Drury c0f4a0e475 Merge pull request #4045 from Budibase/dependabot/npm_and_yarn/packages/string-templates/marked-4.0.10
Bump marked from 2.1.3 to 4.0.10 in /packages/string-templates
2022-01-17 17:54:50 +00:00
mike12345567 cde801d99b Adding dynamic filter capabilities, also updating search field select in builder to make sure it removes banned search field types. 2022-01-17 16:48:49 +00:00
Budibase Release Bot e3d8302194 v1.0.43 2022-01-17 16:42:48 +00:00
Martin McKeaveney 1f78d6dc0d readding query thread timeout 2022-01-17 15:57:31 +01:00
Martin McKeaveney 9663806bfc more flexible datasource auth config 2022-01-17 15:52:10 +01:00
Andrew Kingston 54ce8d8386 Merge branch 'feature/sql-relationship-filtering' of github.com:Budibase/budibase into feature/sql-relationship-filtering 2022-01-17 14:04:19 +00:00
Andrew Kingston 0502e62e1c Add optional enrichment of relationship fields when determining datasource schema and update block filters to properly reference relationship fields 2022-01-17 14:03:47 +00:00
mike12345567 29fbfe7b95 Merge branch 'develop' of github.com:Budibase/budibase into feature/sql-relationship-filtering 2022-01-17 13:34:16 +00:00
Rory Powell 8fc60af820 Calculate total rows in migration, centralise quota enabled logic and tidy to use env vars only 2022-01-17 12:44:53 +00:00
Budibase Staging Release Bot b77be977dd v1.0.27-alpha.20 2022-01-17 10:15:17 +00:00
Rory Powell 0f6e626005 Merge pull request #4022 from Budibase/fix/return-url
Fix return url
2022-01-17 10:09:38 +00:00
Rory Powell f3ac142870 Remove console.log statements 2022-01-17 09:53:53 +00:00
Budibase Release Bot 2a8cbb8805 v1.0.42 2022-01-17 08:48:49 +00:00
Martin McKeaveney c39bbf46fb Revert "sameSite and secure cookie settings" 2022-01-17 09:39:22 +01:00
Martin McKeaveney a70b96a21a gsheets E2E 2022-01-15 19:28:04 +01:00
dependabot[bot] 8740ed890e Bump marked from 2.1.3 to 4.0.10 in /packages/string-templates
Bumps [marked](https://github.com/markedjs/marked) from 2.1.3 to 4.0.10.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v2.1.3...v4.0.10)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-15 03:29:34 +00:00
mike12345567 aae2dc86d3 Getting client partially working, having an issue with search fields not updating for a table block. 2022-01-14 17:42:14 +00:00