Commit Graph

114 Commits

Author SHA1 Message Date
Andrew Kingston 17da8f192f Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-06-07 08:45:57 +01:00
Mel O'Hagan 33309c0fb7 Added snowflake-promise 2022-06-01 11:58:17 +01:00
Andrew Kingston 6b905da588 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-27 13:32:07 +01:00
mike12345567 12a3af4583 Merge branch 'master' of github.com:Budibase/budibase into dep/node-gyp 2022-05-27 12:45:11 +01:00
mike12345567 003861dc4f Adding node-gyp dependencies to dockerfiles. 2022-05-27 11:35:55 +01:00
Rory Powell 967fc8a397 Fix provisioning in multi tenant environment 2022-05-27 10:51:23 +01:00
mike12345567 157802b70a Swapping bcryptjs for bcrypt. 2022-05-25 16:14:45 +01:00
Andrew Kingston 4f1f2abf21 Merge branch 'new-design-ui' of github.com:Budibase/budibase into new-design-ui 2022-05-25 13:50:04 +01:00
Andrew Kingston 245a074317 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-25 13:49:28 +01:00
Rory Powell 6aea03fd44 Fix build 2022-05-24 20:09:22 +01:00
Andrew Kingston f4eb6f36bd Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-24 13:36:13 +01:00
Rory Powell 105785a754 Fix pro and core versions 2022-05-24 10:11:55 +01:00
Andrew Kingston 949ab2dac6 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-24 09:47:00 +01:00
mike12345567 d535afa542 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-05-23 23:43:57 +01:00
Martin McKeaveney 73404a6fb3 prevent issue with TTL dependency import 2022-05-23 17:38:02 +01:00
mike12345567 100f5a6f3c Moving the withCache function to backend-core so that it can be shared, as well as adding a cache busting function which can be used when one of the checklist configs changes. 2022-05-23 15:03:52 +01:00
Andrew Kingston a494aec6c6 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-23 11:54:24 +01:00
mike12345567 223a3ae5e0 Adding user load testing script. 2022-05-22 17:14:24 +01:00
mike12345567 7437eb4513 Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage 2022-05-19 10:45:26 +01:00
Andrew Kingston 109ca7dbef Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-19 09:11:13 +01:00
mike12345567 39806d470d Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage 2022-05-18 10:56:44 +01:00
mike12345567 36a190b0ed Finishing off UI, expanding settings menus from 80ch to 90ch as they were quite restricted and made the usage UI a bit difficult to view. Added a DISABLE_DEVELOPER_LICENSE env variable for testing. 2022-05-17 17:44:40 +01:00
Andrew Kingston 0133aabc46 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-17 12:59:15 +01:00
Rory Powell f549f38b16 Add explicit bson dependency version instead of * to fix build 2022-05-17 11:03:54 +01:00
Rory Powell a056027bf3 Fix release build 2022-05-17 10:11:58 +01:00
Rory Powell eb935cf143 Fix tests and build 2022-05-17 10:05:05 +01:00
mike12345567 bcf7e1782a Fixing test cases. 2022-05-16 12:31:07 +01:00
Rory Powell 20076e69d7 Update lockfiles 2022-05-12 15:51:14 +01:00
Rory Powell a269f123a1 Bump pro 2022-05-11 11:57:55 +01:00
Andrew Kingston e25123eade Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-11 09:07:35 +01:00
Rory Powell f5da1a04e2 Add query quota increment to rows CRUD 2022-05-10 21:59:39 +01:00
mike12345567 1b1938950f Merge branch 'master' of github.com:Budibase/budibase into fix/5778 2022-05-09 13:46:38 +01:00
Rory Powell 150c4c3937 Fix pro version 2022-05-09 12:55:13 +01:00
mike12345567 7b461c03dd Fixing issue #5778 - making sure to only remove the first app_ element of the app ID. 2022-05-09 12:29:44 +01:00
Andrew Kingston ba8d8bfd1b Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-09 09:41:28 +01:00
Rory Powell a35824d50e Fix lockfile 2022-05-05 10:04:33 +01:00
Andrew Kingston c18f66452c Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-05-05 08:26:37 +01:00
mike12345567 6ffeaab597 Fixing an issue with JSONparse helper always being considered invalid due to a lack of input. 2022-05-04 12:14:01 +01:00
mike12345567 d666ad3126 Fix for automation issue, doInAppContext for automation thread wasn't async, was immediately closing the database, rather than waiting for the operations to complete. 2022-05-03 15:54:03 +01:00
mike12345567 107c9e2dfc Fix for #5553 - when importing for SQL databases attempt to manage date and time only column times, handle these when displaying in tables and when filtering. 2022-05-03 14:11:06 +01:00
Rory Powell f7b568d37f Add workflow_dispatch to ci, release-develop and release 2022-05-03 13:27:22 +01:00
Andrew Kingston ff6f02dda4 Add support for instant updating of navigation settings in client apps 2022-04-28 17:30:48 +01:00
mike12345567 4a02f7f9aa Fix for issue being able to delete apps. 2022-04-27 15:58:55 +01:00
Rory Powell 51ca618558 Decrement pro version to pass release 2022-04-27 10:09:59 +01:00
Andrew Kingston 76feddfaff Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui 2022-04-27 07:59:37 +01:00
Michael Drury 8e786bfd53 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-04-26 20:10:26 +01:00
Rory Powell 0f29b0cb03 Test fixes 2022-04-26 15:07:21 +01:00
Martin McKeaveney e01ef9bdfb merge with master 2022-04-26 10:21:45 +01:00
Rory Powell b7cbd2a56a Fix developer count migration when only single developer 2022-04-25 15:38:37 +01:00
Andrew Kingston f463a8d661 Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui-dirty 2022-04-25 14:38:52 +01:00