Commit Graph

11558 Commits

Author SHA1 Message Date
Martin McKeaveney 56cd47e65e Merge branch 'master' of github.com:Budibase/budibase 2022-02-09 15:50:55 +01:00
Martin McKeaveney 4da84cdbd3 Merge branch 'master' of github.com:Budibase/budibase 2022-02-09 15:50:55 +01:00
Michael Drury 8a10e31762
Merge branch 'develop' into frontend-core 2022-02-09 14:42:05 +00:00
Michael Drury 1cc32e42c0 Merge branch 'develop' into frontend-core 2022-02-09 14:42:05 +00:00
Martin McKeaveney 5fde3ac339 fixing bug with gsheets 2022-02-09 15:41:20 +01:00
Martin McKeaveney 375deb5ee9 fixing bug with gsheets 2022-02-09 15:41:20 +01:00
Budibase Staging Release Bot 091100f935 v1.0.50-alpha.5 2022-02-09 14:38:55 +00:00
Budibase Staging Release Bot fcddaf1f73 v1.0.50-alpha.5 2022-02-09 14:38:55 +00:00
Budibase Release Bot ad8268ff4a v1.0.53 2022-02-09 14:27:35 +00:00
Budibase Release Bot c941ecad1e v1.0.53 2022-02-09 14:27:35 +00:00
Andrew Kingston 8f2aca7188 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-09 14:24:05 +00:00
Andrew Kingston 91ef045396 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-09 14:24:05 +00:00
Mitch-Budibase 268a6c9e09 Merge branch 'cypress-testing' of https://github.com/Budibase/budibase into cypress-testing 2022-02-09 14:17:17 +00:00
Mitch-Budibase fffe369781 Stripping out another test spec file
Temporary removal of radio buttons tests
2022-02-09 14:17:03 +00:00
Mitch-Budibase 0e0e4bb065
Merge branch 'develop' into cypress-testing 2022-02-09 13:53:17 +00:00
Mitch-Budibase 39ebebcb3c temporarily stripping tests to review CI against tests
Many tests are failing against the CI
-I'm stripping a lot out for now to verify the CI going green
2022-02-09 12:56:27 +00:00
mike12345567 0890c3d001 Merge branch 'develop' of github.com:Budibase/budibase into fix/feb-fixes 2022-02-09 12:48:53 +00:00
mike12345567 70c9782e9a Merge branch 'develop' of github.com:Budibase/budibase into fix/feb-fixes 2022-02-09 12:48:53 +00:00
Budibase Release Bot e7ff20a6a5 v1.0.52 2022-02-08 17:19:05 +00:00
Budibase Release Bot 4ab5ef95ee v1.0.52 2022-02-08 17:19:05 +00:00
mike12345567 ea1b65fde8 Updating the tooltip button to have an info icon like the labels on the right instead. 2022-02-08 17:17:00 +00:00
mike12345567 6199f06ea9 Updating the tooltip button to have an info icon like the labels on the right instead. 2022-02-08 17:17:00 +00:00
Budibase Staging Release Bot 0829723d99 v1.0.50-alpha.4 2022-02-08 16:13:59 +00:00
Budibase Staging Release Bot 14b0ef2ec5 v1.0.50-alpha.4 2022-02-08 16:13:59 +00:00
Budibase Release Bot 251a8e313c v1.0.51 2022-02-08 16:06:53 +00:00
Budibase Release Bot 7dbb77fcff v1.0.51 2022-02-08 16:06:53 +00:00
Budibase Staging Release Bot 1d2fc68b20 v1.0.50-alpha.3 2022-02-08 15:32:30 +00:00
Budibase Staging Release Bot c229768b72 v1.0.50-alpha.3 2022-02-08 15:32:30 +00:00
mike12345567 3d8354d155 Merge branch 'develop' of github.com:Budibase/budibase into fix/feb-fixes 2022-02-08 15:12:04 +00:00
mike12345567 d021883f43 Merge branch 'develop' of github.com:Budibase/budibase into fix/feb-fixes 2022-02-08 15:12:04 +00:00
Budibase Staging Release Bot 694ac5e79e v1.0.50-alpha.2 2022-02-08 14:51:54 +00:00
Budibase Staging Release Bot 10077bdde2 v1.0.50-alpha.2 2022-02-08 14:51:54 +00:00
mike12345567 604c3a69cc Merge branch 'develop' of github.com:Budibase/budibase into fix/feb-fixes 2022-02-08 12:28:27 +00:00
mike12345567 36bd285093 Merge branch 'develop' of github.com:Budibase/budibase into fix/feb-fixes 2022-02-08 12:28:27 +00:00
Budibase Staging Release Bot c4f67ea142 v1.0.50-alpha.1 2022-02-08 11:53:04 +00:00
Budibase Staging Release Bot 5aa0b87e17 v1.0.50-alpha.1 2022-02-08 11:53:04 +00:00
Budibase Release Bot fc00b828d8 v1.0.50 2022-02-08 10:01:04 +00:00
Budibase Release Bot 00234cf186 v1.0.50 2022-02-08 10:01:04 +00:00
Andrew Kingston e6ed16f274 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-08 08:12:37 +00:00
Andrew Kingston d90ccc26c7 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-08 08:12:37 +00:00
Budibase Staging Release Bot a076d7ccf1 v1.0.50-alpha.0 2022-02-07 20:42:24 +00:00
Budibase Staging Release Bot 8bf26bed76 v1.0.50-alpha.0 2022-02-07 20:42:24 +00:00
Martin McKeaveney c17a7edd65 merge 2022-02-07 21:24:44 +01:00
Martin McKeaveney 3742c7dc91 merge 2022-02-07 21:24:44 +01:00
mike12345567 cb1eef3c57 Removing empty block. 2022-02-07 18:47:49 +00:00
mike12345567 580d3d9615 Removing empty block. 2022-02-07 18:47:49 +00:00
mike12345567 2f3af46222 Fix for both #4167, allow saving but warn if never sent and #4165 save the query name when clicking name save icon. 2022-02-07 18:47:10 +00:00
mike12345567 007a1240d5 Fix for both #4167, allow saving but warn if never sent and #4165 save the query name when clicking name save icon. 2022-02-07 18:47:10 +00:00
mike12345567 9298071cc2 Addomg a fix for #4370 - allow queries to contain newlines, they will always be escaped. 2022-02-07 17:56:01 +00:00
mike12345567 a35a8cb81c Addomg a fix for #4370 - allow queries to contain newlines, they will always be escaped. 2022-02-07 17:56:01 +00:00
Budibase Staging Release Bot 75bc7555b1 v1.0.49-alpha.16 2022-02-07 16:54:28 +00:00
Budibase Staging Release Bot d91efb9678 v1.0.49-alpha.16 2022-02-07 16:54:28 +00:00
Budibase Staging Release Bot 7cbbf56a93 v1.0.49-alpha.15 2022-02-07 15:46:09 +00:00
Budibase Staging Release Bot 6881cee40e v1.0.49-alpha.15 2022-02-07 15:46:09 +00:00
Andrew Kingston 04d53a709c Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-07 14:45:14 +00:00
Andrew Kingston 2969f2d24c Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-07 14:45:14 +00:00
Andrew Kingston f0616a6826 Merge branch 'develop' of github.com:Budibase/budibase into feature/real-rich-text 2022-02-07 12:13:29 +00:00
Andrew Kingston d78e6a5e59 Merge branch 'develop' of github.com:Budibase/budibase into feature/real-rich-text 2022-02-07 12:13:29 +00:00
Andrew Kingston a575763bf6 Use automatic formatting for generated longform fields 2022-02-07 12:11:20 +00:00
Andrew Kingston 3b6128f33f Use automatic formatting for generated longform fields 2022-02-07 12:11:20 +00:00
Andrew Kingston a96ef98e39 Add rich text option to long form data type 2022-02-07 12:04:43 +00:00
Andrew Kingston d12cd2abdf Add rich text option to long form data type 2022-02-07 12:04:43 +00:00
Budibase Staging Release Bot f625828b58 v1.0.49-alpha.14 2022-02-07 10:52:24 +00:00
Budibase Staging Release Bot 22a685aade v1.0.49-alpha.14 2022-02-07 10:52:24 +00:00
Budibase Staging Release Bot db3f93e8a9 v1.0.49-alpha.13 2022-02-07 10:27:31 +00:00
Budibase Staging Release Bot 2a5e169b7c v1.0.49-alpha.13 2022-02-07 10:27:31 +00:00
Michael Drury bc8f880552
Merge pull request #4328 from Budibase/fix/3928
Fix for SQL Server - fix pagination issue
2022-02-07 10:20:33 +00:00
Michael Drury 48953c0953 Merge pull request #4328 from Budibase/fix/3928
Fix for SQL Server - fix pagination issue
2022-02-07 10:20:33 +00:00
mike12345567 86e6223e5a Fixing an issue with search field select erroring in builder when using queries in blocks. 2022-02-04 16:56:12 +00:00
mike12345567 e74621f327 Fixing an issue with search field select erroring in builder when using queries in blocks. 2022-02-04 16:56:12 +00:00
Andrew Kingston e65ee63a9e Merge branch 'develop' of github.com:Budibase/budibase into feature/real-rich-text 2022-02-04 13:53:01 +00:00
Andrew Kingston 90514af833 Merge branch 'develop' of github.com:Budibase/budibase into feature/real-rich-text 2022-02-04 13:53:01 +00:00
Budibase Staging Release Bot 77f938b856 v1.0.49-alpha.12 2022-02-04 13:16:25 +00:00
Budibase Staging Release Bot 508d7d1738 v1.0.49-alpha.12 2022-02-04 13:16:25 +00:00
Budibase Release Bot 80ae9a30b1 v1.0.49 2022-02-04 12:19:39 +00:00
Budibase Release Bot 2dea8789e8 v1.0.49 2022-02-04 12:19:39 +00:00
Budibase Staging Release Bot 3cd20cfa72 v1.0.49-alpha.11 2022-02-04 11:10:37 +00:00
Budibase Staging Release Bot 0f11aea9d4 v1.0.49-alpha.11 2022-02-04 11:10:37 +00:00
Budibase Staging Release Bot 3da9cf2220 v1.0.49-alpha.10 2022-02-04 10:32:31 +00:00
Budibase Staging Release Bot 0b91bfdf85 v1.0.49-alpha.10 2022-02-04 10:32:31 +00:00
Andrew Kingston f5197df8b4 Reset the builder store whenever unmounting the app root layout 2022-02-04 09:29:51 +00:00
Andrew Kingston 2c0af72cd4 Reset the builder store whenever unmounting the app root layout 2022-02-04 09:29:51 +00:00
Andrew Kingston 18e5be9a06 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-04 09:23:32 +00:00
Andrew Kingston a3eef9f534 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-04 09:23:32 +00:00
Budibase Staging Release Bot 797136cabc v1.0.49-alpha.9 2022-02-03 20:58:29 +00:00
Budibase Staging Release Bot 47dc1ac540 v1.0.49-alpha.9 2022-02-03 20:58:29 +00:00
Michael Drury efe52a6346
Merge pull request #4297 from Budibase/fix/4255
Some small SQL core fixes
2022-02-03 20:29:38 +00:00
Michael Drury 6f79bc53e0 Merge pull request #4297 from Budibase/fix/4255
Some small SQL core fixes
2022-02-03 20:29:38 +00:00
mike12345567 61283e465d Fix for #4308 - triple brace conversion was not working correctly, wrote this into the string templates instead - also fixing an issue with the RBAC for Rest. 2022-02-03 18:44:34 +00:00
mike12345567 f2a025013e Fix for #4308 - triple brace conversion was not working correctly, wrote this into the string templates instead - also fixing an issue with the RBAC for Rest. 2022-02-03 18:44:34 +00:00
mike12345567 e12767fd85 Fix for #4308 - triple brace conversion was not working correctly, wrote this into the string templates instead - also fixing an issue with the RBAC for Rest. 2022-02-03 18:26:26 +00:00
mike12345567 f946f2f68d Fix for #4308 - triple brace conversion was not working correctly, wrote this into the string templates instead - also fixing an issue with the RBAC for Rest. 2022-02-03 18:26:26 +00:00
Andrew Kingston 9f2369234b Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-03 14:46:59 +00:00
Andrew Kingston 2724ce00c3 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-03 14:46:59 +00:00
Andrew Kingston bd6ae0686d Add markdown viewer component to builder 2022-02-02 21:23:39 +00:00
Andrew Kingston 9310ef08f5 Add markdown viewer component to builder 2022-02-02 21:23:39 +00:00
mike12345567 fa94ea7b3a Updating the SQL core to allow it to handle multiple relationships between the same two tables. 2022-02-02 18:15:17 +00:00
mike12345567 168a126e2a Updating the SQL core to allow it to handle multiple relationships between the same two tables. 2022-02-02 18:15:17 +00:00
Andrew Kingston 7a3683a462 Use new rich text field in build backend UI 2022-02-02 15:18:46 +00:00
Andrew Kingston 66e104f02b Use new rich text field in build backend UI 2022-02-02 15:18:46 +00:00
Budibase Staging Release Bot 86af297d87 v1.0.49-alpha.8 2022-02-02 10:59:16 +00:00
Budibase Staging Release Bot cf3e0f0fdc v1.0.49-alpha.8 2022-02-02 10:59:16 +00:00
Budibase Staging Release Bot c7d23bbf7e v1.0.49-alpha.7 2022-02-01 20:38:50 +00:00
Budibase Staging Release Bot 61e3877e08 v1.0.49-alpha.7 2022-02-01 20:38:50 +00:00
Michael Drury e1a4136f9c Fixing a typescript issue in server. 2022-02-01 20:29:12 +00:00
Michael Drury 4b23a78bc9 Fixing a typescript issue in server. 2022-02-01 20:29:12 +00:00
Andrew Kingston c3e358fead Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-01 16:52:26 +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 d132292102 Update lock files 2022-02-01 16:46:38 +00:00
Andrew Kingston e0ed191f49 Update lock files 2022-02-01 16:46:38 +00:00
Andrew Kingston 312571314d Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-01 16:46:00 +00:00
Andrew Kingston de12e0dc79 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-01 16:46:00 +00:00
Budibase Staging Release Bot 7f6bc74ccc v1.0.49-alpha.6 2022-02-01 16:32:31 +00:00
Budibase Staging Release Bot 7852960a03 v1.0.49-alpha.6 2022-02-01 16:32:31 +00:00
mike12345567 b3b982fa8f Making sure worker runs through ts-node in cypress, locally, then built in CI. 2022-02-01 16:02:44 +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 53aabb4d05 Merge branch 'develop' of github.com:Budibase/budibase into lab-day/refactor-app-db 2022-02-01 14:33:02 +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
Martin McKeaveney 394eb44b5f merge 2022-02-01 11:22:14 +01:00
Martin McKeaveney c11e26cb2e merge 2022-02-01 11:22:14 +01:00
Budibase Staging Release Bot beefc0158c v1.0.49-alpha.5 2022-02-01 10:11:29 +00:00
Budibase Staging Release Bot bc781128d6 v1.0.49-alpha.5 2022-02-01 10:11:29 +00:00
Rory Powell 0716f18f76 Revert "build app before running e2e tests"
This reverts commit 75ef92d645.
2022-02-01 06:40:07 +00: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 75ef92d645 build app before running e2e tests 2022-01-31 23:13:42 +01:00
Maurits Lourens 6eca23541f build app before running e2e tests 2022-01-31 23:13:42 +01:00
Budibase Staging Release Bot c991f284e3 v1.0.49-alpha.4 2022-01-31 19:12:15 +00:00
Budibase Staging Release Bot 9abefd5b63 v1.0.49-alpha.4 2022-01-31 19:12:15 +00:00
Budibase Staging Release Bot 9a271e74c1 v1.0.49-alpha.3 2022-01-31 17:55:54 +00:00
Budibase Staging Release Bot 7aab9d3e40 v1.0.49-alpha.3 2022-01-31 17:55:54 +00:00
mike12345567 09cfa9508e Merge branch 'develop' of github.com:Budibase/budibase into lab-day/refactor-app-db 2022-01-31 17:16:59 +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 da87b3d73e Merge branch 'develop' of github.com:Budibase/budibase into lab-day/refactor-app-db 2022-01-31 17:00:22 +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 cb6189e76b v1.0.49-alpha.2 2022-01-31 16:54:48 +00:00
Budibase Staging Release Bot a063274133 v1.0.49-alpha.2 2022-01-31 16:54:48 +00:00
Rory Powell fc05cd240e
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
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 42660969c7
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 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
Budibase Staging Release Bot 3f8d81837d v1.0.49-alpha.1 2022-01-31 16:01:59 +00:00
Budibase Staging Release Bot 4596464b5a v1.0.49-alpha.1 2022-01-31 16:01:59 +00:00
mike12345567 c9d2de8344 Merge branch 'develop' of github.com:Budibase/budibase into lab-day/refactor-app-db 2022-01-31 15:33:36 +00: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 8fbd101448 Merge branch 'develop' of github.com:Budibase/budibase into feature/formula-filtering 2022-01-31 15:21:15 +00:00
mike12345567 f9c7877e02 Merge branch 'develop' of github.com:Budibase/budibase into feature/formula-filtering 2022-01-31 15:21:15 +00:00
Budibase Staging Release Bot 27d295ae31 v1.0.49-alpha.0 2022-01-31 14:39:05 +00:00
Budibase Staging Release Bot 4b9acb21ae v1.0.49-alpha.0 2022-01-31 14:39:05 +00:00
mike12345567 712382af07 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-01-31 14:29:02 +00:00
mike12345567 d55005d327 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-01-31 14:29:02 +00:00