Commit Graph

26058 Commits

Author SHA1 Message Date
Andrew Kingston 41e72a28c9
Merge branch 'master' into grid-all-datasources 2023-10-18 15:59:12 +01:00
Andrew Kingston 05133d7e69 Ensure data section grid sort column options are properly filtered down 2023-10-18 15:44:27 +01:00
Andrew Kingston fb69c3a0da Add new shared core util for determining whether columns can be sort columns or not 2023-10-18 15:38:37 +01:00
mike12345567 13dadbcc7d Merge branch 'master' of github.com:Budibase/budibase into fix/internal-db-enrich-perf 2023-10-18 15:22:00 +01:00
Sam Rose 6e9c643fce
Merge branch 'feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-18 15:21:44 +01:00
Michael Drury a8b13ec8e4
Merge branch 'master' into fix/couchdb-image-build 2023-10-18 15:20:18 +01:00
Martin McKeaveney 5cd22672b3
Merge pull request #12097 from Budibase/budi-7640-testimonials-arent-removed-from-forgot-passwordreset
Added testimonial check to reset and forgot pages.
2023-10-18 15:20:12 +01:00
Martin McKeaveney 62e902398e
Merge branch 'master' into budi-7640-testimonials-arent-removed-from-forgot-passwordreset 2023-10-18 15:15:49 +01:00
Sam Rose c84abb3e86
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-18 15:15:06 +01:00
Sam Rose c25de74e17
Action Michael's feedback about the structure of this feature. 2023-10-18 15:14:34 +01:00
Adria Navarro ba053490dc Npm-less images 2023-10-18 16:08:54 +02:00
Adria Navarro e80a20d61f Use root as docker context for the app/worker images 2023-10-18 16:08:54 +02:00
Adria Navarro b171e8e00f Update the script to be sh and workspace agnostic 2023-10-18 16:08:54 +02:00
mike12345567 705c948de7 Removing a sudo that was causing the docker image build to fail with buildx - we don't need sudo commands as the Dockerfile is always running as the root. 2023-10-18 14:51:49 +01:00
Andrew Kingston bdc2bcd97d Add support for multiple dependsOn constraints in the manifest and fix issue with nullish dependsOn contraints 2023-10-18 14:41:42 +01:00
Andrew Kingston 93d717d2e9 Fix add new row setting not being enough to edit new rows with also enabling edit rows flag 2023-10-18 14:25:59 +01:00
Andrew Kingston faa70b79b6 Fix on click actions not working when using non DS+ datasources and edit row setting is hidden but enabled 2023-10-18 14:21:09 +01:00
Budibase Staging Release Bot 4e742f0c07 Bump version to 2.11.38 2023-10-18 12:42:55 +00:00
Michael Drury c033c85f46
Merge pull request #12076 from Budibase/fix/12070-user-column-dnd-freeze
User column drag and drop freeze fix
2023-10-18 13:36:11 +01:00
Michael Drury 2002433c1a
Merge branch 'master' into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-18 13:35:56 +01:00
Michael Drury 93464f3fcf
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-18 13:23:40 +01:00
José Vte. Calderón a06bf29ed1
Merge pull request #12104 from Budibase/features/per-user-per-creator-realease2
[Added] Per user per creator changes
2023-10-18 14:15:17 +02:00
Michael Drury 30fadf0138
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-18 13:05:33 +01:00
jvcalderon 362ac27422 Merge branch 'master' into features/per-user-per-creator-realease2 2023-10-18 14:04:24 +02:00
Michael Drury dde1cb7b60
Merge pull request #12100 from Budibase/fix/improve-external-request-typing
Improving typing of external row API
2023-10-18 13:03:09 +01:00
jvcalderon f7584d0047 Relaunch CI pipeline 2023-10-18 14:01:54 +02:00
Michael Drury 7d70ba1052
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-18 12:57:35 +01:00
Michael Drury a60690f787
Merge branch 'master' into fix/improve-external-request-typing 2023-10-18 12:50:49 +01:00
jvcalderon 44474b063a Merge branch 'master' into features/per-user-per-creator-realease2 2023-10-18 13:43:11 +02:00
Adria Navarro 05bc2bfc0d
Merge pull request #12103 from Budibase/fix/pro-submodule-oct-23
Switching pro back to master.
2023-10-18 13:40:32 +02:00
jvcalderon 5b2f55a592 Per user per creator changes 2023-10-18 13:36:34 +02:00
mike12345567 ad3083ede6 Switching to pro master before recent creator changes. 2023-10-18 12:36:22 +01:00
Dean 0d67f000f0 Initial reflow of the block settings 2023-10-18 12:19:24 +01:00
mike12345567 aee955cdf2 Switching pro back to master. 2023-10-18 12:11:24 +01:00
Sam Rose 5747f30b5f
Precondition checks to make sure the migration is from the right column to the right column. 2023-10-18 12:04:50 +01:00
Michael Drury 1d951a5d79
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-18 12:04:32 +01:00
Michael Drury b98f313754
Merge branch 'master' into fix/improve-external-request-typing 2023-10-18 12:04:22 +01:00
Sam Rose 1ab52f3304
Merge pull request #12090 from Budibase/refactor/remove-jsdoc-types-in-ts-files
Remove type information from JSDoc in .ts files
2023-10-18 11:57:11 +01:00
Dean d19d9168d0 Merge remote-tracking branch 'origin/master' into feature/form-block-description 2023-10-18 11:46:33 +01:00
Sam Rose f9bff0846a
Merge branch 'master' into refactor/remove-jsdoc-types-in-ts-files 2023-10-18 11:45:52 +01:00
Michael Drury b697872cf8
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-18 11:44:56 +01:00
Michael Drury 5ff6b7a474
Merge branch 'master' into fix/improve-external-request-typing 2023-10-18 11:43:07 +01:00
Adria Navarro 9a8f7aeb84
Merge pull request #12098 from Budibase/fix/couchdb-fauxton-timeout
CouchDB extend logout timeout
2023-10-18 12:42:19 +02:00
Michael Drury 698c93442e
Merge branch 'master' into fix/improve-external-request-typing 2023-10-18 11:40:57 +01:00
mike12345567 7d51a3d385 Extending Fauxton timeout from 600s -> 7200s. Allow for 2 hours before logout occurs. 2023-10-18 12:39:10 +02:00
Dean 0ce44d8540 Merge remote-tracking branch 'origin/master' into feature/form-block-description 2023-10-18 11:37:51 +01:00
Budibase Staging Release Bot 67d68ce0eb Bump version to 2.11.37 2023-10-18 10:34:47 +00:00
Michael Drury 0c9f483c39
Merge branch 'master' into fix/improve-external-request-typing 2023-10-18 11:31:53 +01:00
Adria Navarro 35f7e7d6fb
Merge pull request #12082 from Budibase/chore/remove-sentry-references
Remove sentry references
2023-10-18 12:23:11 +02:00
Dean a064512224 Added description field to the formblock 2023-10-18 11:14:16 +01:00