MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,265 Commits 129 Branches 2,987 Tags 944 MiB
Commit Graph

4836 Commits

Author SHA1 Message Date
Dean cc0280ca0c Minor UI updates for the create app modal. A spinner has been added to the modal confirmation UX. The app name is pre-populated using the app name. The app URL can no longer be null 2022-03-23 12:43:20 +00:00
Andrew Kingston 3817de254e Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2022-03-23 10:48:49 +00:00
Andrew Kingston 38be4979f3 Merge pull request #4987 from Budibase/scrollable-component-tree 
Scrollable component tree
 2022-03-23 10:46:55 +00:00
Andrew Kingston af1c01fdd1 Prevent collapsing datasource if only one datasource exists 2022-03-23 10:17:52 +00:00
Dean 768f9e8679 Merge remote-tracking branch 'origin/develop' into feature/templates-home-screen 2022-03-23 09:00:09 +00:00
Andrew Kingston 98881ac64f Merge pull request #4972 from Budibase/fix/table-primary-display-validation 
Properly set required constraints for display columns
 2022-03-23 08:45:10 +00:00
Andrew Kingston 406776088d Add identifier to messages sent to client iframe preview to avoid conflicts with embedded iframe events 2022-03-22 18:15:41 +00:00
Martin McKeaveney 5fc7cf7cb4 Merge pull request #4970 from Budibase/fix/analytics-cleanup 
updating analytics endpoint, removing old NPS survey
 2022-03-22 16:34:25 +00:00
Dean f6cbe01b07 Code formatting 2022-03-22 11:40:45 +00:00
Dean 6c269bf091 Initial commit of home screen modifications and template browsing 2022-03-22 11:38:17 +00:00
Andrew Kingston 8cfad1a4ff Restore strange class name to fix cypress 2022-03-21 17:59:35 +00:00
Rory Powell 715d42d3e6 Merge branch 'develop' into feature/licensing 2022-03-21 17:13:16 +00:00
Andrew Kingston 8a2aa166fc Remove selected state from current screen and only show component 2022-03-21 16:06:23 +00:00
Andrew Kingston 123e805668 Lint 2022-03-21 15:56:42 +00:00
Andrew Kingston b5695cdc8e Reduce max width of nav items to have a better generic fit 2022-03-21 15:54:10 +00:00
Andrew Kingston 7882d577bb Update automation navigation to use new full width nav items 2022-03-21 15:48:00 +00:00
Andrew Kingston 313fdae011 Update datasource navigation to use new full width nav items 2022-03-21 15:47:49 +00:00
Andrew Kingston 014d318437 Update layouts in nav tree to new full width style 2022-03-21 15:40:07 +00:00
Andrew Kingston 0ffd080b0f Fix issue when currentAsset is null and fix overflow when no screens for current role 2022-03-21 15:21:29 +00:00
Andrew Kingston 53ce97b9de Ensure the component tree containing the selected component cannot be hidden 2022-03-21 15:17:51 +00:00
Andrew Kingston 7157b29da0 Support scrolling screens or folders into view when clicking 2022-03-21 14:46:59 +00:00
Andrew Kingston a2283fefa5 Remove logs 2022-03-21 14:23:56 +00:00
Andrew Kingston 0798556a52 Tidy up logic for scrolling to components 2022-03-21 13:54:46 +00:00
Andrew Kingston 697c43187a Add vertical scrolling to selected component and support scrolling to selected screen 2022-03-21 13:38:53 +00:00
Andrew Kingston a8a6c0a428 Properly center all path, screen and component dropdown menu icons 2022-03-21 09:57:55 +00:00
Andrew Kingston 88e619aff7 Merge branch 'develop' of github.com:Budibase/budibase into scrollable-component-tree 2022-03-21 09:52:40 +00:00
Andrew Kingston a80fe7d7d8 Set a required constraint for a column that is defaulted to being the primary display 2022-03-21 09:44:24 +00:00
Martin McKeaveney cf9105c9dc Merge pull request #4821 from Budibase/copy-paste-improvements 
Copy paste improvements + extras
 2022-03-21 08:25:01 +00:00
Martin McKeaveney 51847e37b2 Merge pull request #4931 from mslourens/binding_panel_overflow 
Binding panel overflow
 2022-03-21 08:07:00 +00:00
