1
0
Fork 0
mirror of synced 2024-09-08 13:41:09 +12:00
Commit graph

2615 commits

Author SHA1 Message Date
Michael Drury
a3ebcb2896 Merge pull request #11033 from Budibase/fix/BUDI-7188
Don't sync automation logs from prod to dev app
2023-06-27 12:52:07 +01:00
Dean
eaecd3ab68 Merge remote-tracking branch 'origin/develop' into merge-master 2023-06-27 09:31:35 +01:00
mike12345567
3eff4d85d0 Adding a test case for the removal of automation logs from app sync, as well as adding to the publish/sync filter a check to not carry over automation logs. 2023-06-26 18:52:15 +01:00
Dean
ceecd85d76 OIDC icon fix recreated on a new branch 2023-06-23 14:47:58 +01:00
Dean
998f1806aa Updated analytics tests to account for the embedded 2023-06-20 16:29:09 +01:00
Dean
c1248eed12 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-20 10:08:18 +01:00
Michael Drury
c5270ee323 Merge pull request #10959 from Budibase/fix/integration-tests
Integration test updates and improved logging
2023-06-19 18:52:24 +01:00
mike12345567
289a75fc9a Few minor updates to the integration suite to make it easier to decipher what is happening under the hood, as well as making it easier to log from these (where there is no pino logging available, importing backend-core breaks things). Also added a new script which can be used to get local environment setup as needed to run qa-core tests. Finally, xdescribe for the failing test until can work out what is wrong with MongoDB installation in QA environment. 2023-06-19 18:28:38 +01:00
Adria Navarro
b0f40be409 Update bcrypt 2023-06-19 17:55:47 +01:00
Dean
2304032423 Added embed state, behaviours and event tracking to client app. UI/UX Refactoring 2023-06-16 12:30:08 +01:00
Jonny McCullagh
757ca6a166 Merge master develop (#10897)
* Binding drawer fixes

* Added missing headless flag for the bindable combobox

* Fix for QueryEditor width

* Fix svelte transitions in grid new row component breaking routify

* Bump version to 2.7.7

* fix REST connector failure to save

* Bump version to 2.7.8

* Bump version to 2.7.9

* Unexpected token when export data (#10721)

* Tidy ID string for JSON parse

* Display error for composite keys

* Unit test WIP

* directly assign the mock function on the datasource

* Unit tests for exportRows ID handling

---------

Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>

* Return all rows if oneOf value is falsey (#10638)

* Bump version to 2.7.10

* Make sure divider fields are left-most (#10627)

* Make sure divider fields are left most

* Refactor

* Bump version to 2.7.11

* Temporarily remove the focus store update as it triggers a full redraw of the component settings

* Linting

* Removed commented out code

* Bump version to 2.7.12

* Bump version to 2.7.13

* Do not show Business tag for Email action (#10867)

* Bump version to 2.7.14

* new deploy trigger (#10892)

* point the deploys at the new env

* Bump version to 2.7.15

---------

Co-authored-by: Dean <deanhannigan@gmail.com>
Co-authored-by: Andrew Kingston <andrew@kingston.dev>
Co-authored-by: Budibase Staging Release Bot <>
Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>
Co-authored-by: Martin McKeaveney <martin@budibase.com>
Co-authored-by: melohagan <101575380+melohagan@users.noreply.github.com>
Co-authored-by: Adria Navarro <adria@budibase.com>
2023-06-14 16:18:09 +01:00
Michael Drury
6776f3d78c Merge pull request #10881 from Budibase/fix/budi-7026
Custom roles breaking app access when not published
2023-06-14 15:10:30 +01:00
Adria Navarro
4b065dda8b Fix exports/imports 2023-06-14 12:32:26 +01:00
mike12345567
1bdf55e966 Some type updates and fixes for test case. 2023-06-13 14:45:33 +01:00
mike12345567
bedc8e5cce Fix for custom roles that have not been published causing users to be unable to access an app completely. They should instead be treated as public users as their role isn't valid. 2023-06-12 18:39:30 +01:00
Adria Navarro
57c5facc6e Zip exports 2023-06-12 17:54:09 +01:00
Adria Navarro
70798a6b93 Clean 2023-06-12 17:50:07 +01:00
Adria Navarro
ded738a566 Clean code 2023-06-12 17:49:12 +01:00
Adria Navarro
92a8c97aba Close streams 2023-06-12 17:34:12 +01:00
Adria Navarro
2971dfba9d Renames 2023-06-12 17:31:08 +01:00
Adria Navarro
551ca404b4 Decrypt file 2023-06-12 16:27:19 +01:00
Adria Navarro
1f4cdf348f Encrypt files 2023-06-12 11:49:38 +01:00
Adria Navarro
978591e2ba Enable encrypting 2023-06-09 16:26:48 +01:00
melohagan
b88e5ecc95 Return all rows if oneOf value is falsey (#10638) 2023-06-09 13:02:29 +01:00
mike12345567
532583e66e Fixing develop currentapp.spec.js test case, when packages within backend-core import all of backend-core they can create cyclics that cause issues. 2023-06-08 13:47:16 +01:00
Adria Navarro
deeba8bae3 Revert "Merge branch 'develop' into master"
This reverts commit 6f29c978e0, reversing
changes made to 1c6ff73c19.
2023-06-06 22:06:34 +01:00
Rory Powell
ad7f6cf5e2 Merge branch 'develop' into merge-master 2023-06-06 11:49:49 +01:00
Adria Navarro
25c921e340 Validate url 2023-06-06 11:29:49 +01:00
Adria Navarro
d4ba73f331 Open continue 2023-06-06 11:29:49 +01:00
Adria Navarro
3a6a3eb8a5 Store tokens in cache and amend redirect 2023-06-06 11:29:49 +01:00
Andrew Kingston
d70e49d74f Add event for tracking user collaboration 2023-06-06 10:11:51 +01:00
Rory Powell
abbd8c5c8b Merge branch 'master' into develop 2023-06-05 23:19:43 +01:00
Andrew Kingston
680b70643c Merge pull request #10775 from Budibase/collaboration-fixes
Collaboration fixes
2023-06-02 18:03:11 +01:00
mike12345567
c13530ef32 Stop attempt at bundling ioredis-mock, only need to check at runtime. 2023-06-02 13:59:33 +01:00
mike12345567
ddeb25b68d Updating mock redis to only import if it is needed. 2023-06-02 11:52:50 +01:00
Andrew Kingston
d8d3d71523 Update websocket logic to ignore events trigger by API requests originating from the same session 2023-06-01 17:14:32 +01:00
Michael Drury
13d987023a Updating ioredis to latest version and removing typing library as no longer required. 2023-06-01 10:39:16 +01:00
Michael Drury
9b23d3ba36 Pinning version of ioredis-mock. 2023-06-01 10:14:30 +01:00
Michael Drury
fde94a262f Moving ioredis-mock dependency back to dev dependency in backend-core. 2023-06-01 10:13:54 +01:00
Michael Drury
a3f9759a47 Reverting ioredis-mock removal for test cases - will come back to this in future as it currently breaks pro tests. 2023-06-01 00:02:55 +01:00
mike12345567
fba3ec987e Merge branch 'develop' of github.com:Budibase/budibase into fix/datasource-info-endpoint 2023-05-31 17:37:17 +01:00
mike12345567
249625ad1a Updating backend tests to actually utilise the redis container which is spun up as part of the tests, doing away with the somewhat problematic ioredis-mock which was breaking some tests due to the addition of the changes for multi-dev collab. 2023-05-31 17:18:01 +01:00
Andrew Kingston
8a2d4b7052 Merge branch 'develop' of github.com:Budibase/budibase into websocket-redis-integration 2023-05-31 16:28:14 +01:00
Andrew Kingston
e3b5d711df Disable redis select command in tests 2023-05-31 16:27:49 +01:00
Andrew Kingston
ffbbf04e86 Lint 2023-05-31 16:08:35 +01:00
Andrew Kingston
05e34076f7 Fully rewrite websocket redis integration to use individual keys per session, enable TTLs on sesisons, prune sessions when users connect and add a heartbeat to sockets 2023-05-31 15:13:22 +01:00
Andrew Kingston
d926650232 Add back in functionality to select different redis DB's per client 2023-05-31 10:52:39 +01:00
Michael Drury
1547280514 Merge pull request #10739 from Budibase/fix/multi-dev-conflicts
Multidev lock and conflict management
2023-05-30 22:57:00 +01:00
Michael Drury
99607ca06e Reverting try twice change to writethrough. 2023-05-30 20:45:10 +01:00
Michael Drury
5249148d6c Updating writethrough test to be aware of the double attempt locks. 2023-05-30 20:20:22 +01:00