CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-08-20 20:41:37 +12:00
Code Issues Projects Releases Wiki Activity
9701 commits 85 branches 2905 tags 907 MiB
Commit graph

1088 commits

Author SHA1 Message Date
Peter Clement
4869ecbf3a add splash screen to automation 2021-09-15 00:43:25 +01:00
Andrew Kingston
7ded058831 Update styles in normal user app portal 2021-09-14 16:38:47 +01:00
Andrew Kingston
b3fa4e61e3 Make apps table in portal mobile friendly 2021-09-14 16:21:30 +01:00
Rory Powell
33090a2521 Move account portal redirect to top of auth level 2021-09-14 15:57:34 +01:00
Rory Powell
011193a3dc Navigate between budibase and account portal 2021-09-14 15:49:59 +01:00
Rory Powell
689065d2b8 Redirect to account portal login page in the cloud 2021-09-14 14:18:13 +01:00
Rory Powell
73981680ba Replace 'sandbox' with 'cloud' in builder, reuse 'SELF_HOSTED' flag 2021-09-14 13:03:38 +01:00
Andrew Kingston
cc64b3f9b8 Improve email template screen layout 2021-09-14 12:36:29 +01:00
Andrew Kingston
11962bb5fa Update updates page to be mobile friendly and look better 2021-09-14 12:28:23 +01:00
Andrew Kingston
d0898a4ac4 Update theming page to be mobile friendly 2021-09-14 12:28:07 +01:00
Andrew Kingston
4cb209f384 Make portal organisation page mobile friendly 2021-09-13 16:59:15 +01:00
Andrew Kingston
fe3a53891a Increase z-index of mobile drawer menu to fix email editor overlapping it 2021-09-13 16:45:23 +01:00
Andrew Kingston
b375a5a8c7 Make email template page more mobile friendly 2021-09-13 16:43:54 +01:00
Andrew Kingston
7223d4bea5 Remove unnecessary classname 2021-09-13 16:42:59 +01:00
Andrew Kingston
f5c11295c2 Make email template page somewhat mobile friendly 2021-09-13 16:42:07 +01:00
Martin McKeaveney
c958d444f6 fix for apps with undefined names 2021-09-13 16:33:26 +01:00
Andrew Kingston
9d4029c347 Make portal email config page mobile friendly 2021-09-13 16:17:48 +01:00
Andrew Kingston
c094f7526d Fix alignment of SSO configs, clean up style, make auth page mobile friendly 2021-09-13 16:15:52 +01:00
Andrew Kingston
4209d3a1cc Fix alignment and spacing of SSO providers 2021-09-13 16:05:26 +01:00
Andrew Kingston
ad4a76127e Make users page responsive 2021-09-13 16:02:09 +01:00
Andrew Kingston
09385cadc5 Reduce portal padding on mobile 2021-09-13 16:01:47 +01:00
Andrew Kingston
0c0e656b34 Make core portal layout responsive with mobile drawer menu 2021-09-13 15:38:06 +01:00
Andrew Kingston
0409e2144f Merge branch 'develop' of github.com:Budibase/budibase into responsive-preview 2021-09-09 13:56:18 +01:00
Andrew Kingston
5b1ba5d5a2 Merge branch 'develop' of github.com:Budibase/budibase into custom-theming 2021-09-09 11:57:55 +01:00
Andrew Kingston
9c50bd84e8 Align component selection list and preview controls to top of center panel 2021-09-08 09:54:10 +01:00
Andrew Kingston
acb289cc5f Add feature flag to determine support for previewing on different device sizes 2021-09-08 09:46:20 +01:00
Andrew Kingston
fbbeccc0a1 Add preview device selection buttons and pass device preview down to client app 2021-09-07 16:02:11 +01:00
Maurits Lourens
9338043133 fix test 2021-09-06 20:23:33 +02:00
Maurits Lourens
1790e777cc fix tests 2021-09-06 17:55:19 +02:00
Andrew Kingston
d1e3dda05f Add custom theme options for button roundedness and header color 2021-09-03 15:28:35 +01:00
Andrew Kingston
04a26f3344 Hide state action in old apps and add working basic implementation of theming 2021-09-02 11:38:41 +01:00
Maurits Lourens
3185ae8536 fixes uploading organisation logo 2021-08-30 23:12:19 +02:00
Peter Clement
8bfdb35ff3 linting 2021-08-18 10:37:14 +01:00
Peter Clement
af9bb40bdd fixes organisation logo not showing 2021-08-18 00:02:17 +01:00
Peter Clement
a80655df04 Bug fix for unable to navigate from sql screen 2021-08-16 09:44:15 +01:00
Peter Clement
b2bc9a5e20 Add self-hosting upgrade button to builder pane 2021-08-12 11:51:08 +01:00
mike12345567
a8eb067de3 Merge branch 'fix/apps-2195-2282-2283' of github.com:Budibase/budibase into develop 2021-08-06 17:14:31 +01:00
mike12345567
be48677490 Fixes for a lot of issues generated by the use of the pouchdb allDbs call, which is not designed for multi-client DB setups like ours, using CouchDB method instead. 2021-08-06 16:38:07 +01:00
mike12345567
bc84bab52c Merge branch 'master' of github.com:Budibase/budibase into develop 2021-08-06 13:04:54 +01:00
mike12345567
7624390f0b Fixing a variety of issues with internal relationships and external SQL relationships. 2021-08-05 19:24:29 +01:00
mike12345567
105dfb5eb9 Fixing an issue with OIDC URL for preauth. 2021-08-05 14:36:10 +01:00
mike12345567
78a3a1cd09 Fixing issue with google callback URL not being used when it was previously set. 2021-08-05 11:27:51 +01:00
mike12345567
46ea3f3e9e Revert "Merge pull request #2253 from Budibase/revert-2076-feature/multi-tenants" 
This reverts commit 4834b765be, reversing
changes made to 2456e69483.
 2021-08-05 09:59:08 +01:00