Martin McKeaveney aaf84b6995 updating analytics endpoint, removing old NPS survey 2022-03-21 08:00:03 +00:00
Andrew Kingston c79ec57a5d Add initial work on horizontally scrollable component tree with automatic scrolling 2022-03-18 19:52:11 +00:00
Maurits Lourens 103bb25437 don't sent searchableSchema to getSchemaForDatasource 2022-03-18 16:45:33 +01:00
Michael Drury 2d011bce0d Merge pull request #4864 from mslourens/google_firebase_integration 
Google firebase integration
 2022-03-18 10:07:30 +00:00
Rory Powell 5380c46725 Fix base path in server url for openapi3 import 2022-03-18 09:20:30 +00:00
Maurits Lourens a4405891d4 set word-wrap to break word, so the text spreads on multiple lines 2022-03-16 21:05:45 +01:00
Maurits Lourens ab0de4b233 set text-overflow on binding panel items 2022-03-16 21:01:47 +01:00
Maurits Lourens 19ec76c49d Merge branch 'develop' into google_firebase_integration 2022-03-16 13:40:04 +01:00
Andrew Kingston f40407885a Merge branch 'develop' of github.com:Budibase/budibase into copy-paste-improvements 2022-03-15 11:33:27 +00:00
Andrew Kingston 9500203515 Add event context to button actions to allow passing in params at run time and add corresponding data bindings 2022-03-15 11:16:51 +00:00
Dean 9f561b09c3 Merge remote-tracking branch 'origin/develop' into feature/map-component 2022-03-10 12:49:57 +00:00
Martin McKeaveney 45f158dcc5 Merge pull request #4587 from CommanderRoot/rm-deprecated-substr 
Replace deprecated String.prototype.substr()
 2022-03-10 01:57:57 +01:00
Maurits Lourens a4fa08fc4d remove inkscape related data from svg 2022-03-10 00:34:08 +01:00
Rory Powell b77234b8ce Merge branch 'develop' into labday/status-banner 2022-03-09 21:39:30 +00:00
Rory Powell 7698e9293c Self Host <-> Licensing integration 2022-03-09 21:16:22 +00:00
Andrew Kingston fa89e58934 Merge branch 'develop' of github.com:Budibase/budibase into copy-paste-improvements 2022-03-09 18:07:51 +00:00
Dean baa35e8964 Merge remote-tracking branch 'origin/develop' into feature/map-component 2022-03-09 16:50:14 +00:00
mike12345567 eec65930f4 Fixing an issue with the tables store, some calls depended on the fetch returning the table list. 2022-03-09 11:22:02 +00:00
Dean c672a439c0 Merge remote-tracking branch 'origin/develop' into feature/map-component 2022-03-09 11:02:53 +00:00
Andrew Kingston f335c2635b Merge branch 'develop' of github.com:Budibase/budibase into copy-paste-improvements 2022-03-08 17:58:12 +00:00
Andrew Kingston 990442b45e Add optional chaining to all current asset references to account for nullish values 2022-03-08 17:57:36 +00:00
Dean b67b34928a Initial Commit for Issue/3819. World map component added and a small change to the Component draggable behaviour to accomodate it. 2022-03-08 16:41:21 +00:00
Maurits Lourens c2d48bebd7 initial setup for google firebase integration 2022-03-08 17:31:36 +01:00
Rory Powell 7151c86224 Merge branch 'develop' into labday/status-banner 2022-03-08 16:31:07 +00:00
Andrew Kingston d8cb5bfd24 Fix screen renaming when same route already exists 2022-03-08 14:14:57 +00:00
Peter Clement 38ba2509d7 Merge remote-tracking branch 'origin/develop' into feature/export-from-client 2022-03-08 13:56:56 +00:00
Andrew Kingston 4ef06ea6c1 Merge branch 'develop' of github.com:Budibase/budibase into copy-paste-improvements 2022-03-08 13:35:35 +00:00
Peter Clement ebaaff1f8c account for blocks within export button action 2022-03-08 13:31:14 +00:00
Peter Clement 064aee5e2e Update how button action for exporting works 2022-03-08 12:58:05 +00:00
Martin McKeaveney 14cffcd6ff merge 2022-03-08 12:40:41 +01:00
Martin McKeaveney 975eb0b99e merge from master 2022-03-08 12:34:27 +01:00
Martin McKeaveney 01e14346ed Merge pull request #4824 from Budibase/feature/export-from-client 
Export selected rows from button action
 2022-03-08 12:31:47 +01:00
