aa02cb1c65
Add skiplibcheck on string-templates
2023-04-14 12:13:39 +01:00
1a26877f08
v2.4.44-alpha.24
2023-04-14 12:10:49 +01:00
b81804b905
Update pro version to 2.4.44-alpha.23
2023-04-14 11:05:30 +00:00
788b7b6492
v2.4.44-alpha.23
2023-04-14 11:03:56 +00:00
b0075998bf
Merge branch 'permissions-test' of https://github.com/Budibase/budibase into permissions-test
2023-04-14 11:45:37 +01:00
2f98ce9772
reverting some breaking changes
2023-04-14 11:45:27 +01:00
b7192c37b9
Merge branch 'develop' of github.com:Budibase/budibase into permissions-test
2023-04-14 11:43:02 +01:00
038476523f
doesHaveBasePermission tests
2023-04-14 11:39:52 +01:00
696eea9f92
exporting function to test
2023-04-14 11:39:36 +01:00
1116c63ed4
Update pro version to 2.4.44-alpha.22
2023-04-14 10:19:12 +00:00
fc971ed3ad
v2.4.44-alpha.22
2023-04-14 10:17:37 +00:00
fa83c5d7a1
added get allowed levels (not working yet)
2023-04-14 10:29:52 +01:00
9bf580e761
Merge branch 'develop' into permissions-test
2023-04-14 10:27:35 +01:00
62b5e08cde
primary test cases, level to number working already
2023-04-14 10:25:38 +01:00
dc3d0e5e98
Update pro version to 2.5.4
2023-04-14 09:08:57 +00:00
52aa5f1a66
v2.5.4
2023-04-14 09:05:38 +00:00
d0b23d780d
Merge pull request #10202 from Budibase/fix/rest-bindings-bug
...
Fix issue with REST bindings not being shown in drawer
2023-04-14 09:55:24 +01:00
ddc11ab88c
Add copy and paste to spreadsheet and add immediate editing of cells without additional click
2023-04-14 09:19:47 +01:00
6f20c3dff8
Improve sorting
2023-04-14 08:16:35 +01:00
dd24d7d9ee
Add additional reorder options and improve beta button
2023-04-14 07:55:20 +01:00
a529556e07
v2.4.44-alpha.21
2023-04-13 18:55:33 +00:00
0aa5b3da03
Merge branch 'develop' into chore/yarn_workspaces
2023-04-13 19:29:45 +01:00
84a5739c53
Work around table API inconsistencies to handle table schema updates
2023-04-13 16:51:26 +01:00
f86c0ec36e
Add beta button to sheet, tidy up constants
2023-04-13 15:52:07 +01:00
d9d8243d4c
Merge branch 'chore/yarn_workspaces' into chore/pro_as_submodule
2023-04-13 15:35:29 +01:00
f7f1ee49a6
Improve sheet loading states
2023-04-13 14:30:01 +01:00
fa0cc17682
Make column visibility persistent and refactor column updating
2023-04-13 14:09:57 +01:00
f6d54c7196
Update pro version to 2.4.44-alpha.20
2023-04-13 12:42:24 +00:00
c9ffbe46e1
v2.4.44-alpha.20
2023-04-13 12:39:28 +00:00
f87974caf1
Removing duplicate test case.
2023-04-13 13:10:51 +01:00
3bf9a16b63
Update babel-jest
2023-04-13 12:59:21 +01:00
8f8843aece
Updating test cases based on new user sync and removing old endpoint testcases (endpoint removed).
2023-04-13 12:53:25 +01:00
eebae26d7d
Undo not needed tsconfig changes
2023-04-13 12:43:39 +01:00
340507bab3
Redo unnecessary types
2023-04-13 12:24:18 +01:00
7febe7683b
Remove pro submodule
2023-04-13 12:21:51 +01:00
7da330624f
Fixing build (again).
2023-04-13 12:17:29 +01:00
6c1459c3b0
Update yarn.lock
2023-04-13 12:15:08 +01:00
8100737817
Fix double click resizing of sticky column
2023-04-13 12:05:47 +01:00
69f6834886
Improve sheet integration with data section and add horizontal cell inversion
2023-04-13 12:01:16 +01:00
727aba9177
Fixing build.
2023-04-13 11:19:28 +01:00
f585bb793d
Merge branch 'chore/yarn_workspaces' into chore/pro_as_submodule
2023-04-13 10:59:52 +01:00
d6f73ae9de
Add runner
2023-04-13 10:54:35 +01:00
3672acd68e
Fix backend-core tests
2023-04-13 10:54:35 +01:00
0b16c59032
Fix string-templates tests
2023-04-13 10:54:35 +01:00
07a82925ba
Add missing dependency
2023-04-13 10:54:35 +01:00
d56129f3fc
Remove types
2023-04-13 10:54:35 +01:00
18582c83f5
Add missing types
2023-04-13 10:54:35 +01:00
a484e05f6d
Remove wrong pro commit
2023-04-13 10:54:35 +01:00
a395098959
Update yarn.lock
2023-04-13 10:54:35 +01:00
36c412e57b
Remove unused yarn.lock
2023-04-13 10:54:35 +01:00
70475c3250
Use yarn workspaces with nx
2023-04-13 10:54:18 +01:00
69d9b9acfa
Update submodule
2023-04-13 10:53:40 +01:00
ceacf38ed6
Bootstrap submodule
2023-04-13 10:44:28 +01:00
9e11413422
Bump xml2js from 0.4.23 to 0.5.0 in /packages/server
...
Bumps [xml2js](https://github.com/Leonidas-from-XIV/node-xml2js ) from 0.4.23 to 0.5.0.
- [Release notes](https://github.com/Leonidas-from-XIV/node-xml2js/releases )
- [Commits](https://github.com/Leonidas-from-XIV/node-xml2js/commits/0.5.0 )
---
updated-dependencies:
- dependency-name: xml2js
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-04-13 09:31:09 +00:00
fd1c27aa22
Update pro version to 2.4.44-alpha.19
2023-04-13 09:30:19 +00:00
a89b04203e
v2.4.44-alpha.19
2023-04-13 09:27:17 +00:00
5e4a6f383c
Merge pull request #10281 from Budibase/dependabot/npm_and_yarn/packages/server/vm2-3.9.16
...
Bump vm2 from 3.9.11 to 3.9.16 in /packages/server
2023-04-13 10:12:07 +01:00
795ccc7750
Merge pull request #10282 from Budibase/dependabot/npm_and_yarn/packages/string-templates/vm2-3.9.16
...
Bump vm2 from 3.9.11 to 3.9.16 in /packages/string-templates
2023-04-13 10:11:58 +01:00
6ff60cb74f
Merge pull request #10283 from Budibase/dependabot/npm_and_yarn/packages/worker/vm2-3.9.16
...
Bump vm2 from 3.9.14 to 3.9.16 in /packages/worker
2023-04-13 10:11:49 +01:00
b8d9311b49
Merge branch 'chore/yarn_workspaces' into chore/pro_as_submodule
2023-04-13 09:41:59 +01:00
25b77637a7
Add runner
2023-04-12 23:24:20 +01:00
50034e9093
Update pro version to 2.4.44-alpha.18
2023-04-12 21:30:30 +00:00
1e9ae6aec1
v2.4.44-alpha.18
2023-04-12 21:27:37 +00:00
c85da05f12
Bump vm2 from 3.9.14 to 3.9.16 in /packages/worker
...
Bumps [vm2](https://github.com/patriksimek/vm2 ) from 3.9.14 to 3.9.16.
- [Release notes](https://github.com/patriksimek/vm2/releases )
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md )
- [Commits](https://github.com/patriksimek/vm2/compare/3.9.14...3.9.16 )
---
updated-dependencies:
- dependency-name: vm2
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-04-12 21:11:11 +00:00
c43d99ad13
Bump vm2 from 3.9.11 to 3.9.16 in /packages/string-templates
...
Bumps [vm2](https://github.com/patriksimek/vm2 ) from 3.9.11 to 3.9.16.
- [Release notes](https://github.com/patriksimek/vm2/releases )
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md )
- [Commits](https://github.com/patriksimek/vm2/compare/3.9.11...3.9.16 )
---
updated-dependencies:
- dependency-name: vm2
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-04-12 20:52:02 +00:00
8c7c0653b0
Bump vm2 from 3.9.11 to 3.9.16 in /packages/server
...
Bumps [vm2](https://github.com/patriksimek/vm2 ) from 3.9.11 to 3.9.16.
- [Release notes](https://github.com/patriksimek/vm2/releases )
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md )
- [Commits](https://github.com/patriksimek/vm2/compare/3.9.11...3.9.16 )
---
updated-dependencies:
- dependency-name: vm2
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-04-12 20:49:15 +00:00
0319610095
Fix backend-core tests
2023-04-12 21:46:08 +01:00
b2d7f24ff3
Adding builder test case.
2023-04-12 20:02:37 +01:00
2858b27f72
Fix string-templates tests
2023-04-12 20:01:31 +01:00
23e99ca4b7
Adding group and user tests for user sync.
2023-04-12 19:59:05 +01:00
123a762b60
Add missing dependency
2023-04-12 19:43:57 +01:00
e217286e7b
Remove types
2023-04-12 19:41:23 +01:00
b41157d740
Add missing types
2023-04-12 19:08:19 +01:00
e73aa0ce75
Remove wrong pro commit
2023-04-12 18:54:16 +01:00
abf9c634fa
Update yarn.lock
2023-04-12 18:51:37 +01:00
e6dc4e5fa0
Remove unused yarn.lock
2023-04-12 18:49:29 +01:00
4f98f99a90
Use yarn workspaces with nx
2023-04-12 18:48:57 +01:00
77a96b41a0
Undo yarn.lock changes
2023-04-12 17:41:49 +01:00
1129d19412
Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754
2023-04-12 17:09:29 +01:00
222e772cb7
Update pro version to 2.4.44-alpha.17
2023-04-12 15:41:28 +00:00
4eb5201f6a
v2.4.44-alpha.17
2023-04-12 15:38:04 +00:00
cb73e3b1c3
Fixing build issue.
2023-04-12 16:22:30 +01:00
724bff60f2
Add persitence to column size and order in sheets
2023-04-12 14:56:22 +01:00
a9fb09424b
Merge branch 'develop' of github.com:Budibase/budibase into labday/automation-plugins
2023-04-12 14:27:50 +01:00
201c886f5a
Update pro version to 2.4.44-alpha.16
2023-04-12 13:10:35 +00:00
9afbb300fa
v2.4.44-alpha.16
2023-04-12 13:07:38 +00:00
3a5e31710c
Add db prop to redis integration ( #10210 )
...
* Add db prop to redis integration
* Add DB display
* Default DB value to 0
2023-04-12 13:51:40 +01:00
cc929b93a9
Update pro version to 2.4.44-alpha.15
2023-04-12 12:45:51 +00:00
3eb718ea6d
Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754
2023-04-12 13:42:46 +01:00
ad393a829d
v2.4.44-alpha.15
2023-04-12 12:42:23 +00:00
0911cc05cf
Merge pull request #10272 from Budibase/test/coverage-bckend-core
...
Test/coverage bckend core
2023-04-12 13:32:04 +01:00
48a7d454b5
Update pro version to 2.4.44-alpha.14
2023-04-12 11:01:52 +00:00
f65a308ffd
v2.4.44-alpha.14
2023-04-12 10:58:55 +00:00
6ca999722c
Add file/upload size validation option ( #10262 )
...
* Add file/upload size validation option
* Max upload size handler
* Update max total upload label
2023-04-12 11:51:18 +01:00
df38368eaf
removing tests
2023-04-12 11:06:01 +01:00
222ec15879
Update submodule
2023-04-12 10:56:46 +01:00
ada052e043
Merging in develop - fixing some test cases which broke in the process.
2023-04-12 10:56:21 +01:00
49611298b4
Fix issue with display column not being able to be unset
2023-04-12 10:38:35 +01:00
76353c2e4d
Fix issue when no display column exists
2023-04-12 10:34:33 +01:00
68cd1fbe8e
Fix reorder overlay z-index issue
2023-04-12 10:13:40 +01:00
1d7ba831ca
Update pro version to 2.4.44-alpha.13
2023-04-12 09:10:56 +00:00
a4e2c41c1c
v2.4.44-alpha.13
2023-04-12 09:07:40 +00:00
7bbb8e5648
Fix importing and exporting with sheets
2023-04-12 10:03:58 +01:00
7fa976ba5e
Simplify logic for reordering and add new overlay. Simplify sheet cells
2023-04-12 09:51:49 +01:00
f427763308
export function to make test easier
2023-04-12 02:29:30 +01:00
ef0293bc6c
encryption tests 100%
2023-04-12 02:25:53 +01:00
38f326dce4
Fix filters not working
2023-04-11 23:25:19 +01:00
727d3d5b6d
Fix issue with cell colors, improve row API interactions to avoid relationship issues due to API response differences
2023-04-11 22:55:13 +01:00
6290112d06
Improve data fetch reset logic, fix issues with stale cache in spreadsheets
2023-04-11 22:21:07 +01:00
0ee63417c1
Merge branch 'develop' of github.com:Budibase/budibase into spreadsheet-integration
2023-04-11 17:36:28 +01:00
4d34c8b65b
Restore missing event handler
2023-04-11 17:35:51 +01:00
0c3a9f367e
Remove log
2023-04-11 17:34:06 +01:00
e623820478
Adding test cases.
2023-04-11 17:33:52 +01:00
1aafdbe9a7
Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754
2023-04-11 17:28:14 +01:00
fd538e0aad
Setup pro
2023-04-11 17:12:50 +01:00
c82fb0ad58
Change type references
2023-04-11 17:00:47 +01:00
000e49a229
Bootstrap using submodule
2023-04-11 16:53:51 +01:00
5ea8086be0
Remove scripts
2023-04-11 16:52:59 +01:00
859b10c4be
Change references on jest
2023-04-11 16:51:50 +01:00
361ab9e3cd
Add validation to duplicating rows
2023-04-11 16:46:17 +01:00
ac37d00f69
Updating plugins to have a SDK, which can be used for automation action retrieval as well as datasources.
2023-04-11 16:37:26 +01:00
4a6713e9d3
Add multiple validation improvements
2023-04-11 16:34:13 +01:00
f882993091
Name and its fields are optional
2023-04-11 16:12:18 +01:00
471bb82f7b
Update pro version to 2.5.3
2023-04-11 13:49:55 +00:00
fb268f1655
v2.5.3
2023-04-11 13:46:26 +00:00
2e60ca7526
Update pro version to 2.4.44-alpha.12
2023-04-11 13:46:00 +00:00
08dbee5384
v2.4.44-alpha.12
2023-04-11 13:42:48 +00:00
3eafda506f
Merge pull request #10227 from Budibase/fix/10155
...
Fixing #10155 - some options errors were being swallowed and in gener…
2023-04-11 14:35:11 +01:00
9a330b85f8
Fix timeouts
2023-04-11 14:20:15 +01:00
6c203a1e66
Increase horizontal padding when scrolling to a selected cell
2023-04-11 14:19:02 +01:00
1726948f67
Add custom colors for drop shadows and blue-100 to all themes, fix sticky column shadow
2023-04-11 14:07:27 +01:00
c77ed3d737
Renames
2023-04-11 13:39:13 +01:00
56567de04a
Fix tests
2023-04-11 13:39:13 +01:00
e1279ffecd
Use proper errors instead of string throwing
2023-04-11 13:39:13 +01:00
57a3ff96ea
Add new test for conflicting user email
2023-04-11 13:39:13 +01:00
0acb821b70
Update pro version to 2.4.44-alpha.11
2023-04-11 12:31:40 +00:00
e54b48465b
Merge branch 'develop' of github.com:Budibase/budibase into labday/automation-plugins
2023-04-11 13:31:39 +01:00
6aefc6b643
v2.4.44-alpha.11
2023-04-11 12:28:43 +00:00
37b56b8084
Merge pull request #10253 from Budibase/handle_removing_users
...
BUDI-6838 - Remove users on deactivation - Amend tests
2023-04-11 14:21:08 +02:00
ab70dfbcf0
Fix resize overlays
2023-04-11 12:19:54 +01:00
fe70793e75
Refactor stores to fix dependency issues, use modals for adding rows, simplify sheet
2023-04-11 12:17:08 +01:00
c4a4bdc9da
Fixing tenancy.spec.ts - mocking was a bit messed up, moving it all around to work as expected.
2023-04-11 10:54:04 +01:00
de613d2b28
latest version
2023-04-11 10:22:47 +01:00
1c7c06e983
Bulk of the automation plugin system, supporting custom plugins.
2023-04-10 23:48:54 +01:00
4badd04e33
Some automation fixes and adding option to disable logging for CLI.
2023-04-10 22:33:53 +01:00
069fb64245
Update pro version to 2.4.44-alpha.10
2023-04-10 18:55:59 +00:00
a3c0510ed7
v2.4.44-alpha.10
2023-04-10 18:53:08 +00:00
2cc2b94346
fix small typo ( #10252 )
2023-04-10 19:45:29 +01:00
122db55dce
Fix tests
2023-04-10 18:47:22 +01:00
81a28eb4da
Large refactors to row creation, naming and sheet APIs
2023-04-10 18:46:34 +01:00
7d63586c8c
Update pro version to 2.5.2
2023-04-07 21:33:30 +00:00
1b0635e957
v2.5.2
2023-04-07 21:30:39 +00:00
3b32120f83
bumping worker leaf version
2023-04-07 22:06:19 +01:00
60d7764add
bump vm2 versions
2023-04-07 21:58:36 +01:00
400a112a4b
Refactoring automation steps to be better defined in Typescript, which allows writing the validator for automations.
2023-04-06 18:11:44 +01:00
58d0a82108
First sync test, checking that a user is created correctly.
2023-04-05 22:35:01 +01:00
0771ec55fb
Small change to make sure no duplicates ever occur.
2023-04-05 21:22:50 +01:00
70c9d06832
Adding group management to background user/group sync.
2023-04-05 20:51:47 +01:00
bfec84e1df
Removing console logging.
2023-04-05 20:32:41 +01:00
0803b08217
Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754
2023-04-05 17:59:18 +01:00
022b3acbcc
Linting.
2023-04-05 17:54:05 +01:00
01be92c9db
Reverting test sql changes.
2023-04-05 17:50:14 +01:00
373952a59b
Fixing #10155 - some options errors were being swallowed and in general it was never considered to be an error state due to the 'handled' flag being consistently sent, changed the logic a bit here.
2023-04-05 17:43:35 +01:00
da2023974e
Update new row component, fix z-index issues, improve UX
2023-04-05 17:36:38 +02:00
f1b7ff0f7c
fixing expect on throw
2023-04-05 16:30:00 +01:00
b0df710a2a
tweaks on some tests
2023-04-05 16:13:39 +01:00
6396548064
Update pro version to 2.4.44-alpha.9
2023-04-05 14:44:51 +00:00
efa1ea7b1b
v2.4.44-alpha.9
2023-04-05 14:41:48 +00:00
77ffb8d86d
Run integration suite in CI again / auto detect tenancy / refactors ( #10209 )
...
* qa-core-ci-fixes
* global setup and teardown wip
* Updates to logs and setup
* Remove date and console mocking
* Update CI to spin up minimal dev env
* Update readme
* Fix scopeBackend.sh
* Ensure docker services are initialised before starting worker
* Lint
* Fix admin user being created on startup (#10219 )
* use regular bootstrap and build
* Lint
* Temp: re-use global setup to get around app limit in QA
2023-04-05 15:33:56 +01:00
6bd950717c
mocked correctly
2023-04-05 14:14:55 +01:00
18ccf134b9
Update pro version to 2.4.44-alpha.8
2023-04-05 12:21:27 +00:00
f02f996744
v2.4.44-alpha.8
2023-04-05 12:18:30 +00:00
38535e8ef4
Format
2023-04-05 12:17:32 +01:00
ae9f91885f
Fix flaky tests
2023-04-05 12:17:02 +01:00
e699f4684a
Updating the global user sync to be more accurate and also remove old user metadata from apps that users don't have access to anymore.
2023-04-04 18:03:56 +01:00
1785fd8300
Update pro version to 2.4.44-alpha.7
2023-04-04 14:56:03 +00:00
244b911efb
v2.4.44-alpha.7
2023-04-04 14:53:06 +00:00
bcf5bb9ca0
Update pro version to 2.4.44-alpha.6
2023-04-04 14:21:08 +00:00
e94a05887f
v2.4.44-alpha.6
2023-04-04 14:18:08 +00:00
976b3a55ca
Update logging to support dd trace attributes ( #10086 )
...
* Update logging middleware to integrate with pino for console logging
* Remove elastic apm references, use updated core middlewares
* Remove redundant LOG_LEVEL definitions
* Remove no longer needed jest logging overrides
* lint
* Backwards compat between console log helpers and pino
* Configurable DISABLE_HTTP_LOGGING
* Don't log 4xx as errors
* Remove redundant ENABLE_4XX_HTTP_LOGGING
* Cleanup migrations and event logging
* Improve bb-alert logging
* Add DISABLE_HTTP_LOGGING to helm chart
* Add ops endpoints for testing
* Disable http logging in dev
* Backwards compatible tracing implementation
* Naming update on http logging env var
* lint
* Update packages/backend-core/src/environment.ts
Co-authored-by: Adria Navarro <adria@revityapp.com>
* Merge
* Lint
* Fix console.warn failing mock by replacing with alerts mock instead
* Lint
---------
Co-authored-by: Adria Navarro <adria@revityapp.com>
2023-04-04 15:08:46 +01:00
a2cabb01d5
Removing user app sync calls from worker - no longer required.
2023-04-04 13:53:30 +01:00
e128642bce
Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754
2023-04-04 13:37:59 +01:00
b1325e4742
Update pro version to 2.5.1
2023-04-04 09:27:35 +00:00
917c5100ad
v2.5.1
2023-04-04 09:24:27 +00:00
5eecb6e686
Remove loop for get account during user bulk import ( #10203 )
2023-04-04 10:14:20 +01:00
149aa9bbd2
Update pro version to 2.4.44-alpha.5
2023-04-04 09:12:51 +00:00
7bc049c02b
v2.4.44-alpha.5
2023-04-04 09:09:48 +00:00
e3f8612b37
Merge pull request #10201 from Budibase/budi-6822-allow-ad-users-without-emails-set
...
BUDI-6822 - Allow AD users without emails set
2023-04-04 10:57:53 +02:00
c571a3f881
Fix issue with REST bindings not being shown in drawer
2023-04-04 09:12:15 +01:00
6862a2d26b
Downgrade python
2023-04-04 08:44:05 +01:00
2b89b3fb15
Update pino-pretty versions
2023-04-04 08:44:05 +01:00
ff98ba5a0a
Adding a document update queue based on the events which can be used to track when certain documents have changed, using this for users and groups to detect when a re-sync is needed.
2023-04-04 00:25:15 +01:00
e0bcc42c80
Make scim info extensible and the object unaware of the data
2023-04-03 19:06:03 +01:00
ad4f70b826
Type emails
2023-04-03 16:45:55 +01:00
c0d7f2329a
Extract valid email util
2023-04-03 16:42:30 +01:00
b841cec4c9
Update pro version to 2.4.44-alpha.4
2023-04-03 15:16:50 +00:00
2c9b354a1b
v2.4.44-alpha.4
2023-04-03 15:13:42 +00:00
29def1408a
Fixing syntax error and linting.
2023-04-03 15:36:34 +01:00
2f57b3b16d
Merge pull request #10077 from robert4dt/develop
...
Handle application/pdf content type in rest integration
2023-04-03 15:30:03 +01:00
fbbb36b809
Update pro version to 2.5.0
2023-04-03 13:14:16 +00:00
adrinr
Budibase Staging Release Bot
Mateus Badan de Pieri
mike12345567
Peter Clement
Andrew Kingston
dependabot[bot]
melohagan
Adria Navarro
Maurits Lourens
Martin McKeaveney
Rory Powell
Peter Clement