Martin McKeaveney
df927e3feb merge with master 2021-08-04 13:20:11 +01:00
mike12345567
3aac3b30d0 Linting. 2021-08-04 11:35:25 +01:00
mike12345567
a55c823768 Merge branch 'feature/multi-tenants' of github.com:Budibase/budibase into feature/multi-tenants 2021-08-04 11:17:04 +01:00
mike12345567
d4dbfc834d Removing divider from org page as per comments. 2021-08-04 11:12:57 +01:00
Michael Drury
ec26f6ab5e Merge branch 'develop' into feature/multi-tenants 2021-08-04 10:07:31 +01:00
Michael Drury
b86a6fddc9 Revert "Multi-tenancy/organisations" 2021-08-04 10:02:24 +01:00
Michael Drury
2456e69483 Merge pull request #2076 from Budibase/feature/multi-tenants 
Multi-tenancy/organisations
 2021-08-04 10:01:22 +01:00
mike12345567
e7974f7e86 Implementing some changes to how context gets set for tenancy, after testing, as well as updating server. 2021-08-03 15:32:25 +01:00
mike12345567
10bb31afd2 Linting. 2021-07-30 20:40:38 +01:00
mike12345567
af9b0a738d Fixing issues with pages reloading in weird ways. 2021-07-30 20:39:42 +01:00
mike12345567
776f176f5c Fix for issue #2167, the foreign key was not being set correctly in all scenarios for the from table in SQL relationships, our test data happened to hide this fact due to the foreign key and the key in from table having the same name. 2021-07-30 18:49:36 +01:00
Rory Powell
73d1cb41d8 Sync profile picture when using SSO 2021-07-29 14:43:23 +01:00
Martin McKeaveney
61759ab1c4 Merge pull request #2157 from mslourens/update_app_role_bug 
fix update role modal
 2021-07-28 22:38:52 +01:00
Maurits Lourens
661ba80e5c fix update role modal 2021-07-28 17:56:52 +02:00
Maurits Lourens
c9dd9594bc fix lint issue 2021-07-28 00:09:15 +02:00
mike12345567
35f1b50511 Fixing an issue where you could accidentally end up on org/admin page due to the reactivity statements firing all the time. 2021-07-27 17:56:39 +01:00
Maurits Lourens
c84cf22129 rename an app 2021-07-27 17:34:18 +02:00
mike12345567
5324f506b6 Linting. 2021-07-27 16:24:39 +01:00
mike12345567
adf6d18cb1 Fixing some issues with public endpoints causing logout loop. 2021-07-27 16:17:02 +01:00
mike12345567
615053f201 Fixing some issues with org not being correctly detected. 2021-07-27 15:35:26 +01:00
mike12345567
1b40740709 Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-27 10:32:18 +01:00
mike12345567
a279e5e504 Removing un-necessary log statements. 2021-07-26 13:40:50 +01:00
mike12345567
4606248ffd Fixing up everything found when testing with Cypress. 2021-07-26 13:19:47 +01:00
Rory Powell
c7cf415288 Merge pull request #2110 from mslourens/bug/automate_setup_menu 
Automate setup menu
 2021-07-26 09:15:45 +01:00