Maurits Lourens 9a0c361ad0 show correct error and keep modal open 2022-03-08 11:15:02 +01:00
Andrew Kingston e84e4f9899 Add duplicate action to settings bar 2022-03-07 14:05:26 +00:00
Andrew Kingston d2b13cf3fa Add option to paste inside screens 2022-03-07 13:56:06 +00:00
Peter Clement ed2c210db8 Add button action allowing for export of client row selection 2022-03-07 12:06:11 +00:00
Andrew Kingston 4c88a046fd Update confirm text button when duplicating screens 2022-03-07 10:41:52 +00:00
Andrew Kingston 91b698cfe1 Properly remove window event listener when unmounting component preview 2022-03-07 10:17:05 +00:00
Andrew Kingston 018b8713d7 Use new string-templates function and remove the one implemented on this branch for finding HBS expressions 2022-03-07 09:32:31 +00:00
Andrew Kingston 530024bd63 Add component name to settings panel 2022-03-07 08:16:55 +00:00
Rory Powell b686c19658 Enforce licensed developer count + error types/codes framework 2022-03-04 13:42:50 +00:00
Andrew Kingston e58fa37b6e Merge pull request #4750 from Budibase/fix/option-picker-values 
Fixes for 409s and option picker values
 2022-03-03 12:37:59 +00:00
Andrew Kingston 8b4e464e8a Allow bulk deleting all screens under a route 2022-03-02 19:52:10 +00:00
Andrew Kingston f5ff71f9d1 Allow duplication of screens 2022-03-02 19:26:43 +00:00
Andrew Kingston f2fbd3d1d0 Rewrite screen wizard to make modals reusable and fix some edge case URL bugs 2022-03-02 19:10:18 +00:00
Andrew Kingston e411354538 Improve copy and paste to support keeping all data bindings valid 2022-03-02 17:45:01 +00:00
mike12345567 fa41548e13 Merge branch 'develop' of github.com:Budibase/budibase into feature/budibase-api 2022-03-01 18:43:52 +00:00
Peter Clement 48d8aaea2a Merge pull request #4390 from Budibase/feature/automation-data-types 
Adding ability to toggle between Automation input types.
 2022-03-01 14:00:21 +00:00
Peter Clement ffe35bc5ec Merge pull request #4638 from Budibase/feature/table-row-selection 
Allow selection of rows from table component
 2022-03-01 12:03:24 +00:00
Andrew Kingston 7266712f8f Merge pull request #4700 from Budibase/rest-api-endpoint-naming 
Improve REST query naming in navigation
 2022-03-01 11:41:56 +00:00
