Commit Graph

10233 Commits

Author SHA1 Message Date
Peter Clement 3074fc616d integrate download and update and update datepicker 2022-10-20 15:09:43 +01:00
Peter Clement 0111ae9b20 Merge branch 'feature/backups-ui' of github.com:Budibase/budibase into feature/backups-ui 2022-10-20 13:46:36 +01:00
Peter Clement 2a430468f6 add restore funtionality 2022-10-20 13:33:50 +01:00
mike12345567 ee74328e2b Merge branch 'feature/backups-ui' of github.com:Budibase/budibase into feature/backups-ui 2022-10-20 12:51:03 +01:00
mike12345567 322fbf1a50 Correcting contents rendering. 2022-10-20 12:47:45 +01:00
Peter Clement 32ef7ff1a9 fix paging and add deletion 2022-10-20 11:46:04 +01:00
Peter Clement dbd67d251c lint 2022-10-19 16:11:25 +01:00
Peter Clement 5732c80a8a add paging and add more custom table renderers 2022-10-19 16:08:34 +01:00
Andrew Kingston 0c2e286ca7 Use a container as the DND placeholder and use approx size when dragging into grids 2022-10-19 14:39:28 +01:00
Peter Clement f8c5e80fda add datepicker range and test search 2022-10-19 10:16:54 +01:00
Peter Clement 34754f47ce add apis and svelte store 2022-10-18 19:00:19 +01:00
Peter Clement 06e2b041d2 add base ui and backups tab 2022-10-18 18:38:49 +01:00
Andrew Kingston 465d10a8be Allow grid DND without selecting components 2022-10-18 18:29:21 +01:00
Dean 0e4a7ace08 Pushed default parsing up into the InnerForm component to ensure that invalid default values are removed entirely. Fixes for custom validation for array types 2022-10-18 16:24:36 +01:00
Dean a0a9d35b50 Merge remote-tracking branch 'origin/master' into fix/multipicker-default-behaviour 2022-10-18 09:30:50 +01:00
Andrew Kingston c21a7b3e89 Merge branch 'dnd-improvements' of github.com:Budibase/budibase into cheeks-lab-day-grid 2022-10-18 08:12:11 +01:00
Andrew Kingston 5cdd6a692b Merge branch 'develop' of github.com:Budibase/budibase into dnd-improvements 2022-10-17 16:31:39 +01:00
mike12345567 5e802ceb10 Merge branch 'develop' of github.com:Budibase/budibase into feature/app-backups 2022-10-17 14:49:31 +01:00
Dean 20feb35854 Minor update to fix padding for the json field label 2022-10-17 12:43:23 +01:00
Dean 449ddf2a6b Added the json field type to the Automation field block. Also added in the automation icon to identify the automation bindings 2022-10-17 12:08:37 +01:00
Dean 8c62ea9833 Values or defaults passed to the picker are parsed to ensure only valid options are marked/added to the component. 2022-10-17 12:03:13 +01:00
Andrew Kingston df589bc415 Hide new component panel when selected component changes 2022-10-17 09:23:52 +01:00
Andrew Kingston 6656a89f18 Add ability to drag new blocks into app preview 2022-10-17 08:46:09 +01:00
Andrew Kingston d166cbb466 Lint and prevent scrolling to selected component when starting dragging 2022-10-14 19:45:47 +01:00
Andrew Kingston 121eddaa5a Fix crash when dragging from client preview into component tree 2022-10-14 18:17:02 +01:00
Andrew Kingston d997afffc0 Add ability to drag new components into the preview 2022-10-14 13:37:14 +01:00
Gerard Burns 5ac108e4d6
Merge pull request #8246 from Budibase/feature/replace-builder-back-button-with-menu
Replace Builder Back Button With Menu
2022-10-14 10:09:29 +01:00
Mel O'Hagan 573c5cd800 Handle null or empty steps 2022-10-14 08:02:29 +01:00
Dean 2c2a98c163 Merge remote-tracking branch 'origin/develop' into feature/blocks-in-auto-screens 2022-10-13 16:54:55 +01:00
Dean b3c1f9196e Merge remote-tracking branch 'origin/develop' into feature/blocks-in-auto-screens 2022-10-13 16:49:10 +01:00
deanhannigan c042b363f9
Merge pull request #8153 from Budibase/feature/qr-barcode-reader
Feature/qr barcode reader
2022-10-13 16:43:54 +01:00
melohagan c3f556dc8a
Merge pull request #8117 from Budibase/lab/mongodb
Add aggregate method to MongoDB
2022-10-13 16:32:30 +01:00
Mel O'Hagan f9ed72f670 Added null propagation operators 2022-10-13 16:17:47 +01:00
Dean c162ad458c Merge remote-tracking branch 'origin/develop' into feature/qr-barcode-reader 2022-10-13 16:16:28 +01:00
melohagan fe4b5502d4
Update packages/builder/src/components/integration/index.svelte
Co-authored-by: Martin McKeaveney <martin@budibase.com>
2022-10-13 16:13:56 +01:00
Andrew Kingston 9881b84462 Update formula tooltip to explain they cannot be sorted by 2022-10-13 16:11:53 +01:00
mike12345567 9242f695ab Merge branch 'develop' of github.com:Budibase/budibase into feature/app-backups 2022-10-13 15:59:31 +01:00
Andrew Kingston 30c17c9d8b Only show sortable fields for sort column settings 2022-10-13 15:58:44 +01:00
Gerard Burns 834653761a Replace Builder Back Button With Menu 2022-10-13 15:53:45 +01:00
Andrew Kingston 5cf50d522f Only hide plugin search bar when no plugins exist 2022-10-13 15:32:31 +01:00
Mel O'Hagan 881d5d53b0 Rename flowEditors to stepEditors 2022-10-13 13:07:53 +01:00
Mel O'Hagan 34a1d5e36b Rename flow to pipeline 2022-10-13 13:05:45 +01:00
Rory Powell a5749b8024 Remove debug message from upgrade page ui (self host) 2022-10-13 09:28:12 +01:00
mike12345567 ae0bfebae7 Full import implementation - needs further testing, untars the file with all apps, then adds each of them individually. 2022-10-12 19:15:28 +01:00
Mel O'Hagan 48d84d67bf Allow stages to be swapped in flow 2022-10-12 18:42:35 +01:00
Mel O'Hagan 910991eb8c Allow template to be used when changed body blank 2022-10-12 16:20:11 +01:00
Mel O'Hagan 9ee4788147 Include stage templates 2022-10-12 15:31:53 +01:00
mike12345567 7439ade518 Merge branch 'develop' of github.com:Budibase/budibase into feature/app-backups 2022-10-12 11:59:00 +01:00
Mel O'Hagan 3cb43c0650 Merge branch 'develop' into lab/mongodb 2022-10-12 10:29:27 +01:00
Mel O'Hagan 91ec23faf2 Merge branch 'master' into bug/sev3/edit-column-modal-state 2022-10-12 10:23:17 +01:00
Mel O'Hagan 358c1aab54 Edit clone of column 2022-10-12 10:22:54 +01:00
Rory Powell ef433633b2 Merge branch 'master' into merge-master 2022-10-12 10:19:46 +01:00
melohagan d15df3691b
Merge pull request #8169 from Budibase/bug/sev3/delete-button-roles
Hide delete button for built-in roles, and prevent duplicate roles
2022-10-12 09:11:58 +01:00
Dean f5089e52c6 Initial commit, refactoring of autoscreens to incorporate blocks 2022-10-11 17:05:19 +01:00
Andrew Kingston 40917f8635 Fix user pagination not working when viewing users with access to an app 2022-10-11 14:17:30 +01:00
mike12345567 bb65cf8ef9 Some updates towards supporting attachments in app exports. 2022-10-10 20:08:59 +01:00
Dean 6809bd72ed Ensure field type is preserved if it contains a slash. Some additional refactoring 2022-10-10 14:20:06 +01:00
Dean cbdf7c8bd1 Adjustments to accomodate the updates scanner type 2022-10-10 12:11:29 +01:00
Martin McKeaveney 88e9419d73 redis fix for new instances, removing relationship options from google sheets integration 2022-10-10 11:00:45 +01:00
Dean 91e63ca2c9 Merge remote-tracking branch 'origin/develop' into feature/qr-barcode-reader 2022-10-10 09:08:48 +01:00
Andrew Kingston a13c309759 Merge branch 'develop' of github.com:Budibase/budibase into form-block 2022-10-07 12:45:53 +01:00
Andrew Kingston e41078f265 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-eject-blocks 2022-10-07 11:31:32 +01:00
Dean ad13bbb25c Renamed the 'Scanned Code' field type to 'Barcode/QR'. The component is also now listed as 'Barcode/QR Scanner'. Minor fix to include longform text columns in the table csv import list 2022-10-07 11:00:25 +01:00
Mel O'Hagan 4e9d0fd079 Don't allow duplicate roles 2022-10-06 19:22:18 +01:00
Mel O'Hagan 5d33c6ebc9 Fix inherits role options 2022-10-06 18:23:02 +01:00
Mel O'Hagan 21c5287290 UI fixes 2022-10-06 18:19:00 +01:00
mike12345567 ee5bb31508 Merge branch 'develop' of github.com:Budibase/budibase into develop 2022-10-06 16:58:33 +01:00
Dean 4b5fa6a093 Review feedback changes. Changed 'Code' labelling to 'Scanned Code' 2022-10-06 13:02:17 +01:00
Dean 450e3174b0 Removed filter excluding links from user bindings. 2022-10-05 12:40:53 +01:00
Dean 644d0f2bdd Merge remote-tracking branch 'origin/develop' into feature/qr-barcode-reader 2022-10-05 09:29:32 +01:00
Dean 5836c2b3c4 Initial commit of QR Reader field 2022-10-05 09:28:07 +01:00
Michael Drury 6e2e2fc82e
Merge pull request #7873 from Budibase/bug/column-name-other-table-validation
Don't show validation error for existing relationship
2022-10-04 12:49:47 +01:00
Mel O'Hagan dbf58fcfe9 Added support for JSON array stages 2022-10-04 11:03:24 +01:00
Mel O'Hagan 7b90f56500 Improve editor refresh on delete 2022-10-04 10:18:16 +01:00
Mel O'Hagan 4f238d9c10 Merge branch 'develop' into lab/mongodb 2022-10-03 17:10:21 +01:00
deanhannigan cf8b5be13e
Merge pull request #8014 from Budibase/feature/automation-log-filter-by-license
Feature/automation log filter by license
2022-10-03 10:49:24 +01:00
Andrew Kingston 4b2a8aae7b Fix generating datsource structure for components which have a setting of type table 2022-09-30 16:26:29 +01:00
Andrew Kingston d68c8c45b1 Fix table setting type 2022-09-30 16:26:24 +01:00
Andrew Kingston de536d6f26 Hot reload custom component settings in the builder 2022-09-30 16:26:15 +01:00
Andrew Kingston 07eb7c061f Use friendly name when adding instances of custom components 2022-09-30 16:26:02 +01:00
Andrew Kingston 3ae18dd89e Fix custom components not working properly with generated bindings 2022-09-30 16:23:26 +01:00
mike12345567 d1c2ca4faa Removing some un-necessary duplicated statements. 2022-09-30 14:32:32 +01:00
mike12345567 f33968f4da Merge branch 'master' of github.com:Budibase/budibase into feature/plugin-icons 2022-09-30 13:02:14 +01:00
deanhannigan bfce63b885
Merge pull request #8011 from Budibase/fix/enforce-builder-child-checks-drag-drop
Fix to enforce illegalchildren rules when dragging and dropping in th…
2022-09-30 11:24:21 +01:00
mike12345567 16d5d8289b Improving regex for processing custom SVG. 2022-09-30 09:17:38 +01:00
mike12345567 1f5de9b71d Adding ability for datasource plugins to have a custom icon svg. 2022-09-29 19:30:53 +01:00
Dean 225f000b2a Centralised licensing types to frontend-core contants. Some minor refactoring 2022-09-29 09:17:22 +01:00
Andrew Kingston 05b707da64 Update naming conventions in filter drawer 2022-09-28 15:36:35 +01:00
Andrew Kingston 9e1f19e5e1 Simplify, strengthen and make consistent filter drawer validation logic 2022-09-28 15:08:44 +01:00
Andrew Kingston af4b1b673e Merge branch 'master' of github.com:Budibase/budibase into bug/sev2/is-in-filter-startswith-crash 2022-09-28 14:16:45 +01:00
Mel O'Hagan 29fe7ef1d8 Add screen input to CloseScreenModal 2022-09-28 13:49:35 +01:00
Dean 6763dc3914 Use new licensing feature flag to gate off the filtering behaviour. 2022-09-28 12:17:00 +01:00
Dean f41bdf0d6a Merge remote-tracking branch 'origin/develop' into feature/automation-log-filter-by-license 2022-09-28 11:39:22 +01:00
Dean aea02a2b88 Fix to enforce illegalchildren rules when dragging and dropping in the component tree 2022-09-28 11:08:11 +01:00
Andrew Kingston e1f7a1ca67 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-grid 2022-09-27 15:57:27 +01:00
Andrew Kingston fe413a5799 Update plugins page empty state 2022-09-27 09:31:04 +01:00
Andrew Kingston 8c60a73232 Update groups page styles when user does not have access 2022-09-27 09:30:54 +01:00
Michael Drury 2c6bccc036 Fixing issue with multi-tenancy and groups UI - apps with multi-tenancy enabled did not appear correctly and could not be added. 2022-09-26 22:33:11 +01:00
Rory Powell 0ee59e371a Fix cypress accountPortals.spec 2022-09-26 21:02:11 +01:00
Michael Drury 190c54fb86
Merge pull request #7981 from Budibase/feature/group-app-add
Add apps to a group from within groups interface
2022-09-26 19:18:44 +01:00
mike12345567 e77f517d25 Updating plugin badge to be new, rather than beta as now released. 2022-09-26 18:58:08 +01:00
mike12345567 2fd4c8e57e PR comments. 2022-09-26 18:26:16 +01:00
mike12345567 ebb43de0a6 Fixing confirm text in second stage of adding app to group modal. 2022-09-26 18:05:08 +01:00
Martin McKeaveney d0ad7bbb67 merge with master 2022-09-26 17:57:23 +01:00
mike12345567 7484cdfb59 Feature to allow adding apps from within the groups interface, rather than having to go to apps individually to do this. 2022-09-26 17:54:00 +01:00
Mel O'Hagan 32ae5c9266 Merge branch 'develop' into bug/column-name-other-table-validation 2022-09-26 17:03:41 +01:00
Rory Powell 901a10b855
Merge pull request #7969 from Budibase/fix/update-billing-messaging
Minor update replacing upgrade terminology for billing notifications
2022-09-26 16:25:32 +01:00
Andrew Kingston 3d5fa19ce8 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-grid 2022-09-26 16:22:13 +01:00
Martin McKeaveney 90e4c97004
Merge pull request #7965 from Budibase/fix/floor-usage-metrics
Minor change to floor usage metrics to avoid misleading 100 quota messages
2022-09-26 15:33:17 +01:00
Andrew Kingston 282c8cb008 Merge branch 'master' of github.com:Budibase/budibase into bug/sev2/is-in-filter-startswith-crash 2022-09-26 15:04:02 +01:00
Andrew Kingston 06486ab11a Fix multiple issues with groups UI due to not correctly accounting for multi-tenant app ID structuer 2022-09-26 14:50:31 +01:00
Dean ee4f036b1e Minor update replacing upgrade terminology from notifications relating to billing 2022-09-26 13:58:19 +01:00
Dean 7cc30d6135 Ensure display values for metrics are capped at 100% in the day pass modal 2022-09-26 09:52:20 +01:00
Dean 4227beb51f Minor change to floor usage metrics to avoid misleading 100 quota usage messaging. 2022-09-26 09:44:45 +01:00
Peter Clement a988ff0a14
Merge pull request #7944 from Budibase/pc/automation-fix
Automate fixes
2022-09-26 08:39:47 +01:00
Martin McKeaveney cdcf6f20d5
Merge pull request #7864 from Budibase/bug/sev4/relationship-column-types-must-match
Do not allow non-matching types for primary/foreign keys - External DB
2022-09-25 13:42:55 +01:00
Martin McKeaveney 210e480689
Merge pull request #7915 from Budibase/fix/table-column-binding-category
Added category and icon for table configuration binding drawer
2022-09-25 13:39:44 +01:00
Michael Drury 70c3c1b8d8 Merge branch 'develop' of github.com:Budibase/budibase into group-fixes 2022-09-24 17:04:31 +01:00
Dean ce683e3df1 Fix for create app buttons when usage is not being tracked 2022-09-23 19:29:56 +01:00
Dean 61b997d2b2 Merge remote-tracking branch 'origin/develop' into fix/licensing-overlay-flags 2022-09-23 17:40:19 +01:00
mike12345567 c8ec3c52af Merge branch 'develop' of github.com:Budibase/budibase into group-fixes 2022-09-23 17:10:30 +01:00
mike12345567 41b8a6d55a Fixing display of user role in apps in the user management page. 2022-09-23 17:02:32 +01:00
Mel O'Hagan 9a8b054b19 Refactor 2022-09-23 16:54:39 +01:00
Mel O'Hagan f492a40edd Merge branch 'master' into bug/sev4/relationship-column-types-must-match 2022-09-23 16:44:36 +01:00
Andrew Kingston 587117064c Fix groups table heading label for apps 2022-09-23 16:12:29 +01:00
Andrew Kingston 39a3a478b7 Make portal text consistent and hide upgrade prompts when you already have access 2022-09-23 16:10:40 +01:00
Rory Powell 9dc2eac580 Support deleting license key from self host install 2022-09-23 15:54:59 +01:00
Andrew Kingston 7bf6e5c1ee Fix padding on usage page 2022-09-23 15:46:26 +01:00
Andrew Kingston 5282bb29a3 Fix user groups already assigned to an app not being filtered out 2022-09-23 15:42:44 +01:00
Andrew Kingston f6b52cf3f0 Update app overview tile size and wrapping 2022-09-23 15:40:58 +01:00
Peter Clement cd2d5a7c7c Merge remote-tracking branch 'origin/master' into pc/automation-fix 2022-09-23 15:37:04 +01:00
Andrew Kingston 04c307a406 Merge branch 'group-fixes' of github.com:Budibase/budibase into group-fixes 2022-09-23 15:13:14 +01:00
Andrew Kingston 3479176021 Add group icons to access tile and reduce API calls 2022-09-23 15:13:02 +01:00
Dean f7dd6864bc Fix to ensure licensing flags display correctly 2022-09-23 14:45:44 +01:00
Andrew Kingston d30353326b Update text in app overview access tab 2022-09-23 14:44:10 +01:00
Andrew Kingston 46863904ec Fix app list on group details page 2022-09-23 14:43:57 +01:00
Andrew Kingston e86b9671e4 Fix group app number count in group list table 2022-09-23 14:43:41 +01:00
mike12345567 8830ba1827 Merge branch 'develop' of github.com:Budibase/budibase into group-fixes 2022-09-23 14:37:50 +01:00
Peter Clement 334ac0d512 Automation fixes 2022-09-23 13:35:27 +01:00
Rory Powell 991b65c354 default quotaUsage in licensing store to undefined - some checks rely on this field being undefined, however in the current intialisation flow it is always set to the full object by the time the inspections are made. set to undefined for additional safety 2022-09-23 13:30:47 +01:00
Andrew Kingston 44a9b49efe Rename some usages of feature flags to tenant feature flags 2022-09-23 12:13:15 +01:00
Rory Powell 3a5557a437 Update group upgrade UX 2022-09-23 11:40:19 +01:00
Dean 3c04dc82b3 Minor fix to ensure the app name neatly truncates and a general layout fix for apps in smaller resolutions 2022-09-23 10:40:55 +01:00
mike12345567 76114aa621 Merge branch 'develop' of github.com:Budibase/budibase into group-fixes 2022-09-22 18:44:16 +01:00
Dean f30a679669 Added category and icon for table configuration binding drawer 2022-09-22 17:04:58 +01:00
mike12345567 6f24c7c6c3 Renaming function to more accurately reflect its group app ID lookup purpose. 2022-09-22 13:57:44 +01:00
mike12345567 99b8c269ea Updating group types to accurately reflect the state of the documents, as well as centralising the logic for getting the app IDs in a group. 2022-09-22 13:55:52 +01:00
Mel O'Hagan cf5dbfe055 Handle valueType change 2022-09-22 09:40:45 +01:00
Mel O'Hagan 5b4d7c3509 Merge branch 'master' into bug/sev2/is-in-filter-startswith-crash 2022-09-22 08:43:11 +01:00
mike12345567 d80cd5042d Adding group app cleanup. 2022-09-21 23:12:38 +01:00
mike12345567 2c5d2f7b12 Switching over app role assignment to use the new backend rather than being performed in the frontend. 2022-09-21 22:58:06 +01:00
Rory Powell e564226f77 Merge branch 'master' into develop 2022-09-21 20:16:54 +01:00
mike12345567 120ea88aff Updates to use new backend API for adding/removing users from groups. 2022-09-21 16:58:47 +01:00
Peter Clement 885a4186d6 Fix error when plugin is added 2022-09-21 16:19:07 +01:00
Martin McKeaveney b82f761027
Merge pull request #7644 from Budibase/custom-css-upgrades
Custom CSS upgrades
2022-09-21 15:35:42 +01:00
Martin McKeaveney f1d5f37e9c
Merge pull request #7809 from Budibase/fix/missing-rest-binding-category-names
Fix/missing rest binding category names
2022-09-21 15:33:59 +01:00
Mel O'Hagan 6875554799 Only call startsWith if string 2022-09-21 15:25:53 +01:00
Mel O'Hagan bf2d3f13b4 Don't show validation error for relationship 2022-09-21 13:18:04 +01:00
mike12345567 9466592663 Adding group cleanup, removing group IDs from users when group is deleted. 2022-09-21 12:43:09 +01:00
Mel O'Hagan 9cc931acc4 Do not allow non-match type primary foreign keys 2022-09-21 09:10:31 +01:00
mike12345567 49fc65b584 Updates to improve the view development experience. 2022-09-20 19:12:48 +01:00
Andrew Kingston 2c3f02347e Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-grid 2022-09-20 17:23:52 +01:00
Rory Powell f06b1cc270 Remove plugin datasource filter in cloud 2022-09-20 14:52:16 +01:00
Dean 9271f1e7c4 Merge remote-tracking branch 'origin/develop' into fix/missing-rest-binding-category-names 2022-09-20 13:26:39 +01:00
Dean 5f7cfb5731 Filter 'link' fields from the Current User bindings 2022-09-20 11:09:58 +01:00
Rory Powell b8d493a65c Invert template display logic to fix cypress 2022-09-20 10:59:12 +01:00
Rory Powell 380542d128 Wrap licensing banners and modals in feature flag, disable logo 2022-09-20 10:15:28 +01:00
Dean 5354231e04 Removed redundant display variable from user bindings 2022-09-20 10:15:23 +01:00
Rory Powell e408692647 Change 'Plugins' nav item badge to 'Beta' 2022-09-20 10:13:40 +01:00
Dean 15818d9d62 Minor change to ensure correct labelling for OAuthToken binding 2022-09-20 10:07:07 +01:00
Dean 674263fe9f Merge remote-tracking branch 'origin/develop' into fix/missing-rest-binding-category-names 2022-09-20 09:16:40 +01:00
Martin McKeaveney f1dee80961 merge 2022-09-18 13:30:16 +01:00
mike12345567 8bb51113bc Fix for #7811 - Fixing an issue with the query binding builder - when executing the query you could no longer enrich the value binding. 2022-09-17 10:45:44 +01:00
Dean b97c4590f7 Merge remote-tracking branch 'origin/develop' into fix/missing-rest-binding-category-names 2022-09-16 17:34:22 +01:00
Dean 99b730105f Minor fix to add categories for rest bindings 2022-09-16 17:32:50 +01:00
mike12345567 69442865d5 Fixing className. 2022-09-16 17:07:24 +01:00
mike12345567 b98f08f4e7 Merge branch 'develop' of github.com:Budibase/budibase into group-fixes 2022-09-16 17:02:08 +01:00
mike12345567 fa7702044d Merge branch 'master' of github.com:Budibase/budibase into develop 2022-09-16 16:13:20 +01:00
mike12345567 42654622b5 PR comments, removing console logs, as well as trying to get jest tests working in builder. 2022-09-15 22:47:37 +01:00
mike12345567 d35864be08 Fixing issue introduced by fix for #7683 - encoding the query string caused handlebars statements to break, this rectifies that. 2022-09-15 19:35:55 +01:00
Dean dcc3c81e7a Minor update 2022-09-15 16:50:51 +01:00
Dean 6ee5d8bea6 Fix to include the current user bindings in datasource queries 2022-09-15 16:39:25 +01:00
Andrew Kingston 5cd66d1436 Fix usages of className in organisation settings page 2022-09-15 16:32:36 +01:00
Dean 117328021c Merge branch 'feature/day-pass-pricing' of github.com:Budibase/budibase into feature/day-pass-pricing 2022-09-15 12:46:27 +01:00
Dean 59e8e97bbc Updated copy from the payment modal 2022-09-15 12:45:47 +01:00
Rory Powell c2fa270386 Fixes 2022-09-15 11:59:46 +01:00
Rory Powell ff8760e860 Pre-review tidy, add new badge to plugins 2022-09-15 11:23:51 +01:00
Rory Powell 0980be9377 Merge branch 'develop' into feature/day-pass-pricing 2022-09-15 10:56:50 +01:00
Rory Powell 0b652a085f Merge branch 'master' into develop 2022-09-15 10:19:56 +01:00
Dean 0acdd047fc Merge branch 'feature/day-pass-pricing' of github.com:Budibase/budibase into feature/day-pass-pricing 2022-09-15 09:06:48 +01:00
Rory Powell 193a262705 Merge branch 'develop' into feature/day-pass-pricing 2022-09-15 08:55:33 +01:00
Rory Powell 25282c9455 Show licensed group exceeded notification 2022-09-14 22:37:33 +01:00
Rory Powell 3697a4365b Update usage page 2022-09-14 20:58:58 +01:00
Dean bcd6b711bf Apps Page update to hide apps when sessions are maxed. General refactoring and updates to the licensing notification flows. 2022-09-14 18:04:58 +01:00
Dean e29df0b7b5 Merge branch 'feature/day-pass-pricing' of github.com:Budibase/budibase into feature/day-pass-pricing 2022-09-14 15:20:49 +01:00
Dean 8758307d90 Merge branch 'feature/day-pass-pricing' of github.com:Budibase/budibase into feature/day-pass-pricing 2022-09-14 14:35:54 +01:00
Rory Powell 23594d7d12 Update navigation 2022-09-14 14:20:50 +01:00
mike12345567 a4af9ad32e Minor fix - remove double friendlyname check. 2022-09-14 13:59:54 +01:00
mike12345567 d7dfb53647 Adding friendly name to plugin screen. 2022-09-14 13:15:33 +01:00
mike12345567 eeda89725d Renaming data source -> datasource as per Mel's request. 2022-09-14 12:11:20 +01:00