1a8d781c8c
Refactor entire SDK into client lib and enable svelte context sharing between client and components
2020-11-18 19:18:18 +00:00
f162ce6f03
Attempting to create a class structure for screen and component templates as right now modifying the templates is quite difficult.
2020-11-16 18:05:17 +00:00
e9e97101e9
v0.3.8
2020-11-16 13:54:26 +00:00
bed0886247
bump bbui
2020-11-13 12:24:21 +00:00
2e6ed0bad9
v0.3.7
2020-11-10 20:23:36 +00:00
4c5c386a14
v0.3.6
2020-11-09 18:16:36 +00:00
21ce995dfc
bump rollup plugin svelte version
2020-11-09 18:04:55 +00:00
1a273d9b05
v0.3.5
2020-11-09 16:28:06 +00:00
725e32fe8e
v0.3.4
2020-11-09 11:08:41 +00:00
6e5cdb4828
v0.3.3
2020-11-06 21:40:31 +00:00
646a7ab072
v0.3.2
2020-11-06 11:39:44 +00:00
f6c80b366a
Bump BBUI and use slider components from BBUI
2020-10-30 14:54:12 +00:00
cb25dd97b3
Enabling the dark side
2020-10-29 20:42:34 +00:00
7dee8d6683
v0.3.1
2020-10-28 21:30:51 +00:00
caab43a312
v0.3.0
2020-10-28 20:28:00 +00:00
752d4c1ae0
Merge pull request #788 from Budibase/backend-ag-grid
...
Backend ag grid
2020-10-28 10:02:32 +00:00
50f21e61ff
bulk delete, delete column from panel
2020-10-27 13:04:32 +00:00
f9eeefb4dc
Making sure the caret position is respected in the generic binding popover.
2020-10-27 12:32:48 +00:00
341843af84
restructuring, more styling updates on table, renaming
2020-10-26 17:42:00 +00:00
4681033535
allow editing row from modal
2020-10-23 23:55:51 +01:00
80b76f5f30
update table headers on table change
2020-10-23 22:34:40 +01:00
4ae78dd74d
Merge branch 'master' of github.com:Budibase/budibase into backend-ag-grid
2020-10-21 15:03:31 +01:00
c26eca48ae
v0.2.6
2020-10-21 14:14:33 +01:00
1add16147d
rename data design, ag grid mvp
2020-10-21 11:15:02 +01:00
988d86f975
v0.2.5
2020-10-19 20:31:49 +01:00
500cb93f96
fix multiple dropzone issue
2020-10-19 18:21:57 +01:00
df316167cc
v0.2.4
2020-10-19 09:48:33 +01:00
7dde5d9594
v0.2.3
2020-10-19 08:45:23 +01:00
99cd1e4a51
Bump BBUI version
2020-10-16 15:14:36 +01:00
1a21306dd2
Merge branch 'master' of github.com:Budibase/budibase into autoscreen-templates
2020-10-16 12:57:29 +01:00
ddc979dc59
v0.2.2
2020-10-16 12:41:05 +01:00
623836ca1b
Bump BBUI version
2020-10-16 12:39:26 +01:00
5c7baf84c3
v0.2.1
2020-10-13 13:01:13 +01:00
d6136ec233
merge master
2020-10-12 12:58:20 +02:00
420c94dd00
Merge branch 'master' into feature/add-grid-to-standard-components
2020-10-09 13:08:03 +02:00
4a13be8cf8
merge from master
2020-10-08 22:11:45 +01:00
1fd8d559aa
v0.2.0
2020-10-08 20:32:50 +01:00
027819bae0
merge from master - including fixes
2020-10-08 16:15:12 +01:00
d9c8e6cd96
update svelte version in builder and standard-components packages
2020-10-08 16:24:21 +02:00
1b1c0c4e8f
Bump BBUI version
2020-10-08 09:34:22 +01:00
3dc30262d7
Merge branch 'master' of github.com:Budibase/budibase into linked-records
2020-10-07 10:45:26 +01:00
f5102d95bb
v0.1.25
2020-10-06 21:23:02 +01:00
47993f2bd1
v0.1.24
2020-10-06 20:35:11 +01:00
517fb201ec
Move multiselect to BBUI
2020-10-06 16:02:48 +01:00
3ad58c2aa7
Merge branch 'master' of github.com:Budibase/budibase into linked-records
2020-10-05 10:52:35 +01:00
27c3e6c9e9
Replace all usages of simple-modal with new modal
2020-10-02 20:41:21 +01:00
2120ed99c1
v0.1.23
2020-10-02 16:24:39 +01:00
4d8b1ecc10
Merge branch 'remove-views' of github.com:Budibase/budibase into linked-records
2020-10-02 14:49:23 +01:00
04e76797f9
v0.1.22
2020-09-30 17:05:19 +01:00
089ecf5609
Add WIP draft of linked records UI allowing single linked record selection
2020-09-29 18:27:35 +01:00
83261aeadf
analytics - identify user + extra actions added
2020-09-29 15:26:56 +01:00
db47e5c581
Bump BBUI version
2020-09-29 13:52:26 +01:00
620134132e
Page titles and primary cta alignment and styling consistent
...
Data and automations page titles now use BBUI Heading component and Spacer component. They are not consistent in styling and spacing.
Welcome screen app cards buttons changed to text buttons. I made this change as there were too many buttons on the page. We want one primary button - create new app.
Early changes mage to binding popover. More to come.
2020-09-26 00:45:56 +01:00
b186f0fbb2
merge
2020-09-24 15:52:09 +01:00
6e9c238054
use bbui component for dropzone
2020-09-24 15:50:51 +01:00
f6c924a90b
Bump bbui version
2020-09-24 15:09:16 +01:00
fd0e651fe9
Merge branch 'contextual-workflows' of github.com:Budibase/budibase into contextual-workflows
2020-09-21 13:53:06 +01:00
61964f9106
Merge branch 'master' of github.com:Budibase/budibase into contextual-workflows
2020-09-21 13:52:26 +01:00
67e1680813
Bump bbui version
2020-09-18 20:30:35 +01:00
3160d96b6c
Bump bbui to latest version
2020-09-18 17:41:36 +01:00
0ade1ef558
Bump svelte, rollup and rollup-plugin-terser dependencies to support optional chaining and nullish coalescing
2020-09-16 09:13:13 +01:00
c49e906e5e
Merge branch 'master' of https://github.com/Budibase/budibase into feature/icon-component
2020-09-15 13:44:44 +01:00
fa88c68c0e
Icon and Icon Select Component
2020-09-15 11:53:02 +01:00
4926665eeb
v0.1.21
2020-09-14 17:11:47 +01:00
d55d0c70c8
v0.1.20
2020-09-14 16:26:18 +01:00
4d56b4873c
updated BBUI
2020-09-14 12:34:46 +01:00
2aca93ecf6
Event Modal - set padding to zero
2020-09-14 11:12:44 +01:00
062696958b
removing feather icons - no longer used
2020-09-11 10:39:16 +01:00
b177a36f89
lint, using bbui component
2020-09-09 16:27:46 +01:00
6fc72330dc
custom flatpickr styling, tidy up
2020-09-09 13:44:36 +01:00
58fc6d291c
using flatpickr, rollup config for CSS in the builder
2020-09-09 12:06:04 +01:00
8f0656bd3d
date field working with HTML5 inputs. Needs more sophisticated parsing
2020-09-08 18:03:41 +01:00
3bd3d71e1f
removing uikit dependency
2020-09-06 23:21:40 +01:00
7dca86a685
Merge branch 'master' into removing-uikit-06
...
# Conflicts:
# packages/builder/src/components/common/DatePicker.svelte
2020-09-06 22:32:48 +01:00
0a5a1769fd
remove IconButton.svelte file
2020-09-06 22:04:09 +01:00
2aa9f30546
minWidth set on NewScreen bbui modal, Spacer component used instead of margins and bbui version bumped
2020-09-04 22:40:25 +01:00
da736594f1
Merge branch 'master' into removing-uikit-05
...
# Conflicts:
# packages/standard-components/dist/index.js.map
2020-09-04 21:45:33 +01:00
98c66c4bab
Workflow fixes ( #559 )
...
* workflow fixes
* fixes for workflow - cypress test coverage
* remove log
* adding some assertions to slow test down
* force click create user
* cypress 5, small wait for user test
* remove cypress waiting eslint rule to fix user test
* click button directly
* test clicking
* try changing access level for validity
* lint
2020-09-03 12:02:15 +01:00
c2f0d005d1
Merge branch 'master' into removing-uikit-05
2020-09-03 09:07:22 +01:00
0910f3b34c
bbui version updated to latest & updated Label component used
2020-09-01 21:28:38 +01:00
ebcd1c8220
update bbui
2020-08-31 10:11:44 +02:00
1d4e86621e
updating bbui version and replacing uk-form-label with bbui Label component
2020-08-30 15:28:46 +01:00
1ee7add6dc
updates correctly on close, cancel and done actions
2020-08-28 15:40:43 +02:00
860139d979
wip: binding interface design
2020-08-28 14:43:28 +02:00
94935b023b
working flat() polyfill for jest
2020-08-27 10:20:01 +01:00
300f18927f
merge master
2020-08-26 09:11:16 +02:00
32a0d1e176
binding interface now only updates when the dropdown is closed
2020-08-25 11:20:39 +02:00
4f0e0340fc
v0.1.19
2020-08-21 11:31:53 +01:00
63e3bb16b0
v0.1.18
2020-08-21 10:19:54 +01:00
d2638e0150
merge
2020-08-19 17:14:30 +01:00
80970ba035
full cypress suite for custom views
2020-08-19 16:43:04 +01:00
0a60fd0bc6
deletion of views, statistics calculation popover, unit tests
2020-08-17 21:01:43 +01:00
3216b2f676
removed unecessary dependencies
2020-08-14 17:39:56 +01:00
d6b0374349
merge from master
2020-08-11 17:31:14 +01:00
6e49506348
Merge pull request #528 from Budibase/new-backend-ui
...
New backend ui
2020-08-11 17:06:40 +01:00
86650cba47
remove moduleNameMapper
2020-08-11 15:54:03 +01:00
26fa101a38
v0.1.17
2020-08-11 15:33:01 +01:00
23a184a346
merge
2020-08-11 14:07:04 +01:00
5496a17f44
lint ✨
2020-08-11 12:19:37 +01:00
50167a7038
Merge branch 'master' into feature/binding-interface
2020-08-11 10:46:07 +01:00
566b72a311
v0.1.16
2020-08-10 18:15:30 +01:00
f86d926b4f
bump bbui
2020-08-10 18:14:08 +01:00
4acb792278
Merge branch 'master' of github.com:Budibase/budibase into new-backend-ui
2020-08-10 16:39:30 +01:00
868640dacd
v0.1.15
2020-08-10 16:07:59 +01:00
1da1dd9967
pinning posthog version
2020-08-10 15:56:53 +01:00
3f26548cf4
allow yarn.lock, update posthog version
2020-08-10 15:52:34 +01:00
e3ac8856a5
v0.1.14
2020-08-10 15:36:33 +01:00
cfe262d602
new table creation
2020-08-07 18:31:40 +01:00
160703863b
column CRUD
2020-08-07 17:41:20 +01:00
10d798fe62
creating rows and columns working
2020-08-07 16:13:57 +01:00
9983feb1f0
Merge branch 'master' of https://github.com/Budibase/budibase into britechart/donut-demo
2020-08-07 12:57:02 +01:00
25bb78156a
Merge branch 'master' into feature/binding-interface
2020-08-07 10:43:07 +01:00
9e00550eda
Cypress Tests Running in CI ( #524 )
...
* cypress test setup
* running cypress in CI
* fixing tests after first time setup wizard
* bb api key
* API Key in right place
* adding env in cypress.json
* env var in setup
* lint
* API key not working
* fill in API key form if present
* allow more time for creation
* cypress server for debug
* video recording, better debugging
* Adding debug logs
* set node env
* cypress env
* cancel irrelevant test
2020-08-05 15:18:28 +01:00
549327c885
reinstated jest config (removed accidently)
2020-08-04 11:17:44 +01:00
80dd9b94b1
stub bindings
2020-08-04 11:10:02 +01:00
bbf32cda75
Merge branch 'master' of https://github.com/Budibase/budibase into britecharts/separate-components-2
2020-08-04 10:06:10 +01:00
8ece205082
Merge pull request #523 from Budibase/feature/create-app-modifications
...
Feature/create app modifications
2020-08-03 17:54:54 +02:00
9b7adf9d8c
api key logic works correctly
2020-08-03 15:59:50 +02:00
71d0849b71
v0.1.13
2020-08-03 11:45:39 +01:00
f78e816f20
setup sidebar
2020-07-31 10:46:23 +02:00
5e94fd4859
v0.1.11
2020-07-27 17:08:25 +01:00
b3145df87c
Merge pull request #483 from mjashanks/delete_screen
...
Can delete screens
Uses new dropdown menu from bbui
2020-07-21 21:31:15 +01:00
218699ddb8
Screen dropdown manu uses bbui dropdown menu
2020-07-21 20:49:52 +01:00
2d29ba96d5
v0.1.10
2020-07-21 17:10:59 +01:00
96d80cf30d
Chart component - CDN to NPM Pkg
2020-07-20 10:09:11 +01:00
925665d121
v0.1.9
2020-07-15 13:51:21 +01:00
3e1a66a860
Tidyup and Deletion of old files
2020-07-15 10:50:20 +01:00
665938dca4
v0.1.8
2020-07-15 10:44:11 +01:00
5149f9cc6f
v0.1.7
2020-07-15 09:56:01 +01:00
22005bc990
formatting and tidy up
2020-07-14 16:00:58 +01:00
ce7911a91c
v0.1.6
2020-07-14 10:38:40 +01:00
6d48588ff1
v0.1.3
2020-07-14 08:18:41 +01:00
380781de8b
posthog analytics
2020-07-13 17:12:54 +01:00
6b131b716e
v0.1.2
2020-07-13 14:40:25 +01:00
d821962ca2
fix: corrects border radii on some elements in the users and api keys panels
2020-07-10 09:53:00 +02:00
a664f622d9
corrects background on general tab and bumps bbui version
2020-07-10 09:22:36 +02:00
9b23d9eb51
v0.1.1
2020-07-09 15:30:11 +01:00
581d2b90cb
v0.1.0
2020-07-09 11:31:21 +01:00
133445ccda
Functional Chart Wrapper for Britecharts
2020-07-08 17:14:23 +01:00
bb0be2f347
Merge branch 'colorpicker/swatch-updates' of https://github.com/Budibase/budibase into colorpicker/swatch-updates
2020-07-02 16:27:46 +01:00
7371a1f8e9
Lint and Cypress Lint Plugin
2020-07-02 16:26:43 +01:00
72700bc4ca
Welcome screen fix
...
Page scroll fix
Card responsiveness fix
Page spacing improved
Button color changed
2020-07-02 11:02:31 +01:00
3c17af904d
bump bbui version
2020-06-30 10:02:27 +01:00
b565c940f2
Merge pull request #397 from Budibase/bugfix/select-overflow-clipping
...
OptionSelect - Fix for Overflow Clipping
2020-06-29 15:38:08 +01:00
7c2b5e1858
bump bbui version and fix disabled Select component in user row component
2020-06-29 13:31:51 +02:00
638e7afcc6
WIP: Select Scroll - Problems on scroll
2020-06-27 16:56:01 +01:00
28b951e993
data model rewrite
2020-06-25 22:34:38 +01:00
7c98a466e4
General UI fixing previous styling issues
2020-06-25 15:49:56 +01:00
ef94892a1b
merge from master
2020-06-24 18:05:49 +01:00
9fc870d9b9
updated bbui version
2020-06-24 17:45:23 +01:00
835b21e387
merge
2020-06-24 17:02:38 +01:00
0cf410b253
Merge branch 'master' into Css-update-to-reflect-BBUI
2020-06-24 15:35:40 +01:00
85b0d790a6
Props panel updated
...
All design props tested
SImplification of design props completed, with, in some cases, the replacement of units with general terminology.
2020-06-24 15:06:28 +01:00
cde00356b3
custom notifications, models + fields keyed by ID
2020-06-24 12:41:26 +01:00
28fadac7f7
CSS update UI refresh
...
Font changed to Inter
Colors reflect BBUI
Panel background removed
2020-06-23 08:19:16 +01:00
eca7b69949
merge
2020-06-22 22:39:41 +01:00
39f22ff834
Merge branch 'master' into feature/add-e2e-tests
2020-06-21 20:30:44 +01:00
06fd91cfab
adds bbui.css file
2020-06-19 13:36:03 +02:00
7428dd40fc
backend v1 - styling to do
2020-06-18 17:17:18 +01:00
af9038f64f
structuring new backend UI
2020-06-15 16:41:31 +01:00
77544089ce
adds ignore pattern to jest config so that it doesn't try to run cypress tests as unit tests
2020-06-15 10:41:38 +02:00
7a65da7899
fix linting errors
2020-06-11 18:14:28 +02:00
59442f18cb
adds script to run cypress tests
2020-06-11 17:59:11 +02:00
87ce7e2c3b
change package.json script temporarily
2020-06-11 16:40:45 +02:00
f1d968ae88
adds missing package.json commands
2020-06-09 15:48:25 +02:00
48c604d0d0
feat: adds cypress to the builder
2020-06-09 13:52:00 +02:00
d640f90e7b
feat: move DetailSummary component in properties pane to bbui
2020-06-09 11:00:50 +02:00
70df69a46d
bump bbui version
2020-06-08 12:20:13 +02:00
a50bb3b0cc
bump bbui version and rework homepage to use HomeLinks
2020-06-08 12:09:01 +02:00
3f2cb90340
Merge pull request #279 from Budibase/workflow-v1
...
Workflow v1
2020-06-02 11:15:34 +01:00
633036d0e7
bugfix: right nav scrolling
2020-06-01 22:04:32 +01:00
b372f6b03d
tidy up
2020-06-01 21:26:32 +01:00
fe0b95d627
merge
2020-06-01 16:27:27 +01:00
5c1aa00fd0
server side event emitter
2020-05-31 17:12:52 +01:00
7a3b368399
make alerts live, more hooks, app notifications
2020-05-28 23:32:03 +01:00
6f0a84dd38
adding workflow blocks, parameter parsing, templating
2020-05-28 20:20:03 +01:00
af6d1da89f
forcing svelte version - routify fix
2020-05-27 10:44:56 +01:00
1ff512a218
wip: adds gap to apps
2020-05-26 17:37:11 +02:00
2a151821f9
90% finished modal
2020-05-26 16:25:37 +02:00
9f42b80977
Removing Svelte Color Picker
2020-05-26 15:08:59 +01:00
7f3b34093a
Merge branch 'master' of https://github.com/Budibase/budibase into property-panel/master
2020-05-25 15:24:47 +01:00
facd99f58a
Stable property panel
2020-05-21 14:28:32 +01:00
d86fc405ca
routify config for electron
2020-05-19 15:45:09 +01:00
d65acca512
upgrades routify to latest version
2020-05-19 15:19:32 +02:00
a645df082c
clientId fetching before app load, custom views, fixed schema
2020-04-28 14:39:35 +01:00
1c815cbe1a
update routify to beta 40 and set up correct basepath for application, also fixes some links
2020-04-09 09:04:09 +02:00
6141e9b4ed
adds svelte-simple-modal
2020-04-06 15:41:31 +02:00
5744a6d7fa
Merge branch 'master' of github.com:Budibase/budibase into feature/routify
2020-04-06 10:41:09 +02:00
31853a6c34
v0.0.32
2020-04-06 09:26:13 +01:00
59a7d28c4f
Merge branch 'master' of github.com:Budibase/budibase into feature/routify
2020-04-06 07:47:35 +02:00
ab316fedcd
v0.0.31
2020-04-02 19:27:54 +01:00
eb8dedeea1
v0.0.30
2020-04-02 19:16:21 +01:00
3006110e01
update routify
2020-04-02 18:10:08 +02:00
9c99f416a7
Merge remote-tracking branch 'upstream/master' into feature/builder-organization
2020-04-01 12:47:36 +02:00
09b52be379
changes from node_modules to using rollup-plugin-alias, fixes tests
2020-04-01 12:38:07 +02:00
dcf4f4963c
v0.0.29
2020-03-31 16:33:40 +01:00
ad496a7c3e
v0.0.28
2020-03-31 14:44:04 +01:00
319b86e012
wip: move components to node_modules folder for easier importing
2020-03-31 11:50:13 +02:00
a54d978662
v0.0.27
2020-03-05 08:53:44 +00:00
128218a0fa
v0.0.26
2020-03-05 08:48:04 +00:00
a510d18318
v0.0.25
2020-03-05 08:37:51 +00:00
553cda96c8
move logrocket into the builder directory
2020-03-04 16:50:17 +00:00
b90add5833
v0.0.24
2020-02-27 23:42:35 +00:00
2548e0da2c
v0.0.23
2020-02-27 22:08:29 +00:00
7438e6f057
v0.0.22
2020-02-27 11:59:35 +00:00
f7c0e7a27c
v0.0.21
2020-02-26 22:47:09 +00:00
615688afa7
v0.0.20
2020-02-26 22:32:19 +00:00
e87e890306
v0.0.19
2020-02-26 22:26:19 +00:00
6c10a4a2cf
v0.0.18
2020-02-26 22:18:45 +00:00
56d51014d4
prep for NPM publish
2020-02-26 22:18:14 +00:00
05d55de0d8
v0.0.17
2020-02-26 21:12:13 +00:00
7ae29a6030
#24 - Control Flow ( #79 )
...
* removed binding references to array type
* refactored initialiseChildren into seperate file
* render function, with code blocks - tested simple cases
* few mores tests for control flow
* md components - getting TestApp to work
* new render wrapper - bug fix
* client: providing access to component root elements
* code editor working
* code editor improvements
2020-01-31 23:11:50 +00:00
5aa44a88a4
48 builder frontend 2 ( #76 )
...
* Implement collapsing component hierarchy.
* Save screen when adding new components.
* Allow creation of nested child components.
* Rename updateComponentProps to setComponentProps
* Compile layout and position properties to css strings.
* Correct ordering errors.
* Compile the css for an entire screen.
* Add unique id for each component.
* Ignore _id props.
* Update client to add correct class names to component elements.
* Add grid-template fields to layout styling panel.
* Inject css into iframe. Minor tweaks.
* Fix unset margins.
* Update failing tests.
2020-01-31 16:01:58 +00:00
460ff487be
v0.0.16
2020-01-23 11:38:11 +00:00
4f29664990
v0.0.15
2019-11-12 07:15:59 +00:00
e459d56754
v0.0.14
2019-11-09 08:14:41 +00:00
b64c57bbfb
v0.0.13
2019-11-05 13:30:53 +00:00
21287181a2
v0.0.12
2019-10-19 07:24:35 +01:00
70572a5ee1
v0.0.11
2019-10-12 08:31:04 +01:00
4b559d046e
v0.0.10
2019-10-12 07:51:01 +01:00
ce29733189
v0.0.9
2019-10-11 19:06:31 +01:00
03c1adb55e
v0.0.8
2019-10-11 18:58:13 +01:00
c2ba38fec1
v0.0.7
2019-10-11 18:51:03 +01:00
5ba24568da
v0.0.6
2019-10-11 18:48:09 +01:00
014c3b6bd3
v0.0.5
2019-10-11 18:47:35 +01:00
54420f6987
v0.0.4
2019-10-11 18:45:26 +01:00
011aa9f2cc
base analytics and settings
2019-09-23 01:01:27 +01:00
0366ae5bdb
base analytics and settings
2019-09-23 00:56:39 +01:00
9953989de6
state binding working
2019-09-22 05:02:33 +01:00
c5e6fe001b
v0.0.3
2019-09-10 13:07:35 +01:00
2e596be3d1
v0.0.2
2019-09-10 11:48:00 +01:00
22bed49a09
packages changes and bugfix
2019-09-10 10:25:13 +01:00
4748ce0ed5
package changes
2019-09-10 06:11:46 +01:00
21224b119b
builder ui changes - UI builder in progress
2019-08-07 09:03:49 +01:00
6cd61a4a63
builder importing core directly!
2019-07-30 09:08:40 +01:00
4b12a6a193
adding test commands for all packaged that need them
2019-07-21 09:59:30 +01:00
81e5b5659c
upgraded dependencies
2019-07-21 09:54:19 +01:00
a81af3f18b
component prop definition - create
2019-07-19 12:52:08 +01:00
d52aeb3e95
builder now being served by server
2019-07-15 06:59:46 +01:00
13dd99be02
moving builder into web...
2019-07-13 10:35:57 +01:00
Andrew Kingston
mike12345567
Martin McKeaveney
Martin McKeaveney
kevmodrome
Michael Shanks
Joe
Conor Mack
Victoria Sloan
Tori Sloan
Kevin Åberg Kultalahti
Conor_Mack
Conor_Mack
pngwn
marblekirby