Maurits Lourens
98ce904b80 fix overflow in automation setup menu for large tables 2021-07-26 10:01:02 +02:00
Rory Powell
8850771a49 Add dedicateed renderer for roles tags 2021-07-25 21:14:49 +01:00
Michael Drury
3d8ac487c4 Merge branch 'develop' into new_roles_bug 2021-07-25 11:07:25 +01:00
Maurits Lourens
03ecf7f34f display role names instead of _id 2021-07-23 23:27:38 +02: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
Rory Powell
6359f3db64 Default google activated form toggle to true for older configs 2021-07-23 16:02:38 +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
5611c8e73e Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants 2021-07-22 14:27:12 +01:00
mike12345567
27b2a13817 Swapping admin -> global in worker to reduce confusion in API url naming. 2021-07-22 12:56:47 +01:00
Keviin Åberg Kultalahti
d9d08841e9 simplify check 2021-07-22 12:41:02 +02:00
Keviin Åberg Kultalahti
558b58b051 uses db to store feedback submissions status 2021-07-22 12:38:46 +02:00
mike12345567
371e38fcb9 Linting. 2021-07-21 18:24:58 +01:00
mike12345567
63368fdae9 Adding query string functionality to skip org setup. 2021-07-21 18:23:49 +01:00
mike12345567
be1558e1e7 Adding mechanism to disable org functionality when multi-tenancy disabled. 2021-07-21 17:52:42 +01:00
mike12345567
a9752c0939 Adding change org button to login page. 2021-07-21 11:47:47 +01:00
Keviin Åberg Kultalahti
60b17594f5 move cookie updating to the NPS component 2021-07-21 12:36:04 +02:00
Keviin Åberg Kultalahti
2c01db04d8 Merge branch 'develop' into feature/nps-feedback-form 2021-07-21 12:29:12 +02:00
Keviin Åberg Kultalahti
5b0557bc28 Adds last bits to NPS feedback form 2021-07-21 12:28:38 +02: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
ddfc524fcb Fixing callback URLs. 2021-07-20 17:57:07 +01:00
mike12345567
9d89362af1 Fixing some issues discovered with logging in. 2021-07-20 17:46:41 +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
1c6d455094 fix save button 2021-07-20 12:30:11 +01:00
Peter Clement
30558ad3bd only enable form save button when config has changed 2021-07-20 10:55:39 +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
mike12345567
d6ae82e719 Linting. 2021-07-16 18:26:17 +01: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
Peter Clement
8297d058b5 More error handling around config saving 2021-07-16 14:07:48 +01:00
Peter Clement
87eea284ab Better error handling around config saving 2021-07-16 10:51:58 +01:00
Rory Powell
d13b2025d5 Add Okta and OneLogin logos 2021-07-16 10:15:38 +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
Rory Powell
6f1d995cc8 Auto generate callback url and supply id on login 2021-07-14 16:21:17 +01:00
Rory Powell
3152bd1839 Invert logos config naming to prevent conflict 2021-07-14 15:48:29 +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
Rory Powell
67fbf73bdd Merge branch 'feature/oidc-support' of github.com:Budibase/budibase into feature/oidc-support 2021-07-13 17:33:08 +01:00
Rory Powell
63d119d6db Update OAuth -> Authentication header 2021-07-13 17:32:57 +01:00
Peter Clement
b31be35307 Add UUID to each oidc config to distinguish each provider 2021-07-13 17:32:08 +01:00
Rory Powell
3fa4b21a31 Update reference to microsoft logo to use most recent name 2021-07-13 16:35:54 +01:00
Rory Powell
2485f0da25 Remove reference to oracle logo to fix build 2021-07-13 16:24:30 +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
Martin McKeaveney
bebfe4c6e1 merge with master 2021-07-11 18:07:46 +01:00
Kyle Harrison
2d451bb3a9 apply fixes for common spelling mistakes 2021-07-09 17:54:49 +01:00
Andrew Kingston
aa2691a452 Merge pull request #1953 from Budibase/client-feature-flags 
Client library updating and client library feature awareness
 2021-07-09 16:52:45 +01:00
