Commit Graph

24793 Commits

Author SHA1 Message Date
Adria Navarro 2ce9f850d9 Render bb reference as relationship 2023-09-25 21:52:16 +02:00
Adria Navarro 6487d76b1d Merge branch 'develop' into feature/user-column-type 2023-09-25 21:51:43 +02:00
Budibase Staging Release Bot 34b084f6a0 Bump version to 2.10.12-alpha.14 2023-09-25 19:50:30 +00:00
Adria Navarro 8729e068a2 Merge pull request #11856 from Budibase/chore/field_with_large_relationships
Fix display of field with large relationships
2023-09-25 21:50:02 +02:00
Adria Navarro ee6548b3fb Merge branch 'develop' into chore/field_with_large_relationships 2023-09-25 21:41:03 +02:00
Andrew Kingston 354e51866c Merge pull request #11838 from Budibase/correct-nginx-cors-changes
Correct nginx cors changes
2023-09-25 19:59:26 +01:00
Andrew Kingston 00c0ee0efa Merge branch 'develop' into correct-nginx-cors-changes 2023-09-25 19:51:17 +01:00
Budibase Staging Release Bot dc8e32b115 Bump version to 2.10.12-alpha.13 2023-09-25 18:51:00 +00:00
Andrew Kingston 0578f96839 Merge pull request #11686 from Budibase/cheeks-lab-day-portal-poc
Use apps within the portal
2023-09-25 19:50:43 +01:00
Andrew Kingston 00bd6e92db Merge branch 'develop' into cheeks-lab-day-portal-poc 2023-09-25 19:41:53 +01:00
Budibase Staging Release Bot e367dff467 Bump version to 2.10.12-alpha.12 2023-09-25 18:40:20 +00:00
Andrew Kingston 8454c286d9 Merge pull request #11724 from Budibase/user-table-changes
User table changes
2023-09-25 19:39:39 +01:00
Andrew Kingston 02423635bc Merge branch 'develop' into correct-nginx-cors-changes 2023-09-25 19:37:21 +01:00
Andrew Kingston 38cad518a4 Merge branch 'develop' into cheeks-lab-day-portal-poc 2023-09-25 19:34:04 +01:00
Andrew Kingston f010cf2d53 Merge branch 'develop' into user-table-changes 2023-09-25 19:33:35 +01:00
Budibase Staging Release Bot f1332a6ba4 Bump version to 2.10.12-alpha.11 2023-09-25 17:12:07 +00:00
Michael Drury c83979b1bc Merge pull request #11876 from Budibase/feature/BUDI-7458
App import to existing app, and public API endpoints
2023-09-25 18:11:44 +01:00
Adria Navarro 79e693c89d Merge branch 'develop' into feature/user-column-type 2023-09-25 19:03:25 +02:00
mike12345567 ebd6643346 Setting pro reference to develop. 2023-09-25 17:56:02 +01:00
mike12345567 6b52adc294 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7458 2023-09-25 17:55:06 +01:00
mike12345567 be5bab7ac7 Merge branch 'feature/BUDI-7458' of github.com:Budibase/budibase into feature/BUDI-7458 2023-09-25 17:53:37 +01:00
Adria Navarro 9fc04e7053 Merge branch 'develop' into chore/field_with_large_relationships 2023-09-25 18:50:54 +02:00
Budibase Staging Release Bot b7eb5847fd Bump version to 2.10.12-alpha.10 2023-09-25 16:49:13 +00:00
Adria Navarro 6af7c7031d Merge pull request #11861 from Budibase/chore/update_ts
Update Typescript to 5.x
2023-09-25 18:48:56 +02:00
mike12345567 98680f7895 Updating dual bulkDocs call, to handle the merging of similar documents. 2023-09-25 17:48:07 +01:00
Adria Navarro 66c4f290c7 Merge branch 'develop' into chore/field_with_large_relationships 2023-09-25 18:27:23 +02:00
Adria Navarro 87a3cc5660 Merge branch 'develop' into chore/update_ts 2023-09-25 18:26:58 +02:00
Budibase Staging Release Bot ae7d5634cc Bump version to 2.10.12-alpha.9 2023-09-25 16:24:51 +00:00
Adria Navarro f117203c4c Merge branch 'develop' into chore/field_with_large_relationships 2023-09-25 18:24:51 +02:00
Martin McKeaveney 2142a84743 send PR number to deploys 2023-09-25 17:24:31 +01:00
Adria Navarro e3c3edb8bd Fix reduces 2023-09-25 18:21:02 +02:00
Adria Navarro 28fc050299 Remove unwanted horizontal scroll 2023-09-25 18:15:22 +02:00
Adria Navarro 931645f73d Merge branch 'develop' into chore/update_ts 2023-09-25 18:14:38 +02:00
Michael Drury b0beaf5b55 Merge branch 'develop' into feature/BUDI-7458 2023-09-25 17:04:03 +01:00
mike12345567 3d143c28a9 Last PR comments. 2023-09-25 17:00:20 +01:00
Budibase Staging Release Bot e9f338e8e6 Bump version to 2.10.12-alpha.8 2023-09-25 16:00:15 +00:00
Martin McKeaveney ad1563b692 Update deploy-featurebranch.yml 2023-09-25 17:00:00 +01:00
mike12345567 4d1c749444 First PR comment. 2023-09-25 16:58:06 +01:00
Martin McKeaveney 5998f9544c Merge branch 'develop' into cheeks-lab-day-portal-poc 2023-09-25 16:57:59 +01:00
Adria Navarro 6cd1deb19a Merge branch 'develop' into chore/update_ts 2023-09-25 17:48:10 +02:00
Adria Navarro 4cd7be52ae Update pro 2023-09-25 17:46:29 +02:00
Adria Navarro f6a894a678 Merge branch 'develop' into chore/field_with_large_relationships 2023-09-25 17:43:01 +02:00
Michael Drury 28189fa5ae Merge branch 'develop' into feature/BUDI-7458 2023-09-25 16:29:01 +01:00
mike12345567 5f0050849e Fixing issue detected by test. 2023-09-25 15:05:14 +01:00
Budibase Staging Release Bot f24c0fffc1 Bump version to 2.10.12-alpha.7 2023-09-25 13:05:26 +00:00
Andrew Kingston a5c428706e Merge pull request #11850 from Budibase/remove-automation-tooltip
Remove tooltip from automation undo redo control
2023-09-25 14:05:08 +01:00
Martin McKeaveney 81ce8ac2ad Merge branch 'develop' into correct-nginx-cors-changes 2023-09-25 13:59:25 +01:00
Martin McKeaveney 1ef3c92195 Merge branch 'develop' into remove-automation-tooltip 2023-09-25 13:58:32 +01:00
mike12345567 56adf75bdd Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7458 2023-09-25 12:52:47 +01:00
mike12345567 bca63eba45 Finishing out test cases for public API app export/import. 2023-09-25 12:52:29 +01:00