Peter Clement 62290b30f1 Merge remote-tracking branch 'origin/develop' into feature/automation-data-types 2022-03-01 11:18:11 +00:00
Andrew Kingston 0f295afb04 Make component setting updates sequential to prevent 409s 2022-03-01 11:11:56 +00:00
Peter Clement 6095b5cb87 Merge remote-tracking branch 'origin/develop' into feature/table-row-selection 2022-03-01 10:37:26 +00:00
Rory Powell 8f1b638f3b Merge branch 'master' into merge-master 2022-03-01 10:04:23 +00:00
Rory Powell c1a2836dd1 Fix REST Import 2022-03-01 07:36:47 +00:00
mike12345567 8b6a9b7273 Merge branch 'develop' of github.com:Budibase/budibase into feature/budibase-api 2022-02-28 18:43:45 +00:00
mike12345567 4086c8f439 Fixes for review comments. 2022-02-28 18:39:05 +00:00
Andrew Kingston 49053cfe85 Improve parsing of REST query strings to support equals symbol in values 2022-02-28 16:23:53 +00:00
mike12345567 4a31045233 Changing the API key modal to have a copy input which allows copying the API key easily. 2022-02-28 14:29:19 +00:00
Andrew Kingston 75ef367ac2 Make view UI read only and limit rows to 10 2022-02-28 08:37:59 +00:00
Andrew Kingston 02725e08d2 Handle leading double slash when displaying REST queries in navigation 2022-02-25 14:29:25 +00:00
Andrew Kingston e34895989b Improve REST query naming in navigation 2022-02-25 14:18:26 +00:00
Andrew Kingston a3f45a0dac Merge branch 'develop' of github.com:Budibase/budibase into feature/table-row-selection 2022-02-25 13:49:24 +00:00
Andrew Kingston 175bde36d6 Ensure data binding generation doesn't crash if no asset is selected 2022-02-25 08:25:56 +00:00
mike12345567 53f108865a Merge branch 'develop' of github.com:Budibase/budibase into feature/budibase-api 2022-02-24 18:19:20 +00:00
Rory Powell 9e0a10955a Add status banner that reacts to cypress healthcheck failures 2022-02-24 14:41:24 +00:00
Andrew Kingston 08ec8ca7db Always update asset type when required, even if no assets of that type exist 2022-02-24 12:25:14 +00:00
Andrew Kingston e38cc1c079 Fix table row selection bindings not being generated, add row selection bindings for table blocks, update readable text for row selection bindings 2022-02-24 09:17:27 +00:00
Andrew Kingston 51153565d8 Merge branch 'develop' of github.com:Budibase/budibase into feature/table-row-selection 2022-02-23 14:47:06 +00:00
Andrew Kingston 1ec76e3e7e Merge branch 'develop' of github.com:Budibase/budibase into table-cell-config 2022-02-23 13:25:48 +00:00
Rory Powell 6fca8ca936 Merge branch 'master' into merge-master 2022-02-23 12:14:04 +00:00
Andrew Kingston 8f93227dad Merge branch 'table-cell-config' of github.com:Budibase/budibase into feature/table-row-selection 2022-02-23 12:10:03 +00:00
Andrew Kingston 63e2adbbbe Merge branch 'develop' of github.com:Budibase/budibase into table-cell-config 2022-02-23 11:32:51 +00:00
Peter Clement 10cfe35705 remove console log 2022-02-22 16:14:19 +00:00
Peter Clement dffdcd882f add ability to select rows from different tables and provide bindings 2022-02-22 15:18:08 +00:00
Peter Clement 87d001b66f Merge remote-tracking branch 'origin/develop' into feature/table-row-selection 2022-02-22 15:17:38 +00:00
Andrew Kingston 3dcbb2e74a Merge pull request #4549 from Budibase/fix/screen-creation-roles 
Fix role being stale when creating screens
 2022-02-22 12:51:12 +00:00
Andrew Kingston 95fd0f835b Fix usage of className instead of class 2022-02-22 12:36:51 +00:00
mike12345567 e1352ffbd2 Merge branch 'develop' of github.com:Budibase/budibase into feature/budibase-api 2022-02-21 16:54:39 +00:00
mike12345567 629bf6177a Merge branch 'master' of github.com:Budibase/budibase into develop 2022-02-21 16:51:08 +00:00
Rory Powell 469682f7d9 Merge pull request #4607 from Budibase/migration-tenantIds 
Respect custom tenantIds in run migrations endpoint
 2022-02-21 15:32:33 +00:00
mike12345567 738cd50030 Fixing issue with formula column validation breaking row save. 2022-02-21 15:01:42 +00:00
mike12345567 6cbf186ead Merge branch 'develop' of github.com:Budibase/budibase into feature/budibase-api 2022-02-21 14:34:06 +00:00
Andrew Kingston 58d7a30894 Lint 2022-02-21 13:50:20 +00:00
Andrew Kingston f1209f30de Merge branch 'develop' of github.com:Budibase/budibase into table-cell-config 2022-02-21 13:46:22 +00:00
Andrew Kingston 7236ae80e5 Allow bindings for table cell values and break out cell settings into its own drawer component 2022-02-21 13:19:29 +00:00
Tobias Speicher 491bcb86ed Replace deprecated String.prototype.substr() 
String.prototype.substr() is deprecated (see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substr) so we replace it with slice() which works similarily but isn't deprecated.
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
 2022-02-20 15:28:39 +01:00
