Commit Graph

4522 Commits

Author SHA1 Message Date
Martin McKeaveney d1cebc61a9 merge with master 2022-02-10 18:57:26 +01: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
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
Andrew Kingston 05e9f6088b Use frontend-core implementation of data fetching in backend UI 2022-01-26 17:43:48 +00:00
Martin McKeaveney 19d27c97a4 code review and merge with develop 2022-01-26 17:45:28 +01:00
Martin McKeaveney efde072e70 code review 2022-01-26 17:14:47 +01:00
Andrew Kingston c7cd6b923d Merge branch 'develop' of github.com:Budibase/budibase into frontend-core 2022-01-26 16:02:27 +00:00
Rory Powell 716a693552 Merge pull request #4137 from Budibase/feature/app-urls
Custom App URLs
2022-01-26 14:55:36 +00:00
Rory Powell 3d533d9f13 Handle undefined url 2022-01-26 13:39:40 +00:00
Rory Powell f66a8b888f Handle unexpected errors during validation 2022-01-25 23:27:28 +00:00
Rory Powell 9db180b166 Fix cypress and update nodemon config to use backend-core 2022-01-25 23:26:39 +00:00
Rory Powell ffcf5354eb Add CSRF Token 2022-01-25 22:54:50 +00:00
Andrew Kingston 9a813dbb29 Lint 2022-01-25 15:49:35 +00:00
Andrew Kingston 9d52841219 Refactor automation store to properly handle errors 2022-01-25 15:44:08 +00:00
Andrew Kingston 45547f1efc Improve handling of 403 logouts and return URL cookie 2022-01-25 15:28:31 +00:00
Andrew Kingston aec1f90412 Fix filter modal crashing when encountering an undefined option for a select field 2022-01-25 08:30:19 +00:00
Andrew Kingston b0c03d8508 Improve style of data import modal 2022-01-25 08:22:53 +00:00