Peter Clement
3867c63116 linting 2021-07-09 15:55:01 +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
Andrew Kingston
8cc67d815c Reload the client preview whenever client library version changes 2021-07-09 13:23:49 +01:00
Peter Clement
005e0a2deb Update login page to support user based oidc icon and name 2021-07-09 09:49:34 +01:00
Rory Powell
73c8dcf71b Merge branch 'develop' into feature/oidc-support 2021-07-08 20:15:16 +01:00
Peter Clement
cd1e5c8087 fixing conflict with OIDCButton 2021-07-08 12:36:09 +01:00
Peter Clement
99de767781 fix issue where oidc config form was not loading due to oidc_logos being undefined 2021-07-08 11:15:22 +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
44c87f4fb8 Making it possible to create an internal table from the plus symbol. 2021-07-07 17:13:04 +01:00
Andrew Kingston
0a44b1e3d8 Add client libary update management from inside the builder 2021-07-07 17:07:42 +01:00
Peter Clement
cff2a9ad7d Fix for icon upload issue 2021-07-07 16:18:18 +01:00
Andrew Kingston
fb6c115adf Use client feature flags to conditionally show theme picker 2021-07-07 13:55:05 +01:00
Peter Clement
37b1200051 Allow user uploaded icons in oidc config 2021-07-07 13:41:09 +01:00
Andrew Kingston
9542910a41 Merge branch 'master' of github.com:Budibase/budibase into develop 2021-07-07 11:48:38 +01:00
Martin McKeaveney
13517d5298 make logged in users basic by default, prevent allowing users to be assigned as default in the UI 2021-07-06 18:43:04 +01:00
Martin McKeaveney
68df47e22f default to public in UI 2021-07-06 17:19:03 +01:00
Andrew Kingston
788f517b04 Remove redirect when user only has access to one app 2021-07-06 17:00:44 +01:00
Michael Drury
df97a2572b Merge pull request #1932 from Budibase/fix/sql-relationship-validation 
Adding validation to SQL relationship modal
 2021-07-06 15:55:41 +01:00