Andrew Kingston f63db2fb4f Add configuration options for table cell customisation to the table component 2022-02-18 20:15:47 +00:00
Andrew Kingston 5e98b01d4e Fix table loading states and remove virtual table rendering 2022-02-18 14:12:29 +00:00
Andrew Kingston 6237af2826 Add quick actions for adding all column or for resetting column selection back to default 2022-02-18 12:36:12 +00:00
Rory Powell 814b5ae5ab Merge branch 'master' into develop 2022-02-18 11:57:54 +00:00
Rory Powell da9be1b20a Add 'location = /' -> 4001 to nginx dev conf 2022-02-18 11:18:59 +00:00
Andrew Kingston a69962c26c Fix usage of className instead of class 2022-02-17 16:06:17 +00:00
Andrew Kingston 6a4067da52 Fix role being stale when creating screens 2022-02-17 11:50:55 +00:00
Andrew Kingston 053e6af3d1 Use selected role when creating screens 2022-02-17 09:41:44 +00:00
Andrew Kingston c858b9341f Fix issue with schema generation when datasource is undefined 2022-02-17 09:25:02 +00:00
Martin McKeaveney e8d5d54f5d bug fix for handlebars expression, show budibase version in updates panel 2022-02-17 10:12:35 +01:00
mike12345567 f0b02cf9a9 Merge branch 'develop' of github.com:Budibase/budibase into feature/budibase-api 2022-02-16 15:30:48 +00:00
Peter Clement 1dd909c8c2 Merge remote-tracking branch 'origin/develop' into feature/table-row-selection 2022-02-16 14:35:42 +00:00
mike12345567 e5289ddcee Fixing #4522 - frontend-core refactor changed how some of these endpoints were used. 2022-02-16 13:13:40 +00:00
mike12345567 db45086105 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-02-15 16:54:21 +00:00
Peter Clement 5b46ef6120 disallow bindings selection for other actions 2022-02-15 15:05:36 +00:00
Andrew Kingston e009007b27 Merge branch 'fix/4337' of github.com:Budibase/budibase into fix/4337 2022-02-15 14:59:29 +00:00
Andrew Kingston ee0bfa9ab0 Update datasource schema generation to take new flags, and update automation blocks to use core databinding utilities 2022-02-15 14:59:11 +00:00
Peter Clement ca53ee4069 Merge remote-tracking branch 'origin/develop' into feature/automation-data-types 2022-02-15 14:14:27 +00:00
Peter Clement 7718f5cd89 uneeded import 2022-02-15 14:11:04 +00:00
mike12345567 6445cefee7 Fixing issue with value being set in binding panel as per review comments of aptkingston. 2022-02-15 13:49:20 +00:00
Peter Clement c0d929fd2f update automation type coercion 2022-02-15 13:03:24 +00:00
mike12345567 9cf3d97b4d Fixing issue with HBS insert, not including curlies as required. Also fixing an issue with value not always being correctly updated. 2022-02-15 11:19:59 +00:00
Andrew Kingston 070d4f74f0 Remove empty style blocks 2022-02-15 09:31:43 +00:00
mike12345567 c1bd5b8329 Fixing issue #4337, allows internal tables to search by the _id or _rev properties in automation query block. 2022-02-14 14:57:06 +00:00
Andrew Kingston 6c1701830f Improve layout and edge cases around using column editor drawer 2022-02-14 13:06:32 +00:00
Andrew Kingston 4f00e7a3b1 Add labels to column config drawer 2022-02-14 11:47:48 +00:00
Andrew Kingston c7edfa7f59 Remount button action components fully when changing action to prevent stale UI 2022-02-13 15:18:54 +00:00
mike12345567 126499f383 Fix for #4440, fixing validation of API endpoints. 2022-02-12 10:35:10 +00:00
Peter Clement 5a88c89baf changing bindings key 2022-02-11 15:37:43 +00:00
Peter Clement 8db67d5a3f fix bindings 2022-02-11 14:43:10 +00:00
Peter Clement f44471d9d0 fix js 2022-02-11 14:38:34 +00:00
Andrew Kingston 0f2d41c342 Merge branch 'develop' of github.com:Budibase/budibase into table-column-config 2022-02-11 14:28:36 +00:00
Peter Clement d4b98095c2 update how we handle coercion of types 2022-02-11 14:20:25 +00:00
Peter Clement d45c107db7 add row selection functionality to tables 2022-02-11 11:55:35 +00:00
mike12345567 594cb77b1e Getting api key/dev info docs setup and in use. 2022-02-10 19:06:49 +00:00
Martin McKeaveney d1cebc61a9 merge with master 2022-02-10 18:57:26 +01:00
mike12345567 f031c34253 Merge branch 'develop' of github.com:Budibase/budibase into feature/budibase-api 2022-02-10 17:42:28 +00:00
Martin McKeaveney 3a653e9f98 merge with master 2022-02-10 18:24:36 +01:00
Andrew Kingston b94ed3d23b Add new setting component for configuring table column order and display names 2022-02-10 16:41:43 +00:00
Andrew Kingston a0c703288c Fix button layout in drawers 2022-02-10 11:46:57 +00:00
Michael Drury 45a965b041 Adding basic endpoints for API keys. 2022-02-09 23:16:24 +00:00
Michael Drury 911f2780ef Start of API key modal. 2022-02-09 20:30:52 +00:00
Michael Drury 2820614324 Revert "Changing update user info to view user info." 
This reverts commit 8f81906896.
 2022-02-09 19:39:02 +00:00
