Gerard Burns
|
363db1d4d9
|
PR Feedback
|
2023-06-27 15:20:39 +01:00 |
|
Andrew Kingston
|
211a4cbb35
|
Merge pull request #11011 from Budibase/form-step-updates
Persist the current step when remounting a form
|
2023-06-27 15:11:13 +01:00 |
|
mike12345567
|
fc537a0aab
|
Further PR comments.
|
2023-06-27 14:56:24 +01:00 |
|
|
Gerard Burns
|
4387eb2a67
|
Update datasource config to use tabs
|
2023-06-27 14:33:11 +01:00 |
|
|
Andrew Kingston
|
8587aef506
|
Tidy
|
2023-06-27 14:25:09 +01:00 |
|
Dean
|
6c7c28f9f1
|
Added permissions for the embed iframe to support fullscreen and geolocation features
|
2023-06-27 14:23:25 +01:00 |
|
|
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 |
|
|
mike12345567
|
4d2aa2a67b
|
PR comments.
|
2023-06-27 12:45:00 +01:00 |
|
|
mike12345567
|
1d5bc39282
|
PR comments.
|
2023-06-27 12:24:50 +01:00 |
|
|
Andrew Kingston
|
a7c6f9a60a
|
Allow deleting external tables that you created
|
2023-06-27 12:11:58 +01:00 |
|
|
Andrew Kingston
|
17e7a2d59e
|
Ensure tables and queries are kept in sync when datasource changes occur
|
2023-06-27 12:03:51 +01:00 |
|
|
Andrew Kingston
|
0d8d3a4851
|
Handle showing errors inside grids
|
2023-06-27 11:58:10 +01:00 |
|
|
Andrew Kingston
|
cfdd6bafb7
|
Rewrite how middlewares are ran inside sockets, and fix collaboration
|
2023-06-27 11:33:23 +01:00 |
|
|
mike12345567
|
47260f23bf
|
PR comments.
|
2023-06-27 10:01:06 +01:00 |
|
Mel O'Hagan
|
6f75c5df53
|
Use any type to fix TypeScript check
|
2023-06-27 09:59:02 +01:00 |
|
|
Dean
|
e839e57173
|
Merge remote-tracking branch 'origin/develop' into merge-master
|
2023-06-27 09:44:46 +01:00 |
|
Adria Navarro
|
2ca171bc6f
|
Merge pull request #11031 from Budibase/chore/unify_pro_lint
Chore - Unify pro lint
|
2023-06-27 09:42:33 +01:00 |
|
|
Dean
|
eaecd3ab68
|
Merge remote-tracking branch 'origin/develop' into merge-master
|
2023-06-27 09:31:35 +01:00 |
|
|
Adria Navarro
|
85ff09bbf3
|
Update pro ref
|
2023-06-27 08:34:25 +01:00 |
|
|
mike12345567
|
7e79c827a7
|
Test fixes, as well as issue discovered by test around _id generation and event triggering.
|
2023-06-26 19:10:04 +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 |
|
|
Andrew Kingston
|
9e3711a4c6
|
Fix data check logic
|
2023-06-26 18:14:12 +01:00 |
|
|
Andrew Kingston
|
73ea1022eb
|
Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes
|
2023-06-26 18:13:56 +01:00 |
|
|
Andrew Kingston
|
4d3ea4cc3e
|
Merge pull request #11029 from Budibase/use-modal-for-editing-datasources-v3
Use modal for editing datasources v3
|
2023-06-26 18:11:16 +01:00 |
|
|
Andrew Kingston
|
b7603f8bf1
|
Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes
|
2023-06-26 17:56:11 +01:00 |
|
|
deanhannigan
|
e2625ec1a7
|
Merge pull request #11030 from Budibase/feature/existing-user-invite-messaging-updates
Extended email duplicate messaging to the create user flow
|
2023-06-26 17:21:05 +01:00 |
|
|
deanhannigan
|
1e86f3ac16
|
Merge pull request #11027 from Budibase/fix/existing-email-invite-messaging
Fix for builder invite error handling and updated messaging
|
2023-06-26 17:20:28 +01:00 |
|
|
deanhannigan
|
8dd1ab2cb0
|
Merge pull request #11032 from Budibase/feature/remove-cloud-flags-for-auth-branding
Removed cloud flag restriction on auth branding pages
|
2023-06-26 17:02:11 +01:00 |
|
|
mike12345567
|
8882801315
|
Fixing lookup of custom role by ID in test case.
|
2023-06-26 17:01:50 +01:00 |
|
|
mike12345567
|
ced1dd95c7
|
Updating roles tests to make sure ID always valid.
|
2023-06-26 16:35:16 +01:00 |
|
|
Andrew Kingston
|
a3204ad17a
|
Update data section routing to properly handle datasource entities/table sync and handle having no data
|
2023-06-26 16:34:22 +01:00 |
|
|
Adria Navarro
|
d7e1ebe9ec
|
Update pro ref
|
2023-06-26 16:09:08 +01:00 |
|
|
Dean
|
b6caebe431
|
Merge remote-tracking branch 'origin/develop' into feature/app-settings-section
|
2023-06-26 15:51:31 +01:00 |
|
|
Dean
|
65d7e2397e
|
Removed cloud flag restriction on auth branding pages
|
2023-06-26 15:50:14 +01:00 |
|
|
Gerard Burns
|
6b36b8824e
|
PR Feedback
|
2023-06-26 15:49:42 +01:00 |
|
|
Adria Navarro
|
ce92bfd3ef
|
Update pro ref
|
2023-06-26 15:46:48 +01:00 |
|
|
Adria Navarro
|
6d8903d7e5
|
Lint pro command
|
2023-06-26 15:22:36 +01:00 |
|
|
deanhannigan
|
f06cc9359f
|
Merge pull request #11009 from Budibase/fix/oidc-custom-icons-fixed
Fix OIDC Custom Icons
|
2023-06-26 15:09:10 +01:00 |
|
|
Adria Navarro
|
747686a8fa
|
Update pro ref
|
2023-06-26 15:08:45 +01:00 |
|
melohagan
|
0ecda93ea9
|
Fix for $in on ObjectIds (#11014)
|
2023-06-26 15:07:29 +01:00 |
|
|
mike12345567
|
1c09913d33
|
Fix for foreign keys being unsettlable after update, breaking Postgres test.
|
2023-06-26 15:05:10 +01:00 |
|
|
Adria Navarro
|
22fca335f0
|
Lint pro from monorepo
|
2023-06-26 15:04:13 +01:00 |
|
|
Dean
|
47c4f72415
|
Extended email duplicate messaging updates to the create user flow
|
2023-06-26 14:33:37 +01:00 |
|
|
Gerard Burns
|
601a855f13
|
filter out REST fields
|
2023-06-26 14:32:14 +01:00 |
|
|
Gerard Burns
|
88582b871e
|
replace use of datasources.save with datasources.update
|
2023-06-26 14:15:04 +01:00 |
|
|
Gerard Burns
|
f3d5e2b4a0
|
remove builderstore/datasource
|
2023-06-26 13:44:23 +01:00 |
|
|
Gerard Burns
|
3771ab2ffc
|
Update datasource config editing
|
2023-06-26 13:31:16 +01:00 |
|
|
mike12345567
|
2cafc9f80c
|
Merge branch 'develop' of github.com:Budibase/budibase into form-step-updates
|
2023-06-26 12:45:34 +01:00 |
|
|
mike12345567
|
b94801d10a
|
Merge branch 'develop' of github.com:Budibase/budibase into feature/custom-role-readable-ids
|
2023-06-26 12:39:41 +01:00 |
|
|
Dean
|
46e889fd72
|
Fix for invite error handling and updated messaging
|
2023-06-26 12:38:13 +01:00 |
|
|
Andrew Kingston
|
6d38bdcd64
|
Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes
|
2023-06-26 11:32:54 +01:00 |
|
|
Andrew Kingston
|
325818748e
|
Merge pull request #10962 from Budibase/grid-block
Grid block
|
2023-06-26 11:32:04 +01:00 |
|
|
Adria Navarro
|
95a92dcbd6
|
Update pro refs
|
2023-06-26 11:22:24 +01:00 |
|
|
Adria Navarro
|
b145ce1c15
|
Update pro refs
|
2023-06-26 11:04:20 +01:00 |
|
|
Andrew Kingston
|
2a2215f485
|
Display users table as its own option at the very top of the datasource list
|
2023-06-26 10:50:54 +01:00 |
|
|
Adria Navarro
|
0f0b1a5eda
|
Update pro refs
|
2023-06-26 10:45:45 +01:00 |
|
|
Andrew Kingston
|
5f407259dc
|
Enable component nesting validation for new apps
|
2023-06-26 10:39:38 +01:00 |
|
|
Dean
|
8f9a1d4bba
|
PR feedback
|
2023-06-26 10:23:57 +01:00 |
|
|
Dean
|
10108fb543
|
Null checking logo configs
|
2023-06-26 10:22:03 +01:00 |
|
Gerard Burns
|
1606ca0c84
|
Refactor Datasource Creation Modal (#10783)
|
2023-06-26 09:52:02 +01:00 |
|
|
Andrew Kingston
|
8bfb909280
|
Fix scroll overflow in binding drawer
|
2023-06-26 09:22:40 +01:00 |
|
|
Andrew Kingston
|
aebc3b2bb8
|
Merge branch 'develop' of github.com:Budibase/budibase into grid-block
|
2023-06-26 09:05:06 +01:00 |
|
|
Andrew Kingston
|
3f0fac43ea
|
Add padding to secondary user header to match tab spacing
|
2023-06-26 08:58:25 +01:00 |
|
|
Andrew Kingston
|
5d14bb70c6
|
Ensure builder websocket is only instantiated once
|
2023-06-26 08:58:06 +01:00 |
|
|
Andrew Kingston
|
d3d2f5fa75
|
Merge pull request #11008 from R2bEEaton/develop
Small Spelling Fix
|
2023-06-26 08:25:54 +01:00 |
|
|
melohagan
|
8325b5bb1e
|
Add count to duplicate errors (#10920)
* Add count to duplicate errors
* Lint: Remove unused prop
|
2023-06-23 18:34:05 +01:00 |
|
|
mike12345567
|
e022da5bc8
|
Adding test case for foreign key autocolumn enrichment.
|
2023-06-23 18:31:02 +01:00 |
|
|
mike12345567
|
c2b4dec88f
|
Fix to make foreign keys auto-columns when used in relationships as well as making sure that when fetching tables that they can be removed, using the old fetch mechanism (to be replaced, but needs to work for now).
|
2023-06-23 18:09:52 +01:00 |
|
|
Andrew Kingston
|
a4ea6a3d34
|
Ensure initial value of current form step inside form state store is correct
|
2023-06-23 16:50:10 +01:00 |
|
|
Andrew Kingston
|
b130de71dc
|
Persist the current step when remounting a form
|
2023-06-23 16:45:22 +01:00 |
|
|
Dean
|
6f24772f49
|
PR Feedback
|
2023-06-23 16:40:40 +01:00 |
|
|
mike12345567
|
3d3efadb37
|
Merge branch 'master' of github.com:Budibase/budibase into develop
|
2023-06-23 15:19:49 +01:00 |
|
|
Dean
|
a61cf5fa45
|
Merge remote-tracking branch 'origin/master' into fix/oidc-custom-icons-fixed
|
2023-06-23 14:58:47 +01:00 |
|
|
melohagan
|
3aca0c0ed3
|
Null safety (#11007)
|
2023-06-23 14:48:07 +01:00 |
|
|
Dean
|
ceecd85d76
|
OIDC icon fix recreated on a new branch
|
2023-06-23 14:47:58 +01:00 |
|
Ryan Eaton
|
22a8b2cbaa
|
spelling fix
|
2023-06-23 09:22:05 -04:00 |
|
|
deanhannigan
|
e978d627b4
|
Merge pull request #10991 from Budibase/feature/no-sort-settings-option
Added a 'None' option for sorting columns in data components.
|
2023-06-23 12:10:10 +01:00 |
|
|
Adria Navarro
|
9e43248c5e
|
Merge pull request #10960 from Budibase/chore/refactor_pro_as_package
Remove the doble deep format references
|
2023-06-23 12:01:52 +01:00 |
|
|
Dean
|
fd8400bee5
|
PR feedback and removed some comments
|
2023-06-23 11:56:59 +01:00 |
|
|
deanhannigan
|
6cbe89bce8
|
Merge pull request #11002 from Budibase/feature/existing-user-invite-messaging-updates
Updated messaging when attempting to invite existing users.
|
2023-06-23 11:56:09 +01:00 |
|
|
Andrew Kingston
|
007b6d605b
|
Merge pull request #10917 from Budibase/fix/datasource-409
Fix datasource conflicts
|
2023-06-23 11:54:15 +01:00 |
|
|
melohagan
|
a97518ff39
|
Scroll to field button action (#10901)
* Scroll To Field WIP
* Scroll to the label
|
2023-06-23 11:51:49 +01:00 |
|
|
Adria Navarro
|
5777a3f506
|
Update pro ref
|
2023-06-23 11:41:03 +01:00 |
|
|
Adria Navarro
|
5545b32c27
|
Update pro ref
|
2023-06-23 11:18:01 +01:00 |
|
|
Adria Navarro
|
2f548d834f
|
Merge branch 'develop' into chore/refactor_pro_as_package
|
2023-06-23 10:43:57 +01:00 |
|
|
Dean
|
b836bfab74
|
Merge remote-tracking branch 'origin/develop' into feature/existing-user-invite-messaging-updates
|
2023-06-23 09:47:56 +01:00 |
|
|
Dean
|
672f1d36e4
|
Updated the invite response messaging for requests that contain users who are already registered
|
2023-06-23 09:47:39 +01:00 |
|
|
deanhannigan
|
2cfb2716f3
|
Merge pull request #10994 from Budibase/fix/markdown-editor-icons
Added FontAwesome icons used by EasyMDE
|
2023-06-23 09:05:49 +01:00 |
|
|
mike12345567
|
baecab785d
|
Handling the removal of the role_ prefix where applicable so that new role IDs present in the exact same way as built in roles.
|
2023-06-22 18:02:35 +01:00 |
|
|
melohagan
|
0860a5b248
|
Exclude entities from datasource env processing (#11000)
|
2023-06-22 17:35:47 +01:00 |
|
|
mike12345567
|
c4994b8369
|
Merge branch 'develop' of github.com:Budibase/budibase into feature/custom-role-readable-ids
|
2023-06-22 14:02:23 +01:00 |
|
|
mike12345567
|
58d7293798
|
PR suggestion.
|
2023-06-22 13:25:37 +01:00 |
|
|
Adria Navarro
|
1a46879c90
|
Merge pull request #10993 from Budibase/budi-7115-install_pgdump
BUDI-7115 - Install pgdump
|
2023-06-22 13:22:28 +01:00 |
|
|
mike12345567
|
5373b867e1
|
Fix for #10949 - the relationship types were always locked to be the same, which means that the foreign key wasn't being updated correctly as the backend was not aware of which side was the one-to-many side.
|
2023-06-22 12:32:39 +01:00 |
|
|
Dean
|
959d3729dc
|
Added config for FontAwesome icons used by EasyMDE in the builder
|
2023-06-22 12:28:12 +01:00 |
|
|
Andrew Kingston
|
ca18ab02bd
|
Merge pull request #10887 from Budibase/fix/on-change-actions
Fix field on change actions not properly checking for unchanged values
|
2023-06-22 11:49:56 +01:00 |
|
|
Dean
|
3267e77c15
|
Updated component setting manifest to add placeholder/none option for Sort picker fields.
|
2023-06-22 11:43:09 +01:00 |
|
Peter Clement
|
77f5567d3a
|
fix duplicate loop block issue
|
2023-06-22 11:41:23 +01:00 |
|
|
Adria Navarro
|
a227a2664a
|
Reduce image size
|
2023-06-22 11:37:33 +01:00 |
|
|
Adria Navarro
|
55e38725db
|
Add pg_dump to single dockerfile
|
2023-06-22 11:29:32 +01:00 |
|
|
Adria Navarro
|
a5ae0e5a3f
|
Add pg_dump to server dockerfile
|
2023-06-22 11:13:20 +01:00 |
|
|
Andrew Kingston
|
6d08cedc86
|
Adjust position of new row FAB when there is no sticky column to look better
|
2023-06-22 09:26:14 +01:00 |
|
|
Andrew Kingston
|
194a135183
|
Reset rows and tick before updating schema when swapping table ID in grids
|
2023-06-22 09:23:34 +01:00 |
|
|
Andrew Kingston
|
05bba92b94
|
Fix not being able to add rows when only a sticky column exists
|
2023-06-22 09:22:39 +01:00 |
|
|
Andrew Kingston
|
6d0271ae97
|
Prevent adding rows when no columns are rendered
|
2023-06-22 08:26:14 +01:00 |
|
|
Andrew Kingston
|
f5d8851dec
|
Merge pull request #10848 from Budibase/fix/grid-data-type-swap
Reset rows and tick before updating schema when swapping table ID in grids
|
2023-06-22 08:18:24 +01:00 |
|
|
Andrew Kingston
|
50c807e60c
|
Lint
|
2023-06-22 08:17:28 +01:00 |
|
|
Andrew Kingston
|
bcbeae2279
|
Rework grid buttons, removing add row and add column buttons, and compression height and width into new size button
|
2023-06-22 08:16:59 +01:00 |
|
|
mike12345567
|
45120c60ba
|
Getting basic regex in place to make sure role names can be IDs.
|
2023-06-21 17:08:54 +01:00 |
|
|
Michael Drury
|
e1741937ae
|
Removing logging of error in coercion - this was creating noise in errors channel.
|
2023-06-21 12:08:39 +01:00 |
|
|
Andrew Kingston
|
0a3dd1a1b4
|
Remove expand icons from grids
|
2023-06-21 11:51:23 +01:00 |
|
|
Adria Navarro
|
921c821d2f
|
Install pg_dump on docker
|
2023-06-21 11:33:37 +01:00 |
|
|
Andrew Kingston
|
1403ee59ce
|
Use app ID as part of room key for grid websocket to fix issues with dev/prod tables having the same table ID but being different tables
|
2023-06-21 08:51:43 +01:00 |
|
|
Andrew Kingston
|
3f20a3a439
|
Enable collaboration for public users and fix collaboration for non-devs
|
2023-06-21 08:33:58 +01:00 |
|
|
mike12345567
|
cbfeea121c
|
Merge branch 'master' of github.com:Budibase/budibase into develop
|
2023-06-20 18:09:23 +01:00 |
|
|
Dean
|
2bdf855217
|
Removed app publish state tracking
|
2023-06-20 17:25:20 +01:00 |
|
|
melohagan
|
9e9cece59e
|
Clone user (#10974)
|
2023-06-20 17:07:34 +01:00 |
|
|
melohagan
|
b0debf17ef
|
Table disappears from side bar when changing display name (#10909)
* Pass sourceId on fetch tables
* Use ExternalTable type
|
2023-06-20 17:07:12 +01:00 |
|
|
Dean
|
998f1806aa
|
Updated analytics tests to account for the embedded
|
2023-06-20 16:29:09 +01:00 |
|
|
Dean
|
ac315938f5
|
Removed comment
|
2023-06-20 15:08:26 +01:00 |
|
|
Dean
|
f178b86266
|
Linting
|
2023-06-20 15:02:53 +01:00 |
|
|
Dean
|
3607774d7e
|
Added camera permission to the default embed iframe
|
2023-06-20 14:29:10 +01:00 |
|
|
Michael Drury
|
958cabee52
|
Merge pull request #10921 from Budibase/fix/airgap-templates-call
update airgap script and enable support for offline mode
|
2023-06-20 13:51:10 +01:00 |
|
|
Adria Navarro
|
98c549ceaf
|
Fix ref
|
2023-06-20 13:42:39 +01:00 |
|
|
Adria Navarro
|
3535aa4894
|
Fix pro tests
|
2023-06-20 13:15:32 +01:00 |
|
|
mike12345567
|
38be94fa07
|
Fix for test case.
|
2023-06-20 12:36:05 +01:00 |
|
|
Dean
|
f04f42546a
|
Merge remote-tracking branch 'origin/develop' into feature/app-settings-section
|
2023-06-20 12:33:48 +01:00 |
|
|
Dean
|
602ea9bc4e
|
General tidying and refactoring. Updated the publish button behaviour to also take into account revert and version update behaviours.
|
2023-06-20 12:33:18 +01:00 |
|
|
Adria Navarro
|
cdd15fd75f
|
Merge pull request #10953 from Budibase/budi-7115-sql-schema-export
BUDI-7115 - Sql schema export
|
2023-06-20 11:57:46 +01:00 |
|
|
Adria Navarro
|
c0f95b8929
|
Update pro ref
|
2023-06-20 11:45:37 +01:00 |
|
|
Adria Navarro
|
8ab5913eb9
|
Change url
|
2023-06-20 11:33:38 +01:00 |
|
|
Adria Navarro
|
6ed5894441
|
Type
|
2023-06-20 11:14:23 +01:00 |
|
|
Adria Navarro
|
50d082c385
|
Merge branch 'develop' into chore/refactor_pro_as_package
|
2023-06-20 11:14:05 +01:00 |
|
|
Andrew Kingston
|
9d6fbf067f
|
Restore pointer events for unfocused cells
|
2023-06-20 11:10:23 +01:00 |
|
|
Dean
|
c1248eed12
|
Merge remote-tracking branch 'origin/develop' into feature/app-settings-section
|
2023-06-20 10:08:18 +01:00 |
|
|
Andrew Kingston
|
c1f7774602
|
Lint
|
2023-06-20 09:34:56 +01:00 |
|
|
Andrew Kingston
|
2df810c59b
|
Update grid context menu position determination to work regardless of page scroll offsets
|
2023-06-20 09:34:27 +01:00 |
|
|
Andrew Kingston
|
7486d3dde0
|
Close context menu when using mouse wheel or menu touching scrollbars
|
2023-06-20 08:01:41 +01:00 |
|
|
Andrew Kingston
|
901ba53630
|
Respect the allowExpandRows flag in when considering if rows can be edited in modals
|
2023-06-20 07:55:46 +01:00 |
|
|
Andrew Kingston
|
164bacf783
|
Lint
|
2023-06-20 07:42:26 +01:00 |
|
|
mike12345567
|
3955b00bbc
|
Merge branch 'develop' of github.com:Budibase/budibase into fix/airgap-templates-call
|
2023-06-19 18:57:17 +01:00 |
|
|
mike12345567
|
e0c21864b8
|
Merge branch 'develop' of github.com:Budibase/budibase into fix/add-automation-step
|
2023-06-19 18:53:36 +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 |
|
|
Andrew Kingston
|
7a958dcf8b
|
Update placeholder text for grid block settings
|
2023-06-19 18:51:29 +01:00 |
|
|
Andrew Kingston
|
9fd04cc2c7
|
Update multiple settings components to enable more generic usage of column selectors and remove some bespoke copy from generic components. Enable display names for grid columns
|
2023-06-19 18:49:57 +01:00 |
|
|
Adria Navarro
|
acfe69a3d5
|
Remove the doble deep format references
|
2023-06-19 18:34:51 +01:00 |
|
|
Andrew Kingston
|
e436c1da1c
|
Use old icon for grids
|
2023-06-19 18:32:13 +01:00 |
|
|
Andrew Kingston
|
7b75d7f13d
|
Update column editor and filter editor to make action buttons full width
|
2023-06-19 18:32:03 +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 |
|
|
Andrew Kingston
|
757d2d11ef
|
Add functionality to suppress errors to avoid spam in grids in client apps
|
2023-06-19 18:21:14 +01:00 |
|