Andrew Kingston
|
9f8eeb7c99
|
Remove transition setting from components
|
2021-06-18 12:41:15 +01:00 |
Andrew Kingston
|
feef8dd30f
|
Update buttons in settings, improve preview styles
|
2021-06-18 09:59:28 +01:00 |
Andrew Kingston
|
0fb0a1574d
|
Add box shadow to nav and update setting order for layout
|
2021-06-17 16:23:38 +01:00 |
Martin McKeaveney
|
90bd99039b
|
lint
|
2021-06-17 14:06:31 +01:00 |
Andrew Kingston
|
8904eaf48b
|
Make navigation respect width setting
|
2021-06-17 13:17:24 +01:00 |
Andrew Kingston
|
a668b55d52
|
Add content width setting to layouts
|
2021-06-17 13:05:12 +01:00 |
Andrew Kingston
|
a4d808c7f2
|
Update server generated layouts and improve layout styles
|
2021-06-17 12:57:36 +01:00 |
Andrew Kingston
|
a522a87ee8
|
Add component for customising navigation links, improve layouts and responsiveness
|
2021-06-17 12:18:48 +01:00 |
Budibase Release Bot
|
ed59383167
|
v0.9.51
|
2021-06-17 05:20:27 +00:00 |
mike12345567
|
d22f608c6f
|
Formatting.
|
2021-06-16 18:39:59 +01:00 |
Martin McKeaveney
|
9dc3725268
|
spectrum button component, allow binding to queries
|
2021-06-16 18:14:23 +01:00 |
Martin McKeaveney
|
1a94ef5039
|
end to end data providers and opinionated sql
|
2021-06-16 17:50:22 +01:00 |
Budibase Release Bot
|
fa499a2ff1
|
v0.9.50
|
2021-06-16 09:04:00 +00:00 |
Andrew Kingston
|
f147422e74
|
Merge branch 'master' of github.com:Budibase/budibase into feature/layout-poc
|
2021-06-16 09:35:11 +01:00 |
Budibase Release Bot
|
0169280b9b
|
v0.9.49
|
2021-06-16 08:29:17 +00:00 |
Andrew Kingston
|
cb56d7464b
|
Merge pull request #1712 from Budibase/fix/eslint-prettier
Fix eslint, update eslint and prettier versions and update package scripts
|
2021-06-16 09:22:07 +01:00 |
Andrew Kingston
|
abb1d33948
|
Lint with prettier
|
2021-06-15 19:39:40 +01:00 |
Andrew Kingston
|
d9d0cc9be3
|
Fix all eslint issues
|
2021-06-15 19:36:56 +01:00 |
Budibase Release Bot
|
81e7940657
|
v0.9.48
|
2021-06-15 12:43:29 +00:00 |
Andrew Kingston
|
d522483f54
|
Move scrolling to layout level and provide opinionated defaults
|
2021-06-14 18:24:02 +01:00 |
Andrew Kingston
|
a3f3039778
|
Update section component to use new placeholder styles
|
2021-06-14 17:41:18 +01:00 |
Andrew Kingston
|
a7aca00c99
|
Add initial work on responsive nav and customisable layout
|
2021-06-14 16:19:49 +01:00 |
Andrew Kingston
|
9aea8d124f
|
Merge branch 'master' of github.com:Budibase/budibase into feature/layout-poc
|
2021-06-14 09:54:11 +01:00 |
Keviin Åberg Kultalahti
|
7566a84aeb
|
missed files that were not commited on friday
|
2021-06-14 07:34:42 +02:00 |
Budibase Release Bot
|
4020cd84c8
|
v0.9.47
|
2021-06-11 13:03:19 +00:00 |
Keviin Åberg Kultalahti
|
59b84a4d08
|
fix placement of logo
|
2021-06-11 14:50:51 +02:00 |
Keviin Åberg Kultalahti
|
aef10f5365
|
wip layout compoent
|
2021-06-11 14:47:57 +02:00 |
Andrew Kingston
|
4cf9a7827b
|
Improve empty states and placeholders
|
2021-06-11 11:37:05 +01:00 |
Andrew Kingston
|
c741cb6ba6
|
Merge branch 'master' of github.com:Budibase/budibase into interactive-layouts
|
2021-06-11 09:52:21 +01:00 |
Budibase Release Bot
|
ade2be09ed
|
v0.9.46
|
2021-06-11 08:48:36 +00:00 |
Andrew Kingston
|
b35d251ae9
|
Remove log statement
|
2021-06-11 09:24:18 +01:00 |
Andrew Kingston
|
7d87befe13
|
Allow user styles to override placeholder styles
|
2021-06-11 09:14:22 +01:00 |
Andrew Kingston
|
72dfa1ba1b
|
Add manifest option to prevent showing component empty states
|
2021-06-11 08:49:06 +01:00 |
Andrew Kingston
|
634dc38768
|
Improve component empty states and fix selection indicator lockup bug. Fix data provider not exporting loaded context
|
2021-06-11 08:45:58 +01:00 |
Keviin Åberg Kultalahti
|
49510dff1f
|
remove unused components in builder settings
|
2021-06-11 09:19:44 +02:00 |
Keviin Åberg Kultalahti
|
1ebaac26ba
|
Merge branch 'master' into feature/layout-poc
|
2021-06-11 09:09:34 +02:00 |
Andrew Kingston
|
3b085d9ac3
|
Add placeholders and empty states automatically as required to any empty client components
|
2021-06-11 08:05:49 +01:00 |
Andrew Kingston
|
c6564858b2
|
Remove leftover dependency
|
2021-06-10 18:47:22 +01:00 |
Andrew Kingston
|
2bb4576eb6
|
Refactor client component structure, fix select bar z index, add titles to container bar settings
|
2021-06-10 18:42:41 +01:00 |
Budibase Release Bot
|
d919d61a1d
|
v0.9.45
|
2021-06-10 13:17:08 +00:00 |
Keviin Åberg Kultalahti
|
4082c837c3
|
Merge branch 'master' into feature/layout-poc
|
2021-06-10 14:57:20 +02:00 |
Budibase Release Bot
|
1eeb2202e7
|
v0.9.44
|
2021-06-10 12:54:14 +00:00 |
Keviin Åberg Kultalahti
|
3fb4e222d3
|
Merge branch 'master' into feature/layout-poc
|
2021-06-10 13:55:48 +02:00 |
Budibase Release Bot
|
46e7fce3e7
|
v0.9.43
|
2021-06-10 11:21:35 +00:00 |
Budibase Release Bot
|
a678aaf1ef
|
v0.9.42
|
2021-06-10 10:51:32 +00:00 |
Andrew Kingston
|
a8ba23c08e
|
Use more unique class names to avoid clashes
|
2021-06-10 11:34:01 +01:00 |
Andrew Kingston
|
72f4eae31c
|
Apply less aggressive global CSS rules to containers
|
2021-06-10 11:24:42 +01:00 |
Andrew Kingston
|
a1debf402f
|
Fully remount update forms when initial values change
|
2021-06-10 11:17:14 +01:00 |
Andrew Kingston
|
b422de32c2
|
Add more opinionated container styles to make layout out components even easier
|
2021-06-10 10:59:00 +01:00 |
Keviin Åberg Kultalahti
|
1733739981
|
Merge branch 'master' into feature/layout-poc
|
2021-06-10 11:35:46 +02:00 |
Andrew Kingston
|
72088a8414
|
Add default styles to containers to improve component layouts
|
2021-06-10 10:20:47 +01:00 |
Andrew Kingston
|
c412af8766
|
Update autoscreens to have new container props
|
2021-06-10 09:48:08 +01:00 |
Andrew Kingston
|
c17550d0c6
|
Don't apply new container layout settings unless props have been defined, so that existing containers are unchanged
|
2021-06-10 09:28:10 +01:00 |
Andrew Kingston
|
383e6793ec
|
Merge branch 'master' of github.com:Budibase/budibase into interactive-layouts
|
2021-06-10 09:20:45 +01:00 |
Budibase Release Bot
|
6255dadb43
|
v0.9.41
|
2021-06-09 18:01:31 +00:00 |
Andrew Kingston
|
5911065da4
|
Merge branch 'master' of github.com:Budibase/budibase into interactive-layouts
|
2021-06-09 18:54:36 +01:00 |
Andrew Kingston
|
af15241019
|
Remove log statement
|
2021-06-09 16:42:14 +01:00 |
Andrew Kingston
|
345d286229
|
Invert boolean filter expressions to consider nulls as false
|
2021-06-09 16:41:15 +01:00 |
Budibase Release Bot
|
72caa080fe
|
v0.9.40
|
2021-06-09 15:26:30 +00:00 |
Andrew Kingston
|
49dd84a2bd
|
Merge branch 'master' of github.com:Budibase/budibase into interactive-layouts
|
2021-06-09 15:10:11 +01:00 |
Budibase Release Bot
|
94c4a30657
|
v0.9.39
|
2021-06-09 13:51:07 +00:00 |
Andrew Kingston
|
e05d9f5e7f
|
Merge pull request #1678 from Budibase/form-fixes
Form fixes
|
2021-06-09 14:42:59 +01:00 |
Keviin Åberg Kultalahti
|
5f7885b5e6
|
Merge branch 'master' into feature/layout-poc
|
2021-06-09 14:10:55 +02:00 |
Keviin Åberg Kultalahti
|
50db4ccf69
|
add horizontal or vertical setting to navbar manifest
|
2021-06-09 14:10:29 +02:00 |
Andrew Kingston
|
e027e34c69
|
Change form type setting to 'actionType' to avoid clashing with old settings
|
2021-06-09 12:55:17 +01:00 |
Andrew Kingston
|
d47b871e9e
|
Add type setting to forms and fix inheriting initial values
|
2021-06-09 12:53:12 +01:00 |
Budibase Release Bot
|
24b7e74cc3
|
v0.9.38
|
2021-06-09 11:37:37 +00:00 |
Andrew Kingston
|
7f468c0701
|
Correctly set initial values when registering fields in forms
|
2021-06-09 12:29:27 +01:00 |
Budibase Release Bot
|
f72eac2657
|
v0.9.37
|
2021-06-09 11:22:57 +00:00 |
Budibase Release Bot
|
9a7c515466
|
v0.9.36
|
2021-06-09 10:41:59 +00:00 |
Budibase Release Bot
|
cc518ff381
|
v0.9.35
|
2021-06-09 10:12:38 +00:00 |
Keviin Åberg Kultalahti
|
6356ce8e4c
|
Merge branch 'master' into feature/layout-poc
|
2021-06-09 10:24:05 +02:00 |
Keviin Åberg Kultalahti
|
03b5cff753
|
change name to section, add illegalChildren prop to manifest
|
2021-06-09 10:23:42 +02:00 |
Budibase Release Bot
|
4e3c777129
|
v0.9.34
|
2021-06-08 19:56:50 +00:00 |
Budibase Release Bot
|
2278f9f221
|
v0.9.33
|
2021-06-08 19:28:00 +00:00 |
Budibase Release Bot
|
138f271bb6
|
v0.9.32
|
2021-06-08 18:48:22 +00:00 |
Martin McKeaveney
|
c88244fd34
|
Merge pull request #1667 from Budibase/fix/stability-bugfixes
Fix/stability bugfixes
|
2021-06-08 19:40:41 +01:00 |
Budibase Release Bot
|
bdcd3b023e
|
v0.9.31
|
2021-06-08 18:15:16 +00:00 |
Martin McKeaveney
|
a12a59e869
|
lint
|
2021-06-08 17:14:46 +01:00 |
Andrew Kingston
|
da7fad61f3
|
Fix icon for hAlign center in containers
|
2021-06-08 15:18:34 +01:00 |
Martin McKeaveney
|
f33c570b1d
|
remove builder role from google auth, only allow google sign in if local account exists
|
2021-06-08 14:46:18 +01:00 |
Andrew Kingston
|
2e4492d5fc
|
Fix navigation component due to new wrapping divs around components
|
2021-06-08 14:22:00 +01:00 |
Martin McKeaveney
|
536c2c317c
|
fixing attachments for public apps
|
2021-06-08 12:50:58 +01:00 |
Andrew Kingston
|
7c421ab480
|
Add back in lock file
|
2021-06-08 08:02:00 +01:00 |
Andrew Kingston
|
41f87f0354
|
Move settings bar into client library and allow configuration from manifest.json
|
2021-06-08 08:00:54 +01:00 |
Budibase Release Bot
|
1e852cabbb
|
v0.9.30
|
2021-06-07 17:12:41 +00:00 |
Budibase Release Bot
|
c04cdb7137
|
v0.9.29
|
2021-06-07 16:43:08 +00:00 |
Budibase Release Bot
|
dd1b3c25ac
|
v0.9.28
|
2021-06-07 16:26:33 +00:00 |
Martin McKeaveney
|
22eb27f38d
|
fix rbac for tables
|
2021-06-07 14:29:06 +01:00 |
Andrew Kingston
|
07abcefddd
|
Merge pull request #1620 from Budibase/lab-day-plausible
Lab day work (better searching for external data sources, date range component, fixes)
|
2021-06-07 09:47:10 +01:00 |
Budibase Release Bot
|
d6808f4850
|
v0.9.27
|
2021-06-04 20:56:30 +00:00 |
Keviin Åberg Kultalahti
|
1d2d02b48b
|
remove unused class
|
2021-06-04 15:52:28 +02:00 |
Keviin Åberg Kultalahti
|
1ce9089d3a
|
auto-wrapping on size collapse
|
2021-06-04 15:52:05 +02:00 |
Budibase Release Bot
|
1f8c9138e9
|
v0.9.26
|
2021-06-04 13:05:28 +00:00 |
Keviin Åberg Kultalahti
|
f2139849ee
|
display placeholders
|
2021-06-04 14:34:52 +02:00 |
Budibase Release Bot
|
b49a43582b
|
v0.9.25
|
2021-06-04 09:13:55 +00:00 |
Keviin Åberg Kultalahti
|
01b9e890d5
|
wip layout component
|
2021-06-04 08:57:18 +02:00 |
Andrew Kingston
|
135c5df292
|
Remove leftover code and add proper comments to action types
|
2021-06-03 11:38:06 +01:00 |
Budibase Release Bot
|
de2e690889
|
v0.9.24
|
2021-06-03 10:05:33 +00:00 |
Andrew Kingston
|
05a32bc009
|
Add client SDK function to get a component action and clean up date range picker
|
2021-06-03 10:10:25 +01:00 |
Andrew Kingston
|
15ee1c3a1a
|
Remove placeholder value from data provider API
|
2021-06-03 09:55:23 +01:00 |
Andrew Kingston
|
928b457200
|
Disable inputs in client apps updating on change, causing far too many API requests when linked to a filtered data provider
|
2021-06-03 09:43:45 +01:00 |
Budibase Release Bot
|
c45197edc5
|
v0.9.23
|
2021-06-02 12:06:51 +00:00 |
Budibase Release Bot
|
760b32da61
|
v0.9.22
|
2021-06-02 11:34:24 +00:00 |
Andrew Kingston
|
4d7dce31c7
|
Merge branch 'master' of github.com:Budibase/budibase into lab-day-plausible
|
2021-06-02 11:39:41 +01:00 |
Andrew Kingston
|
32d76ea9b1
|
Add default setting to date range picker and add info text
|
2021-06-02 08:38:19 +01:00 |
Andrew Kingston
|
c67dc0b439
|
Remove '1 hour' selector from date range picker
|
2021-06-02 08:28:19 +01:00 |
Budibase Release Bot
|
f95e1bb4e6
|
v0.9.21
|
2021-06-01 17:05:46 +00:00 |
Budibase Release Bot
|
5525fc390f
|
v0.9.20
|
2021-06-01 16:25:29 +00:00 |
Andrew Kingston
|
1b8e6ce195
|
Merge branch 'master' of github.com:Budibase/budibase into lab-day-plausible
|
2021-06-01 15:16:09 +01:00 |
Andrew Kingston
|
6d2e1a8501
|
Revert logo in standard components
|
2021-06-01 15:06:58 +01:00 |
Andrew Kingston
|
c6827e8a75
|
Improve client performance and add action to control data provider queries
|
2021-06-01 14:59:42 +01:00 |
Budibase Release Bot
|
dfae1371b5
|
v0.9.19
|
2021-06-01 12:50:43 +00:00 |
Budibase Release Bot
|
afe61ae2c1
|
v0.9.18
|
2021-05-29 13:01:19 +00:00 |
Budibase Release Bot
|
598f189a65
|
v0.9.17
|
2021-05-28 19:13:11 +00:00 |
mike12345567
|
71834d01c6
|
Formatting.
|
2021-05-28 19:55:01 +01:00 |
mike12345567
|
8b32c7073d
|
Fixing issue with min/max in numbers.
|
2021-05-28 19:52:30 +01:00 |
Budibase Release Bot
|
4e91f3e144
|
v0.9.16
|
2021-05-28 13:18:31 +00:00 |
Budibase Release Bot
|
6df76822bb
|
v0.9.15
|
2021-05-28 12:39:17 +00:00 |
Mike Shanks
|
f39973efa6
|
updated builder license to GPL & copyright to Budibase Inc
|
2021-05-28 12:14:14 +01:00 |
Budibase Release Bot
|
9307ef3375
|
v0.9.14
|
2021-05-27 15:05:57 +00:00 |
Andrew Kingston
|
a367acfd74
|
Allow data providers to inherit each other and add full client side lucene implementation
|
2021-05-27 15:11:08 +01:00 |
Budibase Release Bot
|
00cb2f5bfa
|
v0.9.13
|
2021-05-27 07:19:23 +00:00 |
Budibase Release Bot
|
8ab9939153
|
v0.9.12
|
2021-05-26 16:53:00 +00:00 |
Budibase Release Bot
|
06d4fcfaf8
|
v0.9.11
|
2021-05-26 16:14:47 +00:00 |
Martin McKeaveney
|
138e16e5e6
|
Merge branch 'master' of https://github.com/Budibase/budibase
|
2021-05-26 17:04:39 +01:00 |
Martin McKeaveney
|
bbb1ad07ca
|
configure AWS S3 credentials to upload standard components
|
2021-05-26 17:04:32 +01:00 |
Budibase Release Bot
|
9760be83a3
|
v0.9.10
|
2021-05-26 15:57:10 +00:00 |
Budibase Release Bot
|
0d880551f8
|
v0.9.9
|
2021-05-26 15:16:54 +00:00 |
Martin McKeaveney
|
aa224e4415
|
v0.9.8
|
2021-05-26 15:36:41 +01:00 |
Martin McKeaveney
|
79ddd2cc79
|
v0.9.7
|
2021-05-26 15:34:28 +01:00 |
Martin McKeaveney
|
3326c24d37
|
v0.9.6
|
2021-05-26 13:37:46 +01:00 |
Andrew Kingston
|
6725461c99
|
Merge branch 'master' of github.com:Budibase/budibase into ak-fixes
|
2021-05-26 08:53:42 +01:00 |
Martin McKeaveney
|
52899e23a2
|
v0.9.5
|
2021-05-25 15:40:12 +01:00 |
Martin McKeaveney
|
9655d2a7fa
|
v0.9.4
|
2021-05-25 12:44:36 +01:00 |
Andrew Kingston
|
f00ebcf7d6
|
Replace font-weight 500 with 600 as source sans pro does not have a 500 weight, and update autoscreens and templates to use source sans pro
|
2021-05-25 10:11:41 +01:00 |
Andrew Kingston
|
07e2ea701e
|
Remove login form component
|
2021-05-25 08:26:43 +01:00 |
Andrew Kingston
|
00bb158991
|
Merge branch 'master' of github.com:Budibase/budibase into ak-fixes
|
2021-05-25 08:21:38 +01:00 |
Andrew Kingston
|
1c649bee63
|
Default logo URL in navigation component and add setting to hide logo
|
2021-05-25 08:21:28 +01:00 |
Martin McKeaveney
|
881ddc646f
|
v0.9.3
|
2021-05-24 21:54:28 +01:00 |
Martin McKeaveney
|
a2917e3ffd
|
v0.9.2
|
2021-05-24 17:20:20 +01:00 |
Michael Drury
|
34384e476c
|
Merge pull request #1514 from Budibase/fix/per-app-login
Removing per app login screens
|
2021-05-21 11:11:21 +01:00 |
Martin McKeaveney
|
7b4cc64bee
|
v0.9.1
|
2021-05-20 14:53:22 +01:00 |
Martin McKeaveney
|
d1836a898c
|
v0.9.0
|
2021-05-20 14:49:19 +01:00 |
mike12345567
|
beae1cec71
|
Removing all login/logout functionality from apps.
|
2021-05-20 13:05:58 +01:00 |
Martin McKeaveney
|
0b3110b223
|
merge with master
|
2021-05-20 10:40:15 +01:00 |
Martin McKeaveney
|
dbabe0afaf
|
Merge pull request #1496 from Budibase/feature/draft-apps
Feature/draft apps
|
2021-05-18 11:25:51 +01:00 |
Andrew Kingston
|
861c9b3b5a
|
Update info text for data provider
|
2021-05-14 15:00:30 +01:00 |
Andrew Kingston
|
6479382856
|
Don't show pagination control if the data source isn't an internal table
|
2021-05-14 13:29:37 +01:00 |
Andrew Kingston
|
47db3df0a1
|
Add optional info text to components
|
2021-05-14 13:29:14 +01:00 |
Andrew Kingston
|
d8bbb5e06d
|
Simplify loading logic to prevent empty state flashing when loading data in data providers
|
2021-05-13 16:33:19 +01:00 |
Andrew Kingston
|
6de9ccd28b
|
Fix incorrect background colour in standard-components table background
|
2021-05-13 13:12:59 +01:00 |
Andrew Kingston
|
b578522bcd
|
Wait until table schema loads before searching to avoid initial double search
|
2021-05-13 13:11:45 +01:00 |
Andrew Kingston
|
8e2aff1716
|
Remove initial work on pagination standard component
|
2021-05-13 12:39:46 +01:00 |
Andrew Kingston
|
06d8a0970a
|
Remove leftover import of search component
|
2021-05-13 12:38:34 +01:00 |
Andrew Kingston
|
d9923e1e98
|
Clean up data source context and remove explicit button actions for pagination
|
2021-05-13 12:30:45 +01:00 |
Andrew Kingston
|
da40086c0b
|
Allow multipage searches and implement optional pagination to data providers
|
2021-05-13 12:26:18 +01:00 |
Mike Shanks
|
3aaeb8f7da
|
v0.8.18
|
2021-05-13 11:17:08 +01:00 |
Martin McKeaveney
|
61a5b109f5
|
dev mode E2E
|
2021-05-13 11:06:08 +01:00 |
Andrew Kingston
|
4147b7203c
|
Fix two-tone spectrum background colours
|
2021-05-12 14:52:43 +01:00 |
Andrew Kingston
|
5131a2fd74
|
Fix chart placeholder, fix spectrum colours and begin work on pagination component
|
2021-05-12 14:34:25 +01:00 |
Andrew Kingston
|
6d1c9c3e44
|
Add legacy in-memory filtering and sorting for views and external datasources
|
2021-05-11 19:07:52 +01:00 |
Andrew Kingston
|
a3fbe6a34a
|
Allow data provider filtering using dates and date ranges, and allow filtering using a value or binding for any type
|
2021-05-11 18:33:25 +01:00 |
Andrew Kingston
|
78ae68981e
|
Add support for numerical sorting
|
2021-05-11 11:24:16 +01:00 |
Andrew Kingston
|
3eabaea42f
|
Merge branch 'next' of github.com:Budibase/budibase into lab-day-search
|
2021-05-11 10:47:52 +01:00 |
Andrew Kingston
|
1158276bc6
|
Bump svelte and routify deps, fix builder _reset usage and some tidy ups
|
2021-05-07 11:14:43 +01:00 |
Andrew Kingston
|
f30b52e283
|
Fix links not working in some components
|
2021-05-06 17:21:29 +01:00 |
Martin McKeaveney
|
bb2f4f485b
|
merge with next
|
2021-05-04 11:49:34 +01:00 |
Martin McKeaveney
|
a4cc4191b4
|
merge with next
|
2021-05-04 11:40:59 +01:00 |
Andrew Kingston
|
556236ebce
|
Add explicit prettier options
|
2021-05-04 11:32:22 +01:00 |
Andrew Kingston
|
1c3d477523
|
Fix prettier and fix crash when using certain views as data sources
|
2021-05-04 11:04:42 +01:00 |
Martin McKeaveney
|
4618dfd2d1
|
merge
|
2021-05-04 09:55:14 +01:00 |
Keviin Åberg Kultalahti
|
4ec2e7d01f
|
lint:fix
|
2021-05-03 09:31:09 +02:00 |
Andrew Kingston
|
5aee405245
|
Add server-side searching and pagination to data providers using internal tables
|
2021-04-30 16:29:53 +01:00 |
Andrew Kingston
|
2d62c6a413
|
Add wrapper component to data provider so that it can be styled
|
2021-04-29 09:41:49 +01:00 |
Andrew Kingston
|
0caad1f582
|
Merge branch 'next' of github.com:Budibase/budibase into spectrum-bbui
|
2021-04-28 15:53:07 +01:00 |
Andrew Kingston
|
d3966c01b5
|
Fix stacked list icon
|
2021-04-28 14:12:06 +01:00 |
Andrew Kingston
|
bdd9eb2ff3
|
Update all component icons
|
2021-04-28 13:42:17 +01:00 |
Andrew Kingston
|
a0304d7945
|
Add dropzone component and update builder and standard components
|
2021-04-22 10:10:42 +01:00 |
Andrew Kingston
|
b2fc4e56eb
|
Add datepicker, centralise icon management and update builder styles
|
2021-04-20 20:06:27 +01:00 |
Andrew Kingston
|
3703ab17a4
|
Update all design panel settings and styles to use new spectrum components
|
2021-04-19 14:04:07 +01:00 |
Martin McKeaveney
|
174dc6c780
|
v0.8.17
|
2021-04-19 10:39:27 +01:00 |
mike12345567
|
bd6741fc1c
|
Merge branch 'master' of github.com:Budibase/budibase into next
|
2021-04-16 17:01:35 +01:00 |
Andrew Kingston
|
95bef3e90a
|
Standardise text area updates
|
2021-04-16 16:11:11 +01:00 |
Andrew Kingston
|
691c9a9bd1
|
Replace RichText editor with spectrum text area
|
2021-04-16 16:00:10 +01:00 |
Andrew Kingston
|
7ba5ff7b34
|
Add radio group spectrum component and update builder
|
2021-04-16 14:30:33 +01:00 |
Andrew Kingston
|
9a2385e4b2
|
Use BBUI checkbox in standard components
|
2021-04-16 11:32:41 +01:00 |
Andrew Kingston
|
0f0d9bf72e
|
Fix standard component table layout
|
2021-04-16 09:40:04 +01:00 |
Andrew Kingston
|
d19e15c1e7
|
Update some standard components form components to use generic BBUI core components
|
2021-04-15 19:43:18 +01:00 |
Andrew Kingston
|
c94bbf9571
|
Update StringField and OptionsField to use BBUI components
|
2021-04-15 11:51:18 +01:00 |
Andrew Kingston
|
c2b41ac55a
|
Make standard components table custom column non-sortable
|
2021-04-13 14:45:24 +01:00 |
Andrew Kingston
|
c3748ce640
|
Fix client table not passing down rowCount and improve styles of wrapper div
|
2021-04-13 14:13:44 +01:00 |
Martin McKeaveney
|
0fc957a13d
|
v0.8.16
|
2021-04-12 19:51:11 +01:00 |
Martin McKeaveney
|
160d02a691
|
v0.8.15
|
2021-04-12 17:10:19 +01:00 |
Andrew Kingston
|
0b3dcb40a3
|
Use BBUI spectrum table in standard components
|
2021-04-12 16:14:24 +01:00 |
Martin McKeaveney
|
d8a0f0f747
|
merge
|
2021-04-12 13:41:46 +01:00 |
Martin McKeaveney
|
9eb6b541e9
|
merge
|
2021-04-12 13:39:53 +01:00 |
Martin McKeaveney
|
c30e70c939
|
v0.8.14
|
2021-04-11 12:58:22 +01:00 |
Martin McKeaveney
|
4b6efc42ed
|
v0.8.13
|
2021-04-11 12:53:39 +01:00 |
Andrew Kingston
|
48918a17f5
|
Fix typo
|
2021-04-07 11:31:59 +01:00 |
Andrew Kingston
|
4cb085d80d
|
Add commonJS fields to package.json for client and standard components so the server can require them
|
2021-04-07 11:31:19 +01:00 |
Andrew Kingston
|
6d8f27ba4e
|
Export manifext in package.json
|
2021-04-07 11:17:01 +01:00 |
Andrew Kingston
|
4e200d0def
|
Update locks
|
2021-04-07 10:52:41 +01:00 |
Andrew Kingston
|
a788a161b8
|
Include BBUI CSS in standard components
|
2021-04-07 10:52:33 +01:00 |
Andrew Kingston
|
e3cee769f4
|
Remove old code from container
|
2021-04-01 19:19:14 +01:00 |
Andrew Kingston
|
65fe57ee23
|
Merge branch 'next' of github.com:Budibase/budibase into spectrum-bbui
|
2021-04-01 19:10:07 +01:00 |
Andrew Kingston
|
eff0313e4e
|
Update locks
|
2021-04-01 19:07:06 +01:00 |
Andrew Kingston
|
230e9ed988
|
Update to support new backend table structure
|
2021-04-01 18:00:46 +01:00 |
Andrew Kingston
|
249f58c3b4
|
Add standard components yarn.lock
|
2021-04-01 17:07:43 +01:00 |
Andrew Kingston
|
db2a710168
|
Improve cross-package bundling
|
2021-04-01 13:44:14 +01:00 |
Andrew Kingston
|
583faba9da
|
Add BBUI to monorepo and use vite for builder, client lib and standard components
|
2021-03-31 16:14:56 +01:00 |
Andrew Kingston
|
d26c20df31
|
Update search component to work with new data bindings. Simplify manifest context entries for data bindings
|
2021-03-29 16:37:17 +01:00 |
Andrew Kingston
|
88ae09a553
|
Remove deprecated dataProvider setting from manifest
|
2021-03-29 16:22:43 +01:00 |
Andrew Kingston
|
8457e1743c
|
Add correct height placeholder for tables to avoid jarring page resizing when loading data
|
2021-03-29 16:05:32 +01:00 |
Andrew Kingston
|
9012df0b90
|
Merge branch 'next' of github.com:Budibase/budibase into datasource-refactor
|
2021-03-29 15:40:35 +01:00 |
Andrew Kingston
|
6b6debf6f9
|
Reorder table settings to put column selection last
|
2021-03-29 15:36:26 +01:00 |
Andrew Kingston
|
0c4687c502
|
Fix form picker component styling
|
2021-03-29 15:34:18 +01:00 |
Andrew Kingston
|
9b3a6a9c4d
|
Disable table checkbox
|
2021-03-29 15:29:13 +01:00 |
mike12345567
|
d9808b2fd7
|
Minor change to make sure next button only displayed when relevant.
|
2021-03-26 13:49:03 +00:00 |
mike12345567
|
659874c9ee
|
Some final changes to search system so that the new indexing system is used instead of mango to achieve exactly the same result.
|
2021-03-26 13:46:20 +00:00 |
mike12345567
|
a5fd8d0e33
|
Rewriting search to use the new couchdb 3.0 search functionality.
|
2021-03-25 23:42:50 +00:00 |
Andrew Kingston
|
9fddf13be5
|
Add onclick handler to icons
|
2021-03-25 16:18:19 +00:00 |
Andrew Kingston
|
6442177f72
|
Enable table to know when invalid column names have been passed
|
2021-03-25 14:48:28 +00:00 |
Andrew Kingston
|
892bbcd07a
|
Add virtual rendering to table to increase performance and remove grid component
|
2021-03-25 14:40:29 +00:00 |
Martin McKeaveney
|
6f2a1d45cc
|
v0.8.12
|
2021-03-25 10:40:08 +00:00 |
Andrew Kingston
|
16ce2d4a07
|
Change table truncation text to be agnostic of plural case
|
2021-03-25 09:47:52 +00:00 |
Andrew Kingston
|
604d02cb4e
|
Add smart trunctation to all table cell types
|
2021-03-25 09:45:23 +00:00 |
Andrew Kingston
|
c95baec83f
|
Add table cell max width and support text truncation
|
2021-03-25 09:37:14 +00:00 |
Andrew Kingston
|
e815996b8f
|
Add quiet table setting and improve table borders
|
2021-03-25 09:10:21 +00:00 |
Andrew Kingston
|
85ebf41e74
|
Fix table scrollbars affecting height calculation
|
2021-03-25 08:15:13 +00:00 |
Andrew Kingston
|
0a50c7bf86
|
Ensure schema provided by DataProvider has name properties for all fields
|
2021-03-25 08:14:53 +00:00 |
Andrew Kingston
|
7c79e52360
|
Allow table to take children
|
2021-03-25 08:02:41 +00:00 |
Andrew Kingston
|
9dc337dfec
|
Remove tab selection state from tables
|
2021-03-24 19:20:59 +00:00 |
Andrew Kingston
|
63fb0b5b5d
|
Improve table column sorting to put auto cols last
|
2021-03-24 19:13:38 +00:00 |
Andrew Kingston
|
124ff6b089
|
Add setting for table row count and improve height calculation
|
2021-03-24 19:06:02 +00:00 |
Martin McKeaveney
|
9a47528775
|
v0.8.11
|
2021-03-24 18:48:26 +00:00 |
Andrew Kingston
|
bc562ffd6b
|
Make table responsive and vertically and horizontally scrollable
|
2021-03-24 18:46:12 +00:00 |
Andrew Kingston
|
22fb849ad2
|
Increase table attachment preview heights
|
2021-03-24 18:45:55 +00:00 |
Andrew Kingston
|
c70b69577a
|
Add attachment handling to tables
|
2021-03-24 16:29:28 +00:00 |
Andrew Kingston
|
6457751367
|
Add initial version of new spectrum table component
|
2021-03-24 15:51:57 +00:00 |
Andrew Kingston
|
d7c4fab4a5
|
Remove RowDetail component
|
2021-03-22 18:04:40 +00:00 |
Andrew Kingston
|
aef82e29a6
|
Update form setting datasource type
|
2021-03-19 13:09:22 +00:00 |
Andrew Kingston
|
951491006b
|
Update all charts to work with new data provider
|
2021-03-18 18:45:11 +00:00 |
Andrew Kingston
|
87fd743f75
|
Update bar chart to work with new data provider
|
2021-03-18 17:34:51 +00:00 |
Andrew Kingston
|
73bff491e8
|
Update grid to support data providers
|
2021-03-18 15:53:59 +00:00 |
Andrew Kingston
|
dc1f420163
|
Provide schema from data providers
|
2021-03-18 15:53:25 +00:00 |
Keviin Åberg Kultalahti
|
cc363fa463
|
reverts some of the merged files
|
2021-03-18 14:33:45 +01:00 |
Keviin Åberg Kultalahti
|
28f2f7ca59
|
bumps svelte version in client and standard-components packages
|
2021-03-17 14:27:51 +01:00 |
Andrew Kingston
|
788817d249
|
Update bindable properties to handle new data provider
|
2021-03-16 19:11:00 +00:00 |
Andrew Kingston
|
a51f5c73c4
|
Add data provider component and refactor component setting types
|
2021-03-16 13:54:34 +00:00 |
Martin McKeaveney
|
b4c14bf8a6
|
v0.8.10
|
2021-03-15 21:26:50 +00:00 |
Martin McKeaveney
|
0f37bc44a7
|
v0.8.9
|
2021-03-14 18:13:13 +00:00 |
Martin McKeaveney
|
6afcda7599
|
v0.8.8
|
2021-03-12 14:20:18 +00:00 |
Martin McKeaveney
|
1b95326b20
|
v0.8.7
|
2021-03-12 11:45:42 +00:00 |
Martin McKeaveney
|
b51ac37b6f
|
v0.8.6
|
2021-03-12 09:33:12 +00:00 |
mike12345567
|
3947044014
|
Formatting.
|
2021-03-10 17:56:16 +00:00 |
Martin McKeaveney
|
72f0aebb2b
|
v0.8.5
|
2021-03-03 17:46:36 +00:00 |
Martin McKeaveney
|
768a9d59da
|
v0.8.4
|
2021-03-03 17:05:18 +00:00 |
Martin McKeaveney
|
c8ad39fb49
|
Merge branch 'master' into develop
|
2021-03-03 16:00:10 +00:00 |
Martin McKeaveney
|
f1927a0d79
|
tidy up
|
2021-03-03 14:42:34 +00:00 |
Martin McKeaveney
|
8dd49a4d09
|
fix space table name grid bug
|
2021-03-03 13:51:53 +00:00 |
Kevin Åberg Kultalahti
|
13787d9d3b
|
Merge pull request #1232 from Budibase/feature/standard-components-transitions
Adds transition setting in the design panel on container component
|
2021-03-03 13:12:48 +01:00 |
Keviin Åberg Kultalahti
|
f711b7c075
|
screens can now select a transition rather than only use fade
|
2021-03-01 16:53:37 +01:00 |
Keviin Åberg Kultalahti
|
d386de0282
|
moves the transition setting to the design panel
|
2021-03-01 16:46:05 +01:00 |
Andrew Kingston
|
736259f371
|
Add password field component
|
2021-03-01 14:13:11 +00:00 |
Andrew Kingston
|
37c0efad8d
|
Add position option to background image
|
2021-03-01 14:05:54 +00:00 |
Keviin Åberg Kultalahti
|
856e80fce2
|
adds transition utility to the client sdk
|
2021-03-01 12:59:27 +01:00 |
Andrew Kingston
|
753c76d2f7
|
Center background image component
|
2021-02-26 14:04:44 +00:00 |
Andrew Kingston
|
d856bcd35a
|
Add external setting for links
|
2021-02-26 09:58:24 +00:00 |
Andrew Kingston
|
80f86720ac
|
Add background image component
|
2021-02-26 09:58:11 +00:00 |
Martin McKeaveney
|
88fa3d18ea
|
v0.8.3
|
2021-02-25 17:18:36 +00:00 |
Martin McKeaveney
|
da6a90a042
|
v0.8.2
|
2021-02-25 16:39:52 +00:00 |
Martin McKeaveney
|
63fefd08a9
|
v0.8.1
|
2021-02-25 13:50:33 +00:00 |
Martin McKeaveney
|
ae6a6ad779
|
v0.8.0
|
2021-02-25 12:49:03 +00:00 |
Andrew Kingston
|
45d9845806
|
Update picker to use null as default placeholder value
|
2021-02-25 11:34:11 +00:00 |
Andrew Kingston
|
6d9c5cdf46
|
Add support for new relationship objects in client apps
|
2021-02-25 11:06:16 +00:00 |
Andrew Kingston
|
73d19f53d1
|
Add support for new relationship object in backend table
|
2021-02-25 11:05:46 +00:00 |
Martin McKeaveney
|
2a3e4d8a42
|
fix undefined 1:N dropdown selection
|
2021-02-24 19:05:17 +00:00 |
Kevin Åberg Kultalahti
|
50d25e14c3
|
Merge pull request #1168 from Budibase/fix/budi-day-bug-list
Fix/dot notation grid fix
|
2021-02-24 12:54:29 +01:00 |
Keviin Åberg Kultalahti
|
2d80208282
|
adds option to allow dot notation in column names
|
2021-02-23 13:14:30 +01:00 |
Andrew Kingston
|
aaa40f4638
|
Update stacked list to preserve white space
|
2021-02-23 10:15:51 +00:00 |
Andrew Kingston
|
8ed2be5594
|
Update card stat to preserve white space
|
2021-02-23 10:15:40 +00:00 |
Andrew Kingston
|
d5a37c535e
|
Update horizontal card to preserve white space and fix crashing when a URL isn't entered
|
2021-02-23 10:15:16 +00:00 |
Andrew Kingston
|
56bbaba44e
|
Update vertical card to preserve white space and fix crashing when a URL isn't entered
|
2021-02-23 10:14:54 +00:00 |
Andrew Kingston
|
d3e4921f29
|
Make paragraph respect whitespace
|
2021-02-23 10:04:07 +00:00 |
Andrew Kingston
|
dcaacab477
|
Revert heading margin change to use browser default
|
2021-02-23 10:03:52 +00:00 |
Andrew Kingston
|
bc5e88bceb
|
Make heading respect white space and reduce default margin
|
2021-02-23 10:02:21 +00:00 |
Michael Drury
|
adaabf5441
|
Merge pull request #1152 from Budibase/user-active-and-bugs
Some fixes and the ability to set a user to inactive
|
2021-02-22 15:10:16 +00:00 |
Andrew Kingston
|
fc8f4b9215
|
Bump BBUI version
|
2021-02-22 12:28:43 +00:00 |
Andrew Kingston
|
8c4cf0bb8d
|
Merge branch 'develop' of github.com:Budibase/budibase into repeater-filtering
|
2021-02-22 12:23:46 +00:00 |
mike12345567
|
a81b44ccaf
|
Formatting.
|
2021-02-22 11:40:24 +00:00 |
mike12345567
|
77d268c8ac
|
Merge branch 'develop' of github.com:Budibase/budibase into feature/relationship-enrichment
|
2021-02-19 14:35:18 +00:00 |
Andrew Kingston
|
e021b55704
|
Add relationship enrichment display to backend UI
|
2021-02-19 13:05:52 +00:00 |
Keviin Åberg Kultalahti
|
c6ad951fe5
|
merge develop
|
2021-02-19 13:55:17 +01:00 |
Andrew Kingston
|
d4d4a36448
|
Display enriched relationship info in grids and bindings
|
2021-02-19 12:00:06 +00:00 |
Andrew Kingston
|
03c7593ce6
|
Merge branch 'develop' of github.com:Budibase/budibase into repeater-filtering
|
2021-02-18 17:45:10 +00:00 |
Andrew Kingston
|
5c2aa7d603
|
Fix and tidy up all button actions and drawers
|
2021-02-18 17:44:56 +00:00 |
Andrew Kingston
|
5530a7b241
|
Merge branch 'develop' of github.com:Budibase/budibase into budi-day-02-11-cheeks-joe
|
2021-02-17 15:25:34 +00:00 |
Andrew Kingston
|
d92c0b770b
|
Add disabled setting for forms and fields, and force autocolumns in forms to be disabled
|
2021-02-17 15:16:44 +00:00 |
Andrew Kingston
|
f0a48ea341
|
Merge branch 'develop' of github.com:Budibase/budibase into url-context
|
2021-02-16 15:35:05 +00:00 |
Andrew Kingston
|
e0d1513af4
|
Ensure form doesn't inherit built in datasources
|
2021-02-16 15:30:20 +00:00 |
Andrew Kingston
|
6603e504b4
|
Make form always inherit closest datasource
|
2021-02-16 13:27:38 +00:00 |
Andrew Kingston
|
5c6831b9c9
|
Merge branch 'master' of github.com:Budibase/budibase into url-context
|
2021-02-16 09:22:37 +00:00 |
Andrew Kingston
|
37b9ba4f6a
|
Update URL settigns to be bindable inputs and update navigate action
|
2021-02-15 20:03:29 +00:00 |
Keviin Åberg Kultalahti
|
a42aecbfbe
|
initial work to switch toggle to radio button
|
2021-02-15 17:12:39 +01:00 |
Martin McKeaveney
|
d58ac80cc9
|
v0.7.8
|
2021-02-15 14:07:27 +00:00 |
Keviin Åberg Kultalahti
|
9b13879b27
|
fixes crash when options was empty
|
2021-02-15 13:31:16 +01:00 |
Keviin Åberg Kultalahti
|
17e4ff1c60
|
Merge branch 'develop' into relationship-one-to-many
|
2021-02-15 12:02:26 +01:00 |
Keviin Åberg Kultalahti
|
8539a6dcbe
|
initial standard-components relationship field component update
|
2021-02-12 16:47:20 +01:00 |
Martin McKeaveney
|
9ac9766399
|
merge
|
2021-02-12 13:32:37 +00:00 |
Andrew Kingston
|
47dc6e8598
|
Merge branch 'master' of github.com:Budibase/budibase into url-context
|
2021-02-12 11:43:28 +00:00 |
Andrew Kingston
|
bd7d95aabc
|
Avoid relationship picker making rows calls for empty string ID
|
2021-02-12 11:17:13 +00:00 |
Martin McKeaveney
|
9ce9d10c29
|
v0.7.7
|
2021-02-12 11:15:38 +00:00 |
Andrew Kingston
|
6df2f2b1a1
|
Don't filter repeater results when filter is null
|
2021-02-11 14:27:27 +00:00 |
Andrew Kingston
|
17a9e44ef6
|
Add filtering to repeaters
|
2021-02-11 13:03:22 +00:00 |
Martin McKeaveney
|
768d87ec62
|
fix linkable card
|
2021-02-11 11:35:52 +00:00 |
Andrew Kingston
|
f5fe4c9bb7
|
Add hot reloading to search results
|
2021-02-11 09:30:05 +00:00 |
Andrew Kingston
|
b5e78fe14a
|
Update some empty state text
|
2021-02-11 09:20:25 +00:00 |
Andrew Kingston
|
639d1f18e2
|
Shrink some settings names to fit in one line
|
2021-02-11 09:19:09 +00:00 |
Andrew Kingston
|
544f94954c
|
Make all form components use fill width of container
|
2021-02-10 19:23:53 +00:00 |
Andrew Kingston
|
aec4939b93
|
Merge branch 'master' of github.com:Budibase/budibase into form-builder
|
2021-02-10 18:34:45 +00:00 |
Martin McKeaveney
|
5269b6be23
|
Merge pull request #1107 from Budibase/internal-search
Internal search
|
2021-02-10 15:44:45 +00:00 |
Martin McKeaveney
|
5d962b3c8a
|
default rows
|
2021-02-10 14:58:29 +00:00 |
Michael Shanks
|
4c9c84ce3e
|
Updated copyright line in license files
|
2021-02-10 14:41:37 +00:00 |
Martin McKeaveney
|
933969ce55
|
code review
|
2021-02-10 14:24:42 +00:00 |
Martin McKeaveney
|
c132b7b584
|
tidy up
|
2021-02-09 19:00:13 +00:00 |
Martin McKeaveney
|
e599854b14
|
primary and secondary index fields
|
2021-02-09 18:49:12 +00:00 |
Andrew Kingston
|
009f631273
|
Remove placeholder setting from relationship field as it is never displayed
|
2021-02-09 14:07:33 +00:00 |
Andrew Kingston
|
6fb9ad18b7
|
Update BBUI version
|
2021-02-09 12:57:01 +00:00 |
Andrew Kingston
|
246e6e2d7d
|
Update BBUI version
|
2021-02-09 12:43:33 +00:00 |
Andrew Kingston
|
a2a805b45b
|
Ensure client data contexts are correctly updated if a parent context is updated
|
2021-02-09 12:41:21 +00:00 |
Martin McKeaveney
|
41bc7dbaf7
|
backwards pagination
|
2021-02-09 12:12:03 +00:00 |
Martin McKeaveney
|
d2bd2209eb
|
indexable fields
|
2021-02-08 20:54:55 +00:00 |
Martin McKeaveney
|
7f24c80bf0
|
search UI complete, server side cursor based pagination
|
2021-02-08 17:44:44 +00:00 |
Andrew Kingston
|
5ab29ab73e
|
Merge branch 'master' of github.com:Budibase/budibase into form-builder
|
2021-02-08 09:52:46 +00:00 |
Martin McKeaveney
|
3189250d50
|
Merge branch 'master' of github.com:Budibase/budibase into internal-search
|
2021-02-08 09:32:53 +00:00 |
Martin McKeaveney
|
dda087f10a
|
v0.7.6
|
2021-02-06 22:59:28 +00:00 |
Martin McKeaveney
|
d9378f1eed
|
v0.7.5
|
2021-02-06 12:43:01 +00:00 |
Martin McKeaveney
|
2b74fd887b
|
test
|
2021-02-06 12:31:12 +00:00 |
Andrew Kingston
|
fe00c66700
|
Automatically refresh data when related data changes
|
2021-02-05 16:16:41 +00:00 |
Andrew Kingston
|
06b70706e3
|
Add button action to refresh a datasource
|
2021-02-05 12:54:36 +00:00 |
Martin McKeaveney
|
5b1a2f99d6
|
merge
|
2021-02-05 11:18:37 +00:00 |
Andrew Kingston
|
44888f9bb4
|
Merge branch 'master' of github.com:Budibase/budibase into form-builder
|
2021-02-05 11:06:51 +00:00 |
Martin McKeaveney
|
cca4b93c53
|
v0.7.4
|
2021-02-05 10:59:29 +00:00 |
Martin McKeaveney
|
2cb0e35b25
|
app export with space in name
|
2021-02-05 10:55:54 +00:00 |
Andrew Kingston
|
53491c400d
|
Adding validation to forms to ensure custom fields can't be the wrong type
|
2021-02-05 10:53:25 +00:00 |
Martin McKeaveney
|
1a80b09fd0
|
v0.7.3
|
2021-02-05 09:43:45 +00:00 |
Martin McKeaveney
|
c57dee754f
|
custom columns
|
2021-02-04 23:17:49 +00:00 |
Andrew Kingston
|
7afcee9748
|
Merge branch 'form-builder' of github.com:Budibase/budibase into form-builder
|
2021-02-04 18:05:14 +00:00 |
Andrew Kingston
|
e94fb7d937
|
Update form settings to be called Schema and add custom schema option
|
2021-02-04 18:00:02 +00:00 |