Peter Clement
b963bd03e4
fixing undefined name and border issues
2023-10-30 12:55:24 +00:00
Conor Webb
e9f0baa12f
Added conditional logic to prevent checkmark from appearing on other selects outside of types.
2023-10-30 12:17:36 +00:00
Adria Navarro
24eed537ed
Fix timeouts
2023-10-30 12:00:55 +01:00
Adria Navarro
b0ef79bbd9
Build for both amd and arm platforms
2023-10-30 11:36:32 +01:00
Conor Webb
8f5646a1ed
Fixed linting issue.
2023-10-30 10:15:53 +00:00
Conor Webb
0461d86545
Refactored select to match designs used elsewhere.
2023-10-30 09:57:08 +00:00
Sam Rose
00aca08741
Merge branch 'master' of github.com:Budibase/budibase into bug/budi-7689-cdn-issues-attachment-filtering
2023-10-30 09:46:03 +00:00
Sam Rose
d0fecc1c64
Merge branch 'master' into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column
2023-10-30 09:45:21 +00:00
Adria Navarro
725e3aa4ef
Use image v2 on build:docker
2023-10-30 10:11:06 +01:00
Andrew Kingston
49b0a9d716
Merge branch 'master' into feature/form-block-settings-reflow
2023-10-30 08:41:39 +00:00
jvcalderon
cd283ad0b0
Merge branch 'master' into feature/per-creator-final
2023-10-30 09:02:02 +01:00
jvcalderon
1221808c67
Updata pro submodule
2023-10-30 09:00:20 +01:00
mike12345567
330059991e
Removing any.
2023-10-27 18:04:28 +01:00
mike12345567
d4929ea3b6
Fixing an issue where unpublished apps with custom roles, when used in groups would cause users to be unable to login.
2023-10-27 18:03:06 +01:00
Sam Rose
84ba840dbc
Apply valid file type change to AttachmentField in cloud only.
2023-10-27 17:29:05 +01:00
Sam Rose
f1aa32e446
Truncate file size on the grid, validate extension in the attachment API.
2023-10-27 17:19:39 +01:00
mike12345567
6ecf831f02
Updating pro submodule reference.
2023-10-27 17:10:03 +01:00
Sam Rose
5539ff9c9c
Apply valid file types to RowFieldControl and AttackmentField.
2023-10-27 16:53:32 +01:00
Sam Rose
6bb6f106d5
Apply valid file types to AttachmentCell.
2023-10-27 16:46:30 +01:00
Sam Rose
2160f4e5e2
Add valid extension list to shared-core.
2023-10-27 16:24:02 +01:00
Andrew Kingston
95b1f78968
Merge branch 'form-block-field-layout' of github.com:Budibase/budibase into form-block-field-layout
2023-10-27 16:06:27 +01:00
Andrew Kingston
de55445168
Update pro
2023-10-27 16:06:06 +01:00
Sam Rose
45543cbc03
Catch a few more edge cases with column names, add tests for them.
2023-10-27 15:59:31 +01:00
Andrew Kingston
35194e4710
Merge branch 'master' into form-block-field-layout
2023-10-27 15:26:43 +01:00
Andrew Kingston
4fd1c26bbd
Clean up
2023-10-27 15:13:49 +01:00
Andrew Kingston
77fa373a90
Remove ability to select fields in preview because it is not compatible with field configuration changes
2023-10-27 15:09:17 +01:00
Sam Rose
d04f2198b6
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column
2023-10-27 15:04:18 +01:00
Peter Clement
38fe8375ce
fix bindings references being updated
2023-10-27 13:47:34 +01:00
Michael Drury
c0a9b0a678
Merge branch 'master' into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column
2023-10-27 13:36:52 +01:00
Michael Drury
a669712d0c
Merge branch 'master' into remove-apidoc-comments
2023-10-27 13:36:07 +01:00
Michael Drury
2bfdd9769e
Merge pull request #12177 from Budibase/feature/make-table-source-id-required
...
Make sourceId property of table required (for all table types)
2023-10-27 13:35:47 +01:00
Dean
09c3ad50c9
Merge remote-tracking branch 'origin/master' into feature/form-block-settings-reflow
2023-10-27 12:44:14 +01:00
Andrew Kingston
8612404f48
Merge branch 'master' of github.com:Budibase/budibase into form-block-field-layout
2023-10-27 11:49:39 +01:00
Sam Rose
5dd61f8994
Remove APIDoc comments.
2023-10-27 11:47:01 +01:00
mike12345567
9b1a7bd854
PR comments - updating pickAPI to use a common function.
2023-10-27 11:43:01 +01:00
Andrew Kingston
b1f2337849
Hide field layout settings for normal field components, and only show them when editing from within a form block
2023-10-27 11:42:01 +01:00
Dean
d9f52295ee
Moved the description block out of the header to ensure it's visible for the view mode
2023-10-27 11:36:45 +01:00
Peter Clement
b1dabe7dc5
missing binding
2023-10-27 11:22:34 +01:00
Peter Clement
bce098f04e
Merge remote-tracking branch 'origin/master' into feat/automation-naming-ux-updates
2023-10-27 11:16:09 +01:00
Conor Webb
2b691c169f
Ran Prettier to fix linting issue.
2023-10-27 11:13:24 +01:00
Dean
d790fb28da
Merge remote-tracking branch 'origin/master' into feature/change-global-admin-to-creator
2023-10-27 11:05:59 +01:00
Conor Webb
d0ea6edad3
Added selected class to data provider options.
2023-10-27 10:55:19 +01:00
mike12345567
ae69f9dd92
Update pro reference.
2023-10-27 10:47:50 +01:00
Peter Clement
bade344834
Merge remote-tracking branch 'origin/master' into feat/automation-naming-ux-updates
2023-10-27 10:46:26 +01:00
mike12345567
8b9a8bf5f2
Updating pro reference.
2023-10-27 10:46:00 +01:00
Peter Clement
8a7a2abd61
styling / pr comments
2023-10-27 10:45:58 +01:00
Michael Drury
fec5015422
Merge branch 'master' into bug/budi-7681-groups-list-infinite-reload-loop
2023-10-27 10:14:39 +01:00
Duarte Velez Grilo
fbbc5d0f64
Merge branch 'master' into master
2023-10-27 10:08:24 +01:00
Dean
4b1e7359b0
Merge remote-tracking branch 'origin/master' into feature/change-global-admin-to-creator
2023-10-27 10:00:02 +01:00
Dean
4fc7143b32
Merge remote-tracking branch 'origin/master' into feature/form-block-settings-reflow
2023-10-27 09:41:08 +01:00
Dean
c4cede035c
Merge remote-tracking branch 'origin/master' into fix/row-id-delete-parsing
2023-10-27 09:26:30 +01:00
Andrew Kingston
1d5fc3a175
Merge branch 'master' into fix/view1-sortable-column-config
2023-10-27 09:19:06 +01:00
Dean
58437cff06
Merge remote-tracking branch 'origin/master' into fix/row-id-delete-parsing
2023-10-27 09:14:07 +01:00
Peter Clement
89a242f354
fix issue with readable bindings not displayinng correctly
2023-10-27 09:13:27 +01:00
Dean
e7fcd08fc6
Merge remote-tracking branch 'origin/master' into feature/buttongroup-component
2023-10-27 09:03:46 +01:00
Dean
122c8ec18c
Merge remote-tracking branch 'origin/master' into fix/row-id-delete-parsing
2023-10-27 09:02:23 +01:00
Andrew Kingston
e2c2f5e2a6
Fix some issues with dropzone height and ensure field alignment settings are ignored unless used inside a form block
2023-10-27 08:50:26 +01:00
Andrew Kingston
77cd723315
Remove label alignment option from form block to support custom field layouts
2023-10-27 08:14:55 +01:00
Andrew Kingston
c61e4fe708
Merge branch 'master' into feature/formblock-styles-tab-reflow
2023-10-27 08:12:31 +01:00
Andrew Kingston
2bf78db0a0
Add field layout setting to BB reference field
2023-10-27 08:11:09 +01:00
Andrew Kingston
acc1e6f14c
Merge branch 'master' of github.com:Budibase/budibase into form-block-field-layout
2023-10-27 08:07:57 +01:00
Andrew Kingston
69cffd0f09
Clean up
2023-10-26 19:14:36 +01:00
Andrew Kingston
fd15f771ef
Refactor how relationship cells fetch and cache primary display columns to fix issues with store stale data
2023-10-26 19:03:04 +01:00
mike12345567
854ff47e1c
Final fix - removing external from create table (internal).
2023-10-26 18:36:07 +01:00
mike12345567
e12cef305a
Fixing export.
2023-10-26 18:34:21 +01:00
mike12345567
d13cc80022
Removing update to gitignore.
2023-10-26 18:23:39 +01:00
mike12345567
983091e901
Fix for tests - row.spec.ts needs to pick correct table create.
2023-10-26 18:21:06 +01:00
Sam Rose
b3cc9bea23
Merge branch 'master' of github.com:Budibase/budibase into bug/budi-7681-groups-list-infinite-reload-loop
2023-10-26 17:55:58 +01:00
Sam Rose
5a80487c77
Fix redirect loop when accessing a group as a global builder but not an admin.
2023-10-26 17:54:26 +01:00
Andrew Kingston
23cdac5906
Update grids to support pagination with REST queries and to simplify some logic
2023-10-26 17:37:59 +01:00
mike12345567
d0f989597a
Updating tests to be more consistent in how they pick to create an internal or external table.
2023-10-26 17:27:54 +01:00
mike12345567
fd29b8d949
PR comments.
2023-10-26 17:27:40 +01:00
mike12345567
115a67cfd6
Fixing test case.
2023-10-26 17:03:05 +01:00
Peter Clement
6ba9e68e64
Merge remote-tracking branch 'origin/master' into feat/automation-naming-ux-updates
2023-10-26 16:48:32 +01:00
mike12345567
19eaafd946
Fixing some test cases.
2023-10-26 16:32:34 +01:00
melohagan
9616e8e551
Custom role navigation links ( #12056 )
...
* Refactor routing unit tests
* Filter out higher level roles in preview
* unit test
* Refactor
---------
Co-authored-by: Michael Drury <me@michaeldrury.co.uk>
2023-10-26 15:28:12 +00:00
Dean
6d9ca77d99
Merge remote-tracking branch 'origin/master' into fix/row-id-delete-parsing
2023-10-26 16:24:37 +01:00
Peter Clement
35e7dc948d
Merge remote-tracking branch 'origin/master' into feat/automation-naming-ux-updates
2023-10-26 16:11:42 +01:00
Dean
5266d80afe
Fix to ensure single integer ids are parsed correctly
2023-10-26 16:09:01 +01:00
Peter Clement
d864eaa9ea
pr comments
2023-10-26 16:05:15 +01:00
Sam Rose
ae356b6a50
Bump version of @budibase/nano to complete the DatabaseQueryOpts type usage.
2023-10-26 15:51:28 +01:00
Sam Rose
536d85d828
WIP: Improving the use of DatabaseQueryOpts.
2023-10-26 15:04:33 +01:00
Adria Navarro
62cab7e25e
Merge branch 'master' into chore/single-release-pipeline
2023-10-26 14:44:16 +02:00
mike12345567
ed0670a008
Major update to make the table.type always 'table' and then adding a new sourceType which states what source the table came from, external or internal. Don't want to keep using a type that should be static as two different things.
2023-10-26 13:19:09 +01:00
Gerard Burns
44f9c64ed7
Prevent the key user being used in rest queries ( #12072 )
...
* Add warning about unusable user binding
* linting
* remove unnecessary safe nav operators
* change regex to capture property access of user binding
2023-10-26 13:06:25 +01:00
Adria Navarro
3b3586d2bd
Merge branch 'master' into feature/change-global-admin-to-creator
2023-10-26 12:58:35 +02:00
Adria Navarro
8db0ff79a6
Increase yarn timeouts
2023-10-26 12:44:52 +02:00
Peter Clement
73a7b8eb50
fix formatting of selectors
2023-10-26 11:27:34 +01:00
Peter Clement
8203139c69
fix bug in adding trigger
2023-10-26 11:27:20 +01:00
Gerard Burns
5909b4a7c7
Add template for grid blocks ( #12086 )
...
* wip
* linting
---------
Co-authored-by: Mihail Hadzhiev <102024164+MihailHadzhiev2022@users.noreply.github.com>
2023-10-26 11:24:43 +01:00
Mihail Hadzhiev
3473aa61ff
Merge branch 'master' into feature/change-global-admin-to-creator
2023-10-26 12:58:52 +03:00
Mihail Hadzhiev
e5ff023881
Merge branch 'master' into feature/buttongroup-component
2023-10-26 12:50:47 +03:00
Peter Clement
3eba7990f9
fix bug with smtp name containing parentheses
2023-10-26 10:23:51 +01:00
Dean
6032216e2f
Added fix for scenario where componentdefinition was queried befor it existed. Fix to ensure an empty general settings block is not shown
2023-10-26 10:13:22 +01:00
Andrew Kingston
230dc169fa
Revert previous fix for relationship column dragging
2023-10-26 10:11:34 +01:00
Sam Rose
26100ffd8b
Merge branch 'feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column' into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column-4
2023-10-26 09:57:11 +01:00
Sam Rose
b3c08f0e7a
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column
2023-10-26 09:56:56 +01:00
Dean
3b7ed3a7f2
Merge remote-tracking branch 'origin/master' into feature/formblock-styles-tab-reflow
2023-10-26 09:56:17 +01:00
Andrew Kingston
a74f78f31b
Merge branch 'master' into feature/buttongroup-component
2023-10-26 09:14:40 +01:00
Andrew Kingston
0d9e9caff6
Merge branch 'master' into refactor-grid-columns
2023-10-26 08:53:17 +01:00
mike12345567
fd0d8f17f2
Making sure single table get also includes sourceId.
2023-10-25 19:07:51 +01:00
mike12345567
455b26bac9
Making sure the source ID is always set when creating a table - the frontend expects this to be set for every table so making the type represent this correctly.
2023-10-25 19:00:25 +01:00
Sam Rose
6c3b535863
Simplify try-catch in the migrate function.
2023-10-25 16:49:29 +01:00
Sam Rose
4a00649f7f
Simplify the function signature of processInternalTables
2023-10-25 16:46:14 +01:00
Sam Rose
e03b1be9d1
Make sure new column name cannot be the same as an existing column name.
2023-10-25 16:41:37 +01:00
Sam Rose
c5097487e2
Use FieldType constant instead of raw string.
2023-10-25 16:38:55 +01:00
Sam Rose
ef84e96f98
Use RelationshipType enum instead of raw string.
2023-10-25 16:38:14 +01:00
Sam Rose
2c5dd99da2
Use FieldSubtype enum instead of raw strings.
2023-10-25 16:37:15 +01:00
Sam Rose
7acce7b7c0
Remove unused dispatch import.
2023-10-25 16:01:08 +01:00
Sam Rose
c9e3b7a348
Remove the previous attempt at syncing grid state, it is no longer needed.
2023-10-25 16:00:14 +01:00
Sam Rose
0ac6b17ff0
Remove stray console.log
2023-10-25 15:33:53 +01:00
Sam Rose
402a53cacb
User constant for user table ID.
2023-10-25 15:33:12 +01:00
Sam Rose
5779e97e6e
Add column name input validation.
2023-10-25 15:29:56 +01:00
Dean
ce443e6295
Merge remote-tracking branch 'origin/master' into feature/form-block-settings-reflow
2023-10-25 15:15:42 +01:00
Sam Rose
fbf60ece4f
Merge base branch.
2023-10-25 14:58:37 +01:00
Sam Rose
e3a702c214
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column
2023-10-25 14:54:39 +01:00
Sam Rose
007e919d0e
Spring cleaning before review.
2023-10-25 14:53:51 +01:00
Andrew Kingston
a3226bc905
Merge branch 'master' into enable-collapsing-settings-sections
2023-10-25 14:43:05 +01:00
Sam Rose
70f39b6b6b
Fix missing sourceId on Table sent to the websocket.
2023-10-25 14:41:23 +01:00
Dean
8db0b300fd
Merge remote-tracking branch 'origin/master' into feature/buttongroup-component
2023-10-25 14:26:58 +01:00
Peter Clement
b1f05eba42
Merge remote-tracking branch 'origin/master' into feat/automation-naming-ux-updates
2023-10-25 14:21:47 +01:00
Peter Clement
9bc94aa703
remove autocomplete
2023-10-25 14:09:59 +01:00
Dean
6a3fadd3e1
Merge remote-tracking branch 'origin/master' into feature/form-block-settings-reflow
2023-10-25 14:04:03 +01:00
Andrew Kingston
62f4c3e85b
Merge branch 'master' into refactor-grid-columns
2023-10-25 13:57:22 +01:00
Andrew Kingston
2bb8ba45d1
Merge branch 'master' into grid-inline-searching
2023-10-25 13:50:55 +01:00
Dean
536a27541f
Merge remote-tracking branch 'origin/master' into feature/change-global-admin-to-creator
2023-10-25 13:27:54 +01:00
Peter Clement
edb511cbce
update field styling and ux for individual blocks
2023-10-25 13:27:01 +01:00
Peter Clement
7910205807
update styling of flow items
2023-10-25 13:26:56 +01:00
Peter Clement
aad6ab4fb4
update bindings to use names
2023-10-25 13:26:48 +01:00
Peter Clement
a209280daa
naming automations
2023-10-25 13:26:42 +01:00
Peter Clement
5f2b4f3ef9
initial styling and input updates for naming
2023-10-25 13:26:33 +01:00
Dean
d4ff67b999
Merge remote-tracking branch 'origin/master' into feature/component-name-setting-ux-update
2023-10-25 12:34:13 +01:00
Andrew Kingston
d3fe9775f3
Merge branch 'master' into grid-inline-searching
2023-10-25 12:32:04 +01:00
Dean
9200366f79
Merge remote-tracking branch 'origin/master' into fix/view1-sortable-column-config
2023-10-25 12:09:59 +01:00
Dean
b952892c42
Generalised the fix as not all calculations will have a groupby per PR feedback
2023-10-25 12:08:56 +01:00
Sam Rose
52f97fbd1f
Attempt to emit events that include the originator.
2023-10-25 11:38:31 +01:00
Sam Rose
78afba63de
Emit table updates to the builder socket, and some minor refactoring.
2023-10-25 11:03:35 +01:00
Dean
66fda3db09
Merge remote-tracking branch 'origin/master' into fix/view1-sortable-column-config
2023-10-25 09:15:37 +01:00
José Vte. Calderón
bc1999fe30
Merge branch 'master' into feature/sync-quotas-2
2023-10-25 10:02:09 +02:00
Andrew Kingston
4fb18baf17
Merge branch 'grid-inline-searching' of github.com:Budibase/budibase into refactor-grid-columns
2023-10-25 08:48:21 +01:00
Andrew Kingston
b88be9b1df
Merge branch 'master' into feature/form-block-description
2023-10-25 08:45:34 +01:00
jvcalderon
65111c81ef
Reactivate sync quotas migration
2023-10-25 08:44:59 +02:00
Michael Drury
9983d67163
Adding mimetype for client library response (correcting from octet-stream).
2023-10-24 22:13:56 +01:00
Michael Drury
5fabe32434
Making sure client endpoint available in prod.
2023-10-24 20:35:25 +01:00
Michael Drury
c6b377c565
Revert "Revert "Client library fetching through server""
2023-10-24 18:13:36 +01:00
Michael Drury
e2e5c9044c
Revert "Client library fetching through server"
2023-10-24 18:12:20 +01:00
Sam Rose
0f5c2cff00
Handle a couple more edge cases more gracefully.
2023-10-24 18:06:25 +01:00
Sam Rose
fb998502bb
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column
2023-10-24 17:34:41 +01:00
Sam Rose
a8ae16852c
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column-4
2023-10-24 17:34:19 +01:00
Sam Rose
f4c6ab7f48
Make sure the user cannot enter the same column name as the old column for the migrated column.
2023-10-24 17:33:49 +01:00
Michael Drury
2888335724
Merge branch 'master' into fix/client-lib-fetching
2023-10-24 17:31:44 +01:00
mike12345567
701d30abb4
Don't pass through default tenant ID.
2023-10-24 17:30:57 +01:00
mike12345567
ba5b1d7cfa
Adding tenant ID to query string and fixing test cases.
2023-10-24 17:27:58 +01:00
Sam Rose
d3670ddf21
Add an input to allow the user to choose the new column name.
2023-10-24 17:22:49 +01:00
Duarte Velez Grilo
18c7c96080
Merge branch 'master' into master
2023-10-24 17:12:27 +01:00
mike12345567
b53158ac08
Moving the client library to be retrieved using the same mechanism as we do in development, through the server instance (same as the builder itself). This should help with the CDN issues that we have been having, although attachments are still currently affected.
2023-10-24 16:25:14 +01:00
jvcalderon
102a082484
Update pro submodule
2023-10-24 17:18:13 +02:00
jvcalderon
cea1c04b73
Creators count functionality
2023-10-24 17:16:44 +02:00
Sam Rose
2f0a40e9bb
Introduce modal to show warning to users, and toast to show success.
2023-10-24 15:18:46 +01:00
Andrew Kingston
ea7b3381c2
Merge branch 'master' of github.com:Budibase/budibase into grid-inline-searching
2023-10-24 13:37:44 +01:00
Adria Navarro
969ab79a61
Merge branch 'master' into feature/buttongroup-component
2023-10-24 14:30:09 +02:00
Andrew Kingston
7e3d59a582
Merge branch 'master' into grid-inline-searching
2023-10-24 13:30:07 +01:00
Andrew Kingston
7c19e9ed96
Merge branch 'master' into fix-table-metadata
2023-10-24 11:34:52 +01:00
jvcalderon
5c1710b5da
Update pro submodule
2023-10-24 12:15:28 +02:00
jvcalderon
dbc903f3e6
Remove console.log
2023-10-24 12:03:07 +02:00
jvcalderon
980a46abb3
Merge branch 'master' into feature/per-creator-migration
2023-10-24 11:03:02 +02:00
jvcalderon
f643bc5ee8
Keep only migrations
2023-10-24 10:24:00 +02:00
Andrew Kingston
d82aec9f31
Merge branch 'master' into feature/form-block-description
2023-10-24 08:56:14 +01:00
Andrew Kingston
76edd1421a
Merge branch 'master' into feature/formblock-styles-tab-reflow
2023-10-24 08:55:51 +01:00
Andrew Kingston
00450dc59b
Merge branch 'master' into feature/form-block-settings-reflow
2023-10-24 08:55:37 +01:00
Andrew Kingston
654e6539bb
Merge branch 'master' into fix-table-metadata
2023-10-24 08:55:23 +01:00
Andrew Kingston
b6a8e6c0cf
Merge branch 'master' into enable-collapsing-settings-sections
2023-10-24 08:54:54 +01:00
Adria Navarro
52b86b44cb
Merge branch 'master' into feature/change-global-admin-to-creator
2023-10-24 09:54:19 +02:00
Andrew Kingston
c5537dd58c
Prettier
2023-10-24 08:46:55 +01:00
Andrew Kingston
f355933bf3
Add grid support for old views with groupBy specified, and any other datasource that has a custom means of determining a datasource schema
2023-10-24 08:26:57 +01:00
Duarte Velez Grilo
7f9fd26f5b
Merge branch 'master' into master
2023-10-23 23:12:56 +01:00
Sam Rose
a701933f48
Frontend changes for the user column migration work.
2023-10-23 17:57:25 +01:00
Dean
08a22f1525
Show 'Creator' instead of 'Admin' for the global user role picker
2023-10-23 16:47:05 +01:00
Sam Rose
42e31d19fb
Merge master.
2023-10-23 16:18:51 +01:00
Adria Navarro
3deb8341d3
Merge branch 'master' into BUDI-7641/package_version_from_env
2023-10-23 15:57:24 +02:00
jvcalderon
bc4dd8e1c9
Update pro submodule
2023-10-23 15:43:44 +02:00
Adria Navarro
453c0744be
Fix tests
2023-10-23 15:20:44 +02:00
Adria Navarro
e3b342da57
Fix after renames
2023-10-23 13:57:23 +02:00
Adria Navarro
3c85f1ce9e
Fix after renames
2023-10-23 13:55:58 +02:00
Adria Navarro
3c16e82035
Comment docker
2023-10-23 13:55:23 +02:00
Adria Navarro
0cc7cc67a3
Renames
2023-10-23 13:53:18 +02:00
Andrew Kingston
73f3b76c01
Update default column visibility check
2023-10-23 12:40:29 +01:00
Dean
cf8a634a72
Merge remote-tracking branch 'origin/master' into feature/form-block-description
2023-10-23 12:34:31 +01:00
jvcalderon
a22aea63a3
Update pro submodule
2023-10-23 13:33:56 +02:00
jvcalderon
a285fb1d40
Missed code in merge
2023-10-23 13:33:27 +02:00
jvcalderon
648410348d
[Revert] [Added] Per user per creator changes
2023-10-23 13:27:59 +02:00
Sam Rose
5e6ed0fd67
Implement many-to-one user column migration.
2023-10-23 11:54:27 +01:00
Adria Navarro
4ee1fd0f7a
Default to package.json
2023-10-23 12:23:44 +02:00
Sam Rose
febfab0927
Fix tests/types.
2023-10-23 10:48:10 +01:00
Sam Rose
9e279be4c3
Put pro back to where it was.
2023-10-23 10:35:41 +01:00
Sam Rose
06f0a8da1a
Update pro submodule.
2023-10-23 09:59:11 +01:00
Sam Rose
9dd16381a7
Merge base branch.
2023-10-23 09:52:17 +01:00
Sam Rose
86458dc321
Merge branch 'feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column' into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column-2
2023-10-23 09:50:40 +01:00
Sam Rose
2d26597d07
Fix tests after merge.
2023-10-23 09:49:57 +01:00
Sam Rose
a563cf3594
Merge master.
2023-10-23 09:39:34 +01:00