Commit Graph

1969 Commits

Author SHA1 Message Date
mike12345567 144ff1da44 Fixing className. 2022-09-16 17:07:24 +01:00
mike12345567 1be71933ca Merge branch 'develop' of github.com:Budibase/budibase into group-fixes 2022-09-16 17:02:08 +01:00
mike12345567 ee40819c9e Merge branch 'master' of github.com:Budibase/budibase into develop 2022-09-16 16:13:20 +01:00
mike12345567 7736acd0c0 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 fc8dc9f176 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
Andrew Kingston 7914bba724 Fix usages of className in organisation settings page 2022-09-15 16:32:36 +01:00
Rory Powell f7fa9969f4 Fixes 2022-09-15 11:59:46 +01:00
Rory Powell 4787f9ccab Pre-review tidy, add new badge to plugins 2022-09-15 11:23:51 +01:00
Rory Powell 086d9ebdf9 Merge branch 'develop' into feature/day-pass-pricing 2022-09-15 10:56:50 +01:00
Rory Powell 0f98f2fcaa Merge branch 'master' into develop 2022-09-15 10:19:56 +01:00
Dean f0f222f9ea 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 8cfd6a9faa Merge branch 'develop' into feature/day-pass-pricing 2022-09-15 08:55:33 +01:00
Rory Powell ea3598e9cf Show licensed group exceeded notification 2022-09-14 22:37:33 +01:00
Rory Powell 40f1bb3067 Update usage page 2022-09-14 20:58:58 +01:00
Dean 132f347916 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 6bd3c8c3d7 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 c6155d60ef 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 1bc0d13429 Update navigation 2022-09-14 14:20:50 +01:00
mike12345567 07dc8a827b Minor fix - remove double friendlyname check. 2022-09-14 13:59:54 +01:00
mike12345567 9e10aac786 Adding friendly name to plugin screen. 2022-09-14 13:15:33 +01:00
mike12345567 8744d0a86c Renaming data source -> datasource as per Mel's request. 2022-09-14 12:11:20 +01:00
Rory Powell a551532e73 Navigation updates, cookie constant, update link-dependencies and localdomain scripts 2022-09-14 10:53:14 +01:00
Dean b848fc52d9 Merge branch 'feature/day-pass-pricing' of github.com:Budibase/budibase into feature/day-pass-pricing 2022-09-13 11:52:58 +01:00
Dean 60feccaac0 Merge commit 2022-09-13 11:52:31 +01:00
Andrew Kingston c873a4d965 Merge branch 'cheeks-lab-day-eject-blocks' of github.com:Budibase/budibase into form-block 2022-09-13 11:32:04 +01:00
Andrew Kingston 3283a0ab5a Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-eject-blocks 2022-09-13 11:31:45 +01:00
melohagan f49aed91fc Merge pull request #7731 from Budibase/bug/sev3/date-range
Move date range picker into data
2022-09-13 10:27:43 +01:00
Andrew Kingston be15aff40f Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience-websocket 2022-09-12 20:00:32 +01:00
Andrew Kingston 0077e1000c Fix plugin rows not being keyed properly, causing incorrect notifications 2022-09-12 19:50:04 +01:00
Andrew Kingston f40de42478 Update plugin description text 2022-09-12 19:47:27 +01:00
mike12345567 30817751ad Updating plugin backend, refactoring a bit, correctly allowing a set of headers to be used for a URL. 2022-09-12 19:12:05 +01:00
mike12345567 e7cfdd4fde Updating add/delete process to have better notifications, removing some errors. 2022-09-12 17:43:13 +01:00
mike12345567 f6e5524b07 Refactoring some plugin adding work - changing how source is specified to remove lower casing. 2022-09-12 17:04:27 +01:00
Andrew Kingston 27af24ec26 Revert organisation page 2022-09-12 16:39:41 +01:00
Andrew Kingston b31cc043ed Update plugins UI styles 2022-09-12 16:35:42 +01:00
Andrew Kingston 0415a67ef0 Fix capitalisation 2022-09-12 16:19:58 +01:00
Andrew Kingston c89eb19944 Undo reverse logic when filtering by component type 2022-09-12 16:19:28 +01:00
mike12345567 828066de46 Merge branch 'develop' of github.com:Budibase/budibase into feature/plugin-management-ui 2022-09-12 15:34:34 +01:00
Rory Powell 45a43baee2 Merge branch 'master' into develop 2022-09-12 14:05:36 +01:00
Rory Powell 884f446671 Merge branch 'develop' into feature/day-pass-pricing-temp 2022-09-12 11:33:02 +01:00
Rory Powell f4963db294 Add buttonText to InlineAlert, export TooltipWrapper, update Account type with license key activate time, convert error package to TS 2022-09-12 10:43:26 +01:00
mike12345567 09c5d33f68 PR comments. 2022-09-12 10:42:30 +01:00
Mel O'Hagan bb37a5ae92 Move date range picker into data 2022-09-12 09:20:28 +01:00
Rory Powell 03458f0f34 Usage tooltips and server accurate remaining days calculations 2022-09-12 00:02:29 +01:00
mike12345567 3d66e71d7d Fixing an issue with deleting large apps with a lot of internal table data and adding back the export modal which allows picking whether an export includes internal table rows - #7583. 2022-09-09 20:06:29 +01:00
mike12345567 932f119fce Updating params in the REST interface so that they can be used in and out of the URL - meaning that updating in one place affects the other. Reduces a bit of the confusing UX around this - discussed in #7683. 2022-09-07 19:15:05 +01:00
Peter Clement ac0443a876 fix build 2022-09-07 17:49:29 +01:00
Peter Clement 0ebe0b8275 remove verify and fix deletion bug 2022-09-07 16:08:29 +01:00
Peter Clement 43dbf96f47 add update modal 2022-09-07 13:51:14 +01:00
Andrew Kingston 93f2903585 Merge branch 'plugins-dev-experience' of github.com:Budibase/budibase into plugins-dev-experience 2022-09-07 13:37:58 +01:00
Andrew Kingston ae3bd8cc17 Sort plugins alphabetically in new component panel 2022-09-07 13:37:45 +01:00
mike12345567 ca749aed86 Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-09-07 12:40:45 +01:00
Andrew Kingston 0bc7ffe0a1 Update preview endpoint to be prefixed with /app to not require an updated proxy config 2022-09-07 10:40:00 +01:00
Peter Clement e6f127c33f update upload request to handle source correctly 2022-09-06 10:37:49 +01:00
Andrew Kingston 229c7cf49f Fix issue with duplicating components not replacing IDs on component itself 2022-09-06 09:21:16 +01:00
Andrew Kingston 5577f31a17 Merge branch 'cheeks-lab-day-eject-blocks' of github.com:Budibase/budibase into form-block 2022-09-06 09:00:21 +01:00
Andrew Kingston 3088616c47 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-eject-blocks 2022-09-06 08:53:10 +01:00
Andrew Kingston d6d26e126c Allow custom CSS to be bindable and allow overriding via conditional UI 2022-09-05 16:35:25 +01:00
Andrew Kingston 443c763602 Merge branch 'develop' of github.com:Budibase/budibase into feature/custom-css-conditional-ui 2022-09-05 14:55:58 +01:00
Andrew Kingston e1282c5da3 Add missing await statement 2022-09-05 14:55:17 +01:00
Peter Clement 5ad21ad333 improve responsiveness of plugins ui 2022-09-05 14:39:19 +01:00
Andrew Kingston c05c7b5f1e Prevent default browser events from firing when using keyboard shortcuts 2022-09-05 12:28:01 +01:00
Peter Clement cb4b918e5a remove name selection from UI 2022-09-05 11:27:43 +01:00
Peter Clement 775c11ef85 Merge branch 'feature/plugin-management-ui' of github.com:Budibase/budibase into feature/plugin-management-ui 2022-09-05 09:45:14 +01:00
NEOLPAR 7d8940f0cb Merge branch 'plugins-dev-experience' into feature/plugin-management-ui 2022-09-05 09:38:24 +01:00
Peter Clement 70408d8008 Merge branch 'feature/plugin-management-ui' of github.com:Budibase/budibase into feature/plugin-management-ui 2022-09-05 09:37:44 +01:00
Peter Clement 88ccae7768 put plugin details in a modal 2022-09-05 09:35:24 +01:00
Andrew Kingston 1f1f482f9d Merge branch 'plugins-dev-experience' of github.com:Budibase/budibase into plugins-dev-experience-websocket 2022-09-02 19:53:49 +01:00
Andrew Kingston 881024ca60 Remove further usages of plugin versions 2022-09-02 19:52:52 +01:00
NEOLPAR 18724af5c5 remove plugin cleaner 2022-09-02 19:33:03 +01:00
NEOLPAR 5a08834def delete plugin through modal confirmation 2022-09-02 19:16:13 +01:00
mike12345567 3ba2aaf567 Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-09-02 18:21:50 +01:00
Andrew Kingston 6948d682fa Fix user validation when pressing confirm 2022-09-02 10:05:43 +01:00
Dean 1a6d50008e Merge branch 'feature/day-pass-pricing' of github.com:Budibase/budibase into feature/day-pass-pricing 2022-09-01 15:33:16 +01:00
Dean 16a505a36f Merge commit 2022-09-01 15:30:04 +01:00
Rory Powell 276c455a11 Merge branch 'develop' into feature/day-pass-pricing 2022-09-01 15:26:16 +01:00
Andrew Kingston d989e346ca Merge branch 'plugins-dev-experience' of github.com:Budibase/budibase into plugins-dev-experience-websocket 2022-09-01 14:39:30 +01:00
Andrew Kingston d45cfc3564 Remove lingering mentions of block ejection 2022-09-01 13:59:55 +01:00
Andrew Kingston bae76a5d5c Revert some cherry pick changes 2022-09-01 13:14:25 +01:00
Andrew Kingston 01cc14a6ee Allow dropping on empty space below tree 2022-09-01 13:11:50 +01:00
Andrew Kingston 412ee0b35f Tidy up component list panel monolith 2022-09-01 13:11:41 +01:00
Andrew Kingston 8a94ee620b Add confirmation for ejecting blocks and component target when using context menu 2022-09-01 13:09:34 +01:00
Rory Powell ba5ed65e03 Billing and usage page updates to support different kinds of users and plans 2022-09-01 11:36:23 +01:00
mike12345567 27be6507a8 Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-09-01 11:31:50 +01:00
Rory Powell 8748d4448f Add trimming to AddUserModal 2022-09-01 08:40:19 +01:00
Rory Powell 95666537b3 Typos 2022-09-01 08:29:03 +01:00
Rory Powell 0f724f34b5 Apply validation to invite users by email + results modal 2022-09-01 07:58:05 +01:00
NEOLPAR 0e2a86460c uploading npm and url plugins 2022-08-31 16:09:47 +01:00
mike12345567 320cbfada3 Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-31 15:53:32 +01:00
Rory Powell 5f022e04a3 Merge branch 'develop' into user-fixes 2022-08-31 11:39:41 +01:00
NEOLPAR e5446d2f8a plugin create npm 2022-08-30 21:37:08 +01:00
Andrew Kingston 8b8d3b9078 Update ejection confirmation text 2022-08-30 14:48:17 +01:00
Andrew Kingston d266d5e542 Allow dropping on empty space below tree 2022-08-30 13:32:52 +01:00
Andrew Kingston df3787bda3 Tidy up component list panel monolith 2022-08-30 13:23:12 +01:00
Andrew Kingston bce2ee2107 Add confirmation for ejecting blocks and component target when using context menu 2022-08-30 12:57:29 +01:00
Andrew Kingston b86bd5bf03 Add setting button for ejecting blocks. Update manifest to show info beside relevant settings 2022-08-30 10:53:58 +01:00
Peter Clement b9b8d59005 add plugins ui 2022-08-30 10:49:19 +01:00
Martin McKeaveney 02c93071ee merge 2022-08-30 10:33:37 +01:00
Rory Powell fe09208bb1 Usage page updates WIP 2022-08-30 09:53:16 +01:00
Rory Powell ea6de7c428 update deletion failure modal 2022-08-26 13:12:33 +01:00
Andrew Kingston b839325a86 Add initial work on grid layout 2022-08-26 08:47:50 +01:00
Rory Powell 5c7869d21d Update user deletion UI 2022-08-25 23:28:54 +01:00
Rory Powell 0d396c326e Update user creation UI 2022-08-25 22:56:58 +01:00
Martin McKeaveney 0b11edea66 Merge pull request #7399 from R2bEEaton/import-users-csv-carriage-return
Import Users CSV Carriage Return Support #7398
2022-08-25 12:49:56 +01:00
Andrew Kingston 0fe73e3b4d Merge branch 'cheeks-lab-day-eject-blocks' of github.com:Budibase/budibase into form-block 2022-08-25 09:37:45 +01:00
Andrew Kingston f8c005631d Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-eject-blocks 2022-08-25 09:37:26 +01:00
Andrew Kingston e006cad2cf Ensure the correct component is selected before executing component dropdown menu actions 2022-08-25 09:35:57 +01:00
Andrew Kingston 8d76959f88 Merge branch 'cheeks-lab-day-eject-blocks' of github.com:Budibase/budibase into form-block 2022-08-25 08:53:07 +01:00
Andrew Kingston 722d2e09f0 Properly flag repeater block as a block and update ejection icon 2022-08-24 09:23:35 +01:00
Andrew Kingston 06eee0d386 Make block ejection work properly via the builder rather than client app button hack 2022-08-23 19:05:38 +01:00
Andrew Kingston 6716f5e978 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-eject-blocks 2022-08-23 15:34:25 +01:00
Andrew Kingston 090796aa42 More effeciently render component settings and filter out empty sections 2022-08-23 14:59:43 +01:00
Andrew Kingston 0a2ad8f879 Remove form block and rename form block plus to form block 2022-08-23 14:58:56 +01:00
Andrew Kingston 434fe378c7 Merge branch 'develop' of github.com:Budibase/budibase into form-block 2022-08-23 11:40:15 +01:00
Andrew Kingston e6a15c9cdd Merge branch 'plugins-dev-experience' of github.com:Budibase/budibase into plugins-dev-experience-websocket 2022-08-22 17:54:40 +01:00
Andrew Kingston bec08eecc8 Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-22 17:54:25 +01:00
Andrew Kingston 36b067a600 Merge branch 'plugins-dev-experience' of github.com:Budibase/budibase into plugins-dev-experience-websocket 2022-08-22 17:54:14 +01:00
Mel O'Hagan 075611b2fa Update CSS conditional UI 2022-08-22 16:45:59 +01:00
R2bEEaton ed75505411 Import Users CSV Carriage Return Support #7398
## Description
The ImportUsersModal takes in a CSV file expecting each line to have a valid email address. When this file is created in Microsoft Excel, Windows in general, or a text editor that uses the carriage return character `\r`, the import fails. This is because the CSV string is split into an email list by `csvString.split("\n")` which fails to account for `\r\n` newlines. This PR changes the split to be the regex `/\r?\n/` which will split on either `\n` or `\r\n`.