Andrew Kingston
8befb1d545 Fix bug with tabs causing them to broadcast a change event on mount 2021-07-06 15:53:52 +01:00
mike12345567
3cdd658ea0 Linting. 2021-07-06 13:11:29 +01:00
mike12345567
ff99e1dcc6 Don't allow foreign key to be the primary key of a row (this would break things). 2021-07-06 13:10:02 +01:00
mike12345567
2fc512bcda Linting. 2021-07-06 12:59:55 +01:00
mike12345567
04fbb8ea29 Adding validation to the SQL relationship creation modal. 2021-07-06 12:58:36 +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
Andrew Kingston
dcaf02ecee Merge branch 'develop' of github.com:Budibase/budibase into spectrum-apps 2021-07-05 17:41:26 +01:00
Peter Clement
a0f2de65e7 Front End form for OIDC configuration 2021-07-05 14:25:42 +01:00
mike12345567
7d244f0a9c Review comments. 2021-07-05 11:06:39 +01:00
mike12345567
006db17bfc Quick fixes for UI, making sure relationships UI not displayed unless tables exist and fixing issue with through being sent up with one-to-many. 2021-07-05 11:03:54 +01:00
mike12345567
ea8fea98a9 Re-working UI after some review. 2021-07-05 10:48:28 +01:00
mike12345567
f450e38dab Linting. 2021-07-05 09:38:01 +01:00
mike12345567
57278b4532 Allowing user firstname and lastname to be updated through user portal. 2021-07-05 09:29:16 +01:00
mike12345567
71f96f9601 Fixing little UI bugs. 2021-07-03 10:26:37 +01:00
mike12345567
9aa672101e Linting. 2021-07-02 14:36:24 +01:00
mike12345567
a8ff2cc7bd Removing console logs and simplifying the relationship name. 2021-07-02 14:35:05 +01:00
mike12345567
10730d8053 Implementing UI to support the backend put in place. 2021-07-02 14:33:05 +01:00
Martin McKeaveney
3eb8f3c445 bidirectional relationships, many to one 2021-07-01 22:23:47 +01:00
Martin McKeaveney
cae1a20411 preventing relationship overrides 2021-07-01 21:24:23 +01:00
Martin McKeaveney
93569ccc87 simplify relationship configuration UI 2021-07-01 18:24:43 +01:00
Martin McKeaveney
edcf3161a3 relationships E2E 2021-07-01 14:14:48 +01:00
Martin McKeaveney
3c64f870bd Merge branch 'feature/sql-relationships' of github.com:Budibase/budibase into feature/opinionated-relationships-ui 2021-06-30 15:06:42 +01:00
Martin McKeaveney
1987ea5f3e listing relationships in UI 2021-06-29 19:57:26 +01:00
Martin McKeaveney
1ca52dc0b9 adding prop to create/edit relationships 2021-06-29 15:30:32 +01:00
Martin McKeaveney
c1abbc1493 definitions and tidy up 2021-06-28 13:04:52 +01:00
Andrew Kingston
f2be9501d3 Add global app theme picker and use it in client preview 2021-06-28 12:55:11 +01:00
Andrew Kingston
39197b318b Improve styles in data source page to be more in line with the portal 2021-06-28 10:56:17 +01:00
Martin McKeaveney
aa980e9b8a relationship configuration panel 2021-06-25 18:11:03 +01:00
Martin McKeaveney
751f83bfb0 adding relationships file 2021-06-23 22:07:18 +01:00
Martin McKeaveney
e6f3a04b4f started on opinionated relationships 2021-06-23 14:29:40 +01:00
mike12345567
61d810edfe Implementing feature #1700 and making it possible to remove logo. 2021-06-21 18:01:25 +01:00
Martin McKeaveney
03c5640856 merge 2021-06-21 11:19:22 +01:00
Martin McKeaveney
0f8b3c52be lint ✨ 2021-06-18 22:18:23 +01:00
Martin McKeaveney
f57e10c01a fix condition in layout 2021-06-18 17:57:01 +01:00
mike12345567
de1ad05c7a Linting. 2021-06-18 13:33:44 +01:00
mike12345567
40e06cc5d1 Formatting and fixing an issue with mysql not being able to return a row that it has created, updated or deleted. 2021-06-18 13:14:45 +01:00
mike12345567
21b591954f Adding a mySQL plus integration, as well as fixing some issues with running queries directly. 2021-06-18 12:29:25 +01:00
Andrew Kingston
b497000f7b Update buttons in settings, improve preview styles 2021-06-18 09:59:28 +01:00
mike12345567
552c608b49 Fixing some issues with cypress tests and screens getting multipled. 2021-06-17 18:19:34 +01:00
mike12345567
c80ad016f2 Making internal database view a bit nicer. 2021-06-17 17:50:40 +01:00
Martin McKeaveney
dd4ed9b69d tidy up, fix UI tests 2021-06-17 14:45:08 +01:00
Martin McKeaveney
08b74d2cec lint 2021-06-17 14:06:31 +01:00
Martin McKeaveney
c97d51bc1e some bugfixes 2021-06-17 12:48:37 +01:00
Martin McKeaveney
626bc5e9dd better UI flow, list tables underneath datasources 2021-06-17 11:40:01 +01:00
Martin McKeaveney
1117b8433b view fix, add help icon to builder 2021-06-17 10:47:01 +01:00
Martin McKeaveney
a79ae5f4ef tidy up imports 2021-06-16 23:39:14 +01:00
Martin McKeaveney
9841a74e39 datasource selection logic - unselect other entities when choosing datasource 2021-06-16 23:27:38 +01:00
Martin McKeaveney
9e41068a5d end to end data providers and opinionated sql 2021-06-16 17:50:22 +01:00
Martin McKeaveney
ba09f2df4b consolidate postgres datas sources 2021-06-16 15:45:57 +01:00
mike12345567
6733b61b78 Merge branch 'master' of github.com:Budibase/budibase into feature/opinionated-sql 2021-06-16 14:13:57 +01: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
mike12345567
3d9dced317 Merge branch 'master' of github.com:Budibase/budibase into feature/opinionated-sql 2021-06-15 20:00:52 +01:00
Martin McKeaveney
e3cced9d97 consolidate data sources and queries together in one UI 2021-06-15 19:48:05 +01:00