mike12345567 8f81906896 Changing update user info to view user info. 2022-02-09 18:30:00 +00:00
Michael Drury 1cc32e42c0 Merge branch 'develop' into frontend-core 2022-02-09 14:42:05 +00:00
Martin McKeaveney 375deb5ee9 fixing bug with gsheets 2022-02-09 15:41:20 +01: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
Peter Clement 4a02d36cd0 removing uneeded log 2022-02-08 15:23:37 +00:00
Peter Clement b081302f17 change naming of toggle 2022-02-08 15:14:45 +00:00
Peter Clement 1b86b3f03c fix modal confirmatiom button 2022-02-08 15:08:32 +00:00
Peter Clement b91919e6d1 change naming of var 2022-02-08 15:00:16 +00:00
Peter Clement ca821f2a47 allow use of plain inputs for automations enabling use of bindings in all types 2022-02-08 14:52:08 +00:00
mike12345567 36bd285093 Merge branch 'develop' of github.com:Budibase/budibase into fix/feb-fixes 2022-02-08 12:28:27 +00:00
Andrew Kingston d90ccc26c7 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-08 08:12:37 +00:00
mike12345567 580d3d9615 Removing empty block. 2022-02-07 18:47:49 +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 a35a8cb81c Addomg a fix for #4370 - allow queries to contain newlines, they will always be escaped. 2022-02-07 17:56:01 +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 d78e6a5e59 Merge branch 'develop' of github.com:Budibase/budibase into feature/real-rich-text 2022-02-07 12:13:29 +00:00
Andrew Kingston 3b6128f33f Use automatic formatting for generated longform fields 2022-02-07 12:11:20 +00:00
Andrew Kingston d12cd2abdf Add rich text option to long form data type 2022-02-07 12:04:43 +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 90514af833 Merge branch 'develop' of github.com:Budibase/budibase into feature/real-rich-text 2022-02-04 13:53:01 +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 a3eef9f534 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-04 09:23:32 +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 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
Andrew Kingston 9310ef08f5 Add markdown viewer component to builder 2022-02-02 21:23:39 +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 66e104f02b Use new rich text field in build backend UI 2022-02-02 15:18:46 +00:00
Andrew Kingston de12e0dc79 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-02-01 16:46:00 +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 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
mike12345567 f9c7877e02 Merge branch 'develop' of github.com:Budibase/budibase into feature/formula-filtering 2022-01-31 15:21:15 +00:00
mike12345567 d55005d327 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-01-31 14:29:02 +00:00
Rory Powell bdc37b6ff7 Fix CSRF token not present using local auth 2022-01-31 11:07:54 +00:00
Andrew Kingston 9b1754ad70 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-31 09:40:33 +00:00
Rory Powell 0089fb06d9 Merge branch 'develop' into csrf 2022-01-30 21:20:48 +00:00
Andrew Kingston fab27eea77 Fix issue with backend UI not refreshing when adding a row 2022-01-28 15:17:21 +00:00
Maurits Lourens 24b2fc65a0 Adds a url to the templates 2022-01-28 16:06:46 +01:00
Andrew Kingston f8378e551d Redirect if opening a locked app 2022-01-27 13:44:09 +00:00
mike12345567 412b7e5f06 Fixing #4205 - making sure builder loads the correct role for the query. 2022-01-26 18:59:41 +00:00
mike12345567 9b55ba8b13 Fixing #4192 - allowing switching between JSON and multi-select types, as well as not switching multi-select to JSON when fetching SQL tables. 2022-01-26 18:50:13 +00:00
Andrew Kingston bfe209e3e6 Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-26 17:49:27 +00:00