da18b6433c
Merge remote-tracking branch 'origin/develop' into feature/app-overview-section
2022-05-19 13:32:57 +01:00
3c86bd24f2
Cypress test updates and back button update for the create screen
2022-05-19 13:32:05 +01:00
8ccc340a81
Adding feature flag for portal usage access.
2022-05-19 11:50:26 +01:00
7437eb4513
Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage
2022-05-19 10:45:26 +01:00
d922a5794b
Review comments.
2022-05-19 10:32:14 +01:00
bd91e65237
v1.0.167-alpha.3
2022-05-19 09:10:53 +00:00
055bc8261e
Merge pull request #5974 from Budibase/cypressTests
...
adding locators for AddRadioButtons test
2022-05-19 12:03:21 +03:00
071e9c3421
Minor reflow of the overview tab cards and layout
2022-05-19 09:56:47 +01:00
45485f3653
Merge remote-tracking branch 'origin/develop' into feature/app-overview-section
2022-05-19 09:05:29 +01:00
de26757649
v1.0.167
2022-05-18 20:09:31 +00:00
e838d179b7
merge
2022-05-18 20:12:28 +01:00
e288d225f8
lint
2022-05-18 19:55:41 +01:00
d794d55539
v1.0.167-alpha.2
2022-05-18 17:25:12 +00:00
270684c03a
Merge branch 'develop' into cypress-testing
2022-05-18 17:31:00 +01:00
b6d9c0d147
Updated Commands - Datasource Command
...
Adding a timeout associated with the fetch tables request
Another attempt at sorting this for the smoke build - it only fails there and is timing related.
2022-05-18 17:30:13 +01:00
3a0d1460b6
Code review updates
2022-05-18 17:22:58 +01:00
346c5426eb
Merge remote-tracking branch 'origin/develop' into feature/app-overview-section
2022-05-18 17:12:02 +01:00
64aca94a13
v1.0.167-alpha.1
2022-05-18 14:51:12 +00:00
86060705c6
Merge branch 'develop' into cypress-testing
2022-05-18 14:54:57 +01:00
0237854826
Update command.js
...
Changing structure for `addDatasourceConfig`
- Intercepting the request that is made when fetching tables from a datasource
- There is a specific issue with this in regards to the smoke build. This will allow me to see deeper into the potential timing issues that are occurring
2022-05-18 14:53:54 +01:00
4be4c4d8c9
v1.0.167-alpha.0
2022-05-18 13:45:22 +00:00
85d7a23867
adding locators for AddRadioButtons test
2022-05-18 16:29:22 +03:00
99ebb96f3e
Merge branch 'master' into merge-master
2022-05-18 14:24:35 +01:00
180e3dad92
Merge remote-tracking branch 'origin/develop' into feature/app-overview-section
2022-05-18 14:18:42 +01:00
86232b4e86
v1.0.164-alpha.4
2022-05-18 12:19:42 +00:00
fbceb5449a
Merge pull request #5954 from Budibase/cypressTests
...
adding interact locators for AddMultiOptionDataType test
2022-05-18 15:10:18 +03:00
5dd70a106b
adding interact locators for AddMultiOptionDataType test
2022-05-18 14:09:58 +03:00
7ec772e0de
Adding upgrade messaging.
2022-05-18 12:03:27 +01:00
39806d470d
Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage
2022-05-18 10:56:44 +01:00
36a190b0ed
Finishing off UI, expanding settings menus from 80ch to 90ch as they were quite restricted and made the usage UI a bit difficult to view. Added a DISABLE_DEVELOPER_LICENSE env variable for testing.
2022-05-17 17:44:40 +01:00
2d074f5ec8
Merge remote-tracking branch 'origin/develop' into feature/app-overview-section
2022-05-17 16:54:32 +01:00
4f770d911c
v1.0.164-alpha.3
2022-05-17 15:03:55 +00:00
63bd88b241
Merge pull request #5928 from Budibase/cypress-testing
...
IT Ticketing System Template + Smoke build test changes
2022-05-17 15:56:34 +01:00
aec6593a31
Update createApp.spec.js
...
Adding some waits around deleting apps - Specific issue against the Smoke build
2022-05-17 15:13:10 +01:00
184fb8f452
v1.0.164-alpha.2
2022-05-17 14:11:30 +00:00
a77f1e1a37
v1.0.166
2022-05-17 14:04:28 +00:00
9436abd5f7
v1.0.164-alpha.1
2022-05-17 13:54:40 +00:00
a1ec209bfb
Update createUserAndRoles.spec.js
...
Updating the before hook to delete the test app before trying to create a new one
2022-05-17 13:32:29 +01:00
7c958926c2
Smoke build test changes
...
createUserAndRoles.spec.js
- Timing issues with the test regarding the smoke build.
- Adding timeout values and reloading the page after role assignment
commands
- Adding a `clear()` to `createAppFromScratch` function.
- Previous test runs show that the placeholder value is being taken at times
2022-05-17 12:40:06 +01:00
8ebaf831fa
v1.0.165
2022-05-17 10:17:38 +00:00
c555d2130f
Merge branch 'develop' into cypress-testing
2022-05-17 10:34:54 +01:00
91f934b406
IT Ticketing System Template Tests
...
Two tests for IT Ticketing System template
- Create and publish app
- Filter tickets by status (Skipped for now as functionality seems broken specifically for the CI run, looking into it...)
Commands
- Added new template navigation function
- Added this to appropriate template test files
2022-05-17 10:34:10 +01:00
9e99a13c69
v1.0.164
2022-05-17 09:22:10 +00:00
863f915c84
v1.0.164-alpha.0
2022-05-17 09:06:07 +00:00
deab44e3fa
Merge pull request #5923 from Budibase/merge-master
...
Merge master
2022-05-17 09:53:40 +01:00
59f788e860
Update createApp.spec.js
...
resolve conflict
2022-05-17 11:02:24 +03:00
69ab518ac9
Merge branch 'develop' into cypressTests
2022-05-17 11:01:13 +03:00
b1c5f09651
Merge branch 'master' into merge-master
2022-05-17 08:35:29 +01:00
6bc08dfaaf
v1.0.163
2022-05-16 22:37:40 +00:00
560d7b8eb2
initial smoke test reporting
2022-05-16 23:08:05 +01:00
be33930ae3
v1.0.159-alpha.3
2022-05-16 19:08:26 +00:00
bd2f9c5e99
Merge pull request #5857 from Budibase/bug/sev2/unable-to-clear-smtp-config
...
Allow SMTP config to be cleared
2022-05-16 20:00:59 +01:00
1d950bed7d
Porting UI, still needs testing.
2022-05-16 18:13:59 +01:00
55bda2267e
v1.0.162
2022-05-16 16:48:39 +00:00
dc34e86431
Merge pull request #5855 from Budibase/feature/fill-app-name-on-create
...
Feature/fill app name on create
2022-05-16 17:38:33 +01:00
7ec4487324
v1.0.159-alpha.2
2022-05-16 15:00:11 +00:00
84157ed7b0
Merge pull request #5909 from Budibase/cypress-testing
...
Adding Retries for Cypress tests
2022-05-16 15:52:31 +01:00
60e2f7e4ba
Adding retries capabilities
...
Tests in Cypress run mode will retry up to 2 times (Beneficial for the smoke build flakey tests)
Tests in Cypress open mode will not retry (more ideal for local testing)
2022-05-16 15:16:04 +01:00
c2beb5926b
Increase wait for addDatasourceConfig function
...
Timing issue against the nightly smoke build. This should help with it
2022-05-16 14:59:46 +01:00
344bd1b3b3
adding locators
...
adding interact.js
adding locators
2022-05-16 15:32:04 +03:00
cf018644f9
v1.0.159-alpha.1
2022-05-16 11:10:36 +00:00
3461a3c657
Removed debug logging
2022-05-16 11:35:19 +01:00
883765f894
Code review updates
2022-05-16 11:13:17 +01:00
6f7cf9dac8
Merge remote-tracking branch 'origin/develop' into feature/fill-app-name-on-create
2022-05-16 09:08:33 +01:00
f378982041
v1.0.161
2022-05-13 15:45:14 +00:00
95619dc152
Merge pull request #5861 from Budibase/fix/oncall-bugs
...
webhook URL paste, hiding no access role
2022-05-13 16:36:04 +01:00
1c21bf2e0f
v1.0.160
2022-05-13 13:48:11 +00:00
2920ed3b99
only lock no_access for builder users
2022-05-13 14:36:11 +01:00
f78fffc7c8
Merge branch 'master' of github.com:Budibase/budibase into fix/oncall-bugs
2022-05-13 14:23:51 +01:00
50c8adee10
v1.0.159-alpha.0
2022-05-13 09:33:36 +00:00
f1d524b9d3
v1.0.159
2022-05-13 09:10:56 +00:00
8f121852b0
Merge branch 'master' into merge-master
2022-05-13 10:05:21 +01:00
66064a33e6
v1.0.158
2022-05-12 20:41:02 +00:00
cb6d908643
webhook URL paste, hiding no access role
2022-05-12 19:46:13 +01:00
7d0871e31d
v1.0.155-alpha.3
2022-05-12 18:03:38 +00:00
ec35038eaa
v1.0.157
2022-05-12 17:31:59 +00:00
0e61fe34e0
Disable reset button if SMTP not configured
2022-05-12 17:25:49 +01:00
b4d893fba2
Merge remote-tracking branch 'origin/develop' into feature/fill-app-name-on-create
2022-05-12 17:07:12 +01:00
e0a9f4d6c8
App name autofill on create. Initial cypress tests added for importing an application file with a sample fixture
2022-05-12 17:04:05 +01:00
bcf3e1ef1d
Allow SMTP config to be cleared
2022-05-12 16:57:54 +01:00
bdddceaf88
v1.0.156
2022-05-12 15:16:33 +00:00
6acf668e50
v1.0.155-alpha.2
2022-05-12 15:14:09 +00:00
38f5ab01cc
Merge pull request #5853 from Budibase/fix/5838
...
Revert "Adding to the REST query UI to make it more obvious when it n…
2022-05-12 16:08:59 +01:00
e68b3efc25
Merge branch 'master' of github.com:Budibase/budibase
2022-05-12 15:53:27 +01:00
9871ea4f3c
v1.0.155
2022-05-12 14:53:11 +00:00
72deb0c744
Merge pull request #5826 from Budibase/fix/formula-relationships
...
Formulas to relationship columns which contain spaces
2022-05-12 15:44:04 +01:00
a3b9eca9a0
Revert "Adding to the REST query UI to make it more obvious when it needs saved, such as the user has changed a dynamic variable."
...
This reverts commit 4982cad56d
2022-05-12 15:30:32 +01:00
a41eba60be
Update postgresql.spec.js
...
Skipping test that attempts to add datasource without config
-Eventually times out with empty error message.
I will raise a bug for this. Skipping the test to keep the automation running
2022-05-12 15:25:22 +01:00
da8dfd8660
v1.0.155-alpha.1
2022-05-12 10:29:12 +00:00
10eaa7b489
Merge branch 'develop' into cypress-testing
2022-05-12 10:37:01 +01:00
7f4730ef3c
Minor fix for application lock button labelling
2022-05-12 10:28:32 +01:00
bdfbcc6f76
Skip createBinding test
...
Specifically the test for adding a URL param binding
- Issues with this test on against the CI (Works fine locally)
- Skipping for now while i investigate this further. Looks like some kind of timing issue for getting the url after a component has been added
2022-05-12 10:25:05 +01:00
5ec1d22237
Removed unused variables, hid the automation/backups tabs and removed the disable flag from the app version settings menu
2022-05-12 09:24:19 +01:00
58ab5ffbdc
Merge remote-tracking branch 'origin/develop' into feature/app-overview-section
2022-05-12 08:59:37 +01:00
cb6b312145
Increase wait for addComponent
...
Sometimes after adding a component, the incorrect component ID is selected, causing test fails. This wait should allow the correct component ID to be selected
2022-05-11 23:14:06 +01:00
702deee511
Update commands.js + createApp.spec.js
...
commands.js
- Increasing wait due to timing issue for specific test runs.
- Added `{ force: true }` to assist with adding components
createApp.spec.js
- Increasing wait due to timing issue for specific test runs
2022-05-11 21:13:57 +01:00
32acbc2308
v1.0.155-alpha.0
2022-05-11 18:56:22 +00:00
b6499c911c
Merge branch 'master' of github.com:Budibase/budibase into develop
2022-05-11 19:47:22 +01:00
a08c3249c6
Cypress test fixes and a correction for the version update behaviour
2022-05-11 19:37:12 +01:00
be6dea74aa
Update commands.js
...
Commenting out createScreen function call within createTestApp
2022-05-11 18:22:52 +01:00
72c029a1b5
Update Commnds.js
...
Specifically updating the createTestApp function
- Creates a 'home' screen when a test app is being created
2022-05-11 17:23:05 +01:00
b74e42ec98
Update Commands.js
...
Adding `{ force: true }` to click functionality in several places.
There seems to be a discrepancy with clicks while running the smoke build
2022-05-11 17:04:54 +01:00
47a6b2d5ed
Merge branch 'develop' into cypress-testing
2022-05-11 16:50:23 +01:00
2e53a80219
Update DeleteApp function & Enable Cypress video flag
...
Commands.js
- DeleteApp does not need specific functionality for test env
cypress.json
- Enabling video flag for Cypress
2022-05-11 16:49:27 +01:00
d1d4aa5455
Merge remote-tracking branch 'origin/develop' into feature/app-overview-section
2022-05-11 16:21:15 +01:00
3514528e39
v1.0.154
2022-05-11 14:05:21 +00:00
08e66862b0
v1.0.151-alpha.2
2022-05-11 13:57:39 +00:00
e8e549d44b
Addresses issue mentioned in #5664 - relationship formula isn't write if column contains a space.
2022-05-11 13:33:45 +01:00
14cb0e5758
v1.0.153
2022-05-11 11:48:53 +00:00
c63faedf44
v1.0.152
2022-05-11 11:14:55 +00:00
5ac8e25cb4
v1.0.151-alpha.1
2022-05-11 11:09:54 +00:00
65fc4e2c56
Merge pull request #5815 from Budibase/bug/sev3/automation-query-limit-placeholder
...
Add limit placeholder for Automation queries
2022-05-11 12:01:17 +01:00
d6142b777e
Add limit placeholder for Automation queries
2022-05-11 11:25:53 +01:00
232c223054
v1.0.151
2022-05-11 09:42:20 +00:00
cb95b419a7
Merge pull request #5707 from Budibase/fix/mike-fixes-04-05
...
SQL columns with spaces LIKE fix and dynamic REST variable UI change
2022-05-11 10:34:36 +01:00
d761e5cfec
v1.0.151-alpha.0
2022-05-11 09:24:10 +00:00
dc3d82e431
merge with master
2022-05-11 10:12:08 +01:00
7212124f8f
Merge remote-tracking branch 'origin/develop' into feature/app-overview-section
2022-05-11 09:07:30 +01:00
f5cc6bf3a2
v1.0.148-alpha.1
2022-05-11 08:01:11 +00:00
7a2037410f
Cypress test fixes
2022-05-10 22:40:27 +01:00
8f09591368
packages/builder/src/components/start/CreateAppModal.svelte
2022-05-10 17:18:25 +01:00
e773d94a5e
Merge remote-tracking branch 'origin/develop' into feature/add-default-screen
2022-05-10 17:00:31 +01:00
044d52edb4
Cypress tests for the overview tab
2022-05-10 16:58:55 +01:00
070070c3b7
one more null check
2022-05-10 15:21:54 +01:00
3c44a7ded3
null checking selected automation
2022-05-10 15:15:34 +01:00
97bfd5a84c
v1.0.150
2022-05-10 10:48:32 +00:00
80d7a26798
fix issue with blocks not being toggled
2022-05-10 10:51:48 +01:00
fbcd64aad2
Cypress test fixes
2022-05-09 18:00:04 +01:00
abd78079d1
fix spacing on block arrows
2022-05-09 17:02:24 +01:00
2e18dfc709
Add test data sidebar and componentize part of the flow item for this purpose
2022-05-09 16:50:43 +01:00
4fa1d399b5
Added the app creation buttons back into the header of the page. Previously removed by mistake
2022-05-09 16:31:17 +01:00
178613c0ff
v1.0.149
2022-05-09 14:54:10 +00:00
1432957063
Merge pull request #5771 from Budibase/feature/copy-app-ID-from-app-list
...
allow copying of app ID from the edit menu
2022-05-09 15:45:24 +01:00
9c3d5a73fd
Merge remote-tracking branch 'origin/develop' into feature/app-overview-section
2022-05-09 15:45:05 +01:00
e6f3bc0a35
v1.0.148-alpha.0
2022-05-09 14:03:21 +00:00
7436cc201c
Fixes for tab underline behaviour. Fix for overview initialisation via URL. Fix for clearing the store when navigating away from the overview tab
2022-05-09 14:41:53 +01:00
80145b6929
v1.0.148
2022-05-09 13:23:32 +00:00
631aebba06
Merge branch 'master' into merge-master
2022-05-09 14:22:01 +01:00
6496cf37ea
v1.0.147
2022-05-09 12:36:54 +00:00
3bb2ec2ef7
Merge remote-tracking branch 'origin/develop' into feature/app-overview-section
2022-05-09 11:33:36 +01:00
a87be99ed1
v1.0.143-alpha.2
2022-05-09 09:24:06 +00:00
80152f8866
allow copying of app ID from the edit menu
2022-05-08 19:23:41 +01:00
fed4ca2402
v1.0.146
2022-05-06 15:37:07 +00:00
e26d79b83c
Merge pull request #5643 from Budibase/feature/small-april-tickets
...
Feature/small april tickets
2022-05-06 16:27:50 +01:00
fffb4b0174
Overview Tab refactoring and general updates to the homepage
2022-05-06 15:52:49 +01:00
fd3931312b
Skipping 2 Job Application Tracker tests
...
The tests are
- Filter application by stage
- Edit application
The template functionality seems to differ between test env, CI, etc. Skipping these tests for now while i debug, and leaving the passing tests in
2022-05-06 13:18:10 +01:00
910849cd76
v1.0.145
2022-05-05 23:48:56 +00:00
861194e591
v1.0.144
2022-05-05 22:39:12 +00:00
88e410a30a
More Job Application Tracker Template Tests
...
Edit an application
- Change application from not hired to hired
- Confirm relative sections update
Delete an application
- Currently skipped as there seems to be an issue with deleting an application within the template
2022-05-05 17:32:16 +01:00
b0ef609c10
Merge branch 'develop' into cypress-testing
2022-05-05 14:27:03 +01:00
81bce4fa7b
Job Application Tracker Template Tests
...
2 more tests associated with the Job Application Tracker template
- Add active/inactive vacancies
- Filter applications by stage
Tests utilise pre-populated data already associated with the template
2022-05-05 14:26:21 +01:00
002c296d15
v1.0.143
2022-05-05 13:08:19 +00:00
1c5990b9d7
Initial Commit for app overview
2022-05-05 12:52:17 +01:00
6cddc3f8f9
merge
2022-05-05 12:45:09 +01:00
235b8436dd
v1.0.143-alpha.1
2022-05-05 10:58:30 +00:00
06bde2e490
Merge branch 'develop' into cypress-testing
2022-05-05 11:22:47 +01:00
473bdc87e6
Assign user roles test fix
...
Changing the conditionals for creating user and assigning roles. Should assist with the test issues
2022-05-05 11:22:04 +01:00
3e254e46bb
Merge branch 'develop' into feature/posthog-v2
2022-05-05 08:47:06 +01:00
dbaf70f8eb
v1.0.143-alpha.0
2022-05-05 07:46:48 +00:00
8ce92954db
Merge branch 'master' into merge-master-develop
2022-05-05 08:36:09 +01:00
eefa653944
v1.0.142-alpha.1
2022-05-04 17:43:08 +00:00
e96a5101e3
Update command.js
...
Increasing wait for createApp function - Seems to be timing issues for the smoke build with this
2022-05-04 18:08:09 +01:00
d05fcd1f14
v1.0.142
2022-05-04 16:58:22 +00:00
f2c7097f36
Fix PostgreSQL Smoke Build Test
...
Specifically with the duplicate query test
- Looks for spectrum-icon instead of icon
2022-05-04 17:30:38 +01:00
3f1231ea70
Merge branch 'develop' into cypress-testing
2022-05-04 17:07:12 +01:00
4afd6ab2b4
Job Application Template Test
...
jobApplicationTracker.spec.js
- New file and test
- Creates and publishes Job Application Tracker app. Also verifies View URL button works
commands.js
- Updated deleteApp function
2022-05-04 17:06:27 +01:00
4982cad56d
Adding to the REST query UI to make it more obvious when it needs saved, such as the user has changed a dynamic variable.
2022-05-04 16:32:04 +01:00
d0f5b67cf1
Fixes for #4736 - I believe the issue was that the dynamic variables were not being saved, removing the need for the user to be aware of this, also making it possible to pass the entire data structure from one call to another if desired.
2022-05-04 15:26:19 +01:00
c979ed1387
v1.0.142-alpha.0
2022-05-04 14:25:01 +00:00
cc7066258e
Merge branch 'develop' of github.com:Budibase/budibase into merge-master-develop
2022-05-04 14:16:40 +01:00
94acf0eb41
Merge branch 'master' of github.com:Budibase/budibase into merge-master-develop
2022-05-04 14:16:22 +01:00
6a7c52fc84
v1.0.141
2022-05-04 13:14:06 +00:00
90fafeecdb
Merge pull request #5689 from Budibase/bug/sev3/query-preview-number-sorting
...
Query preview - sort by number for number types
2022-05-04 14:09:22 +01:00
3bac383068
Merge branch 'master' of github.com:Budibase/budibase into merge-master-develop
2022-05-04 14:06:41 +01:00
c2cf200413
v1.0.140
2022-05-04 12:40:27 +00:00
2579a20e7d
using of
2022-05-04 13:33:58 +01:00
2fb532e1e8
Merge branch 'master' into merge-master-develop
2022-05-04 13:29:51 +01:00
075cd99f94
v1.0.139
2022-05-04 12:25:09 +00:00
efe5b6ef35
v1.0.130-alpha.6
2022-05-04 11:59:46 +00:00
8c406e4049
Merge pull request #5682 from Budibase/bug/sev3/smtp-config-automation
...
Refetch the admin checklist on SMTP config save
2022-05-04 12:52:28 +01:00
65dccdca27
v1.0.130-alpha.5
2022-05-04 11:45:20 +00:00
82625ed8a7
v1.0.130-alpha.4
2022-05-04 11:10:33 +00:00
da0dc2ba68
remove log
2022-05-04 11:56:54 +01:00
8c031b9d35
linting
2022-05-04 11:55:26 +01:00
48804c5414
Some foreach block fixes
2022-05-04 10:24:28 +01:00
fed8c77bce
v1.0.138
2022-05-03 16:38:39 +00:00
bbfac30ea4
Merge pull request #5688 from Budibase/fix/budibase_ci_cypress
...
Add test:e2e:ci:record variant
2022-05-03 17:29:35 +01:00
cbc03ac5ac
v1.0.137
2022-05-03 15:58:47 +00:00
ff697ba29f
Merge pull request #5690 from Budibase/fix/mike-fixes-may
...
April release fixes - MySQL dates and various form/automation fixes
2022-05-03 16:51:07 +01:00
6b93b7cdd2
v1.0.136
2022-05-03 15:08:57 +00:00
a7091982e8
v1.0.130-alpha.3
2022-05-03 15:05:22 +00:00
875a6df0d6
Add test:ere:ci:record variant
2022-05-03 15:52:46 +01:00
c3db3211fb
Query preview sort by number for number types
2022-05-03 15:52:03 +01:00
121e6dd317
Merge branch 'master' of github.com:Budibase/budibase into fix/mike-fixes-may
2022-05-03 15:34:14 +01:00
eae6a0110b
v1.0.135
2022-05-03 13:54:24 +00:00
107c9e2dfc
Fix for #5553 - when importing for SQL databases attempt to manage date and time only column times, handle these when displaying in tables and when filtering.
2022-05-03 14:11:06 +01:00
b92b4b2952
v1.0.130-alpha.2
2022-05-03 12:54:51 +00:00
c54c5a7ef5
Pass through type when creating internal table
2022-05-03 11:50:16 +01:00
5aae2cddc0
Refetch the admin checklist on SMTP config save
2022-05-03 10:36:50 +01:00
4148ef62b1
v1.0.134
2022-05-03 09:32:48 +00:00
Dean
mike12345567
Budibase Staging Release Bot
Mihail Hadzhiev
Martin McKeaveney
Mitch-Budibase
MihailHadzhiev2022
Rory Powell
Mitch-Budibase
melohagan
Martin McKeaveney
Mel O'Hagan
Peter Clement