Addresses: 
- Issue #7398
- Discussion #7397
2022-08-22 07:59:05 -04:00
Dean 422c38fce7 Minor updates 2022-08-22 12:38:23 +01:00
Dean afca8e02da Merge remote-tracking branch 'origin/develop' into feature/configurable-sso-auth-scopes 2022-08-22 11:42:48 +01:00
Andrew Kingston 23a91b89a7 Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-22 11:27:04 +01:00
Andrew Kingston d19a0f171e Serve builder preview via server to fix dependency on third party cookies 2022-08-20 13:47:57 +01:00
Dean 30f7fc1daa Ensure OIDC config is disabled to prevent auth issues in test suite 2022-08-19 15:56:12 +01:00
Dean 395d0da427 Merge remote-tracking branch 'origin/develop' into feature/configurable-sso-auth-scopes 2022-08-19 14:36:02 +01:00
Dean de437c3cb8 Added missing cypress hooks 2022-08-19 14:33:51 +01:00
Rory Powell 7d1a32f729 Merge branch 'master' into develop 2022-08-19 14:15:49 +01:00
Andrew Kingston 7eaed5bea7 Merge branch 'master' of github.com:Budibase/budibase into cheeks-fixes 2022-08-19 13:54:47 +01:00
Dean a1609c0bde Added authentication integration tests 2022-08-19 12:59:31 +01:00
Andrew Kingston 2c87d6e340 Initial work on websockets 2022-08-19 11:09:20 +01:00
Dean ba2aaf87e7 UX feedback changes 2022-08-18 14:58:22 +01:00
Dean 5452958805 Adding fix for empty scopes 2022-08-18 11:50:52 +01:00
Dean 9260935572 Added scope customisation to the OIDC SSO configuration. Users can add or remove whichever scopes they like except 'openid'. They can revert to our core default values if they run into any issues 2022-08-18 10:59:40 +01:00
mike12345567 6a64c23999 Merge branch 'plugins-dev-experience' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-17 23:21:58 +01:00
mike12345567 7dfe049ae6 Adding full builder integration of custom components - splitting into own section properly - fixing some issues with SVG class overlap. 2022-08-17 23:13:51 +01:00
Mel O'Hagan 9a290e2b41 Refactors 2022-08-17 16:44:48 +01:00
melohagan b2ae542869 Merge pull request #5829 from Budibase/feature/clickable-container
Containers support onClick
2022-08-17 16:34:41 +01:00
Andrew Kingston 32025ef76d Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-17 16:13:27 +01:00
Andrew Kingston 7abf549b02 Hide on click setting for root screen component 2022-08-17 15:47:50 +01:00
Andrew Kingston 536dc56946 Use either backspace or delete for deleting components 2022-08-17 14:47:20 +01:00
Andrew Kingston 3caae00d38 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-lab-day-keyboard-shortcuts-develop 2022-08-17 14:20:34 +01:00
Michael Drury 6ddf6c58d2 Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-16 15:42:47 +01:00
Michael Drury cfbc9b043c Merge branch 'master' of github.com:Budibase/budibase into develop 2022-08-16 15:39:40 +01:00
Martin McKeaveney bb772bfaa5 Merge pull request #7221 from FlaminWrap/FlaminWrap-Fix-4290
Fix issue #4290
2022-08-16 14:25:17 +01:00
Mel O'Hagan 9eb6855e65 Disable valueType for Is in 2022-08-16 13:45:21 +01:00
Mel O'Hagan c5196c7a37 Only allow bindings type for Is In Conditional UI 2022-08-16 13:36:48 +01:00
Andrew Kingston 244850cc0b Rename custom components to plugins in the new component panel 2022-08-15 11:23:27 +01:00
Andrew Kingston 62e01a299e Fix add component not working on first click when no component is selected 2022-08-13 15:22:54 +01:00
Andrew Kingston 10440803fe Show success after uploading plugin 2022-08-12 14:34:16 +01:00
Andrew Kingston 5ae40d8e15 Use friendly name in new component panel if available 2022-08-12 14:34:02 +01:00