1
0
Fork 0
mirror of synced 2024-08-01 11:21:41 +12:00
Commit graph

999 commits

Author SHA1 Message Date
mike12345567
cfb10ebbe2 Outputting the input record so that it can be used in later steps. 2020-09-18 17:20:19 +01:00
mike12345567
60b907054a Initial work towards async block loading, it will pull the manifest.json from a specified bucket and load packages in async when it does not have them - this will need another feature for when running in the cloud to pull all packages it doesn't currently have to the install directory (EFS). 2020-09-18 16:50:52 +01:00
Martin McKeaveney
b0aedd38ed lowercase file extension 2020-09-18 16:19:41 +01:00
mike12345567
85dcb28375 Fixing an issue where inputs from the builder send empty string when realistically it means no input. 2020-09-18 14:34:14 +01:00
mike12345567
0aa1c38878 Merge branch 'contextual-workflows' of github.com:Budibase/budibase into contextual-workflows 2020-09-18 13:52:17 +01:00
mike12345567
cba125256a Fixing an issue where any workflow would be triggered by the same type of event - now matching models. 2020-09-18 13:51:56 +01:00
Martin McKeaveney
319fcabaa5 removing delete functionality - not necessary 2020-09-18 12:41:39 +01:00
Martin McKeaveney
14283a7b96 return processed file sizes 2020-09-18 11:01:39 +01:00
Andrew Kingston
6c4cf24a94 Fix filter workflow block tagline 2020-09-17 17:49:57 +01:00
Martin McKeaveney
5d3867558a merge with master 2020-09-17 16:40:09 +01:00
Martin McKeaveney
5150288e85 more lint 2020-09-17 16:38:33 +01:00
Martin McKeaveney
bb2058a010 lint 2020-09-17 16:36:39 +01:00
mike12345567
53bbcd9928 Fixing an issue with deletion action. 2020-09-17 16:28:48 +01:00
mike12345567
22ef6eb4d3 Some fixes after playing around with the new Builder UI. 2020-09-17 16:16:05 +01:00
Andrew Kingston
2287675c79 Merge branch 'contextual-workflows' of github.com:Budibase/budibase into contextual-workflows 2020-09-17 15:15:54 +01:00
mike12345567
dd0cffc226 Making the trigger endpoint detect if the trigger should have a model input and faking any properties that don't exist if required - this behaviour overridden by inputs from external client. 2020-09-17 15:14:08 +01:00
Martin McKeaveney
9032738ae8 delete local file upload when file deleted 2020-09-17 15:08:28 +01:00
Andrew Kingston
a1f52b733b Update save record block definition 2020-09-17 14:04:13 +01:00
mike12345567
be67eaf9c8 Updating testcase to now trigger a proper workflow and check that it operates as expected. 2020-09-17 13:36:19 +01:00
Martin McKeaveney
494e04f19f allow deletion of images 2020-09-17 12:45:28 +01:00
mike12345567
8477ad8727 Changing how default inputs for workflow definitions are handled and providing pretty print options for enums. 2020-09-17 12:44:59 +01:00
mike12345567
ec265f6821 Update to improve test cases and get JOI to work as expected. 2020-09-16 19:25:52 +01:00
Andrew Kingston
15e3b48f0a Remove full stop in email workflow block description 2020-09-16 15:39:19 +01:00
mike12345567
0c1ff2fd70 Fixing a circular dependency that meant a utilities enumerations could not be used until full system initialisation, exporting enums earlier and commenting. 2020-09-16 14:58:30 +01:00
mike12345567
1ab787afd7 Updating file structure so that each built in step has its own file containing the definition and the function of it, with the intention of keeping definitions together as they will be handled in the async actions. 2020-09-16 14:00:04 +01:00
Andrew Kingston
4fed6c05d3 Make filter condition human readable since they're just strings 2020-09-16 13:54:56 +01:00
Andrew Kingston
fdca9240e9 Fixing definition for filter workflow block 2020-09-16 13:54:27 +01:00
Martin McKeaveney
b1dbc7cc62 Dropzone styling 2020-09-16 12:18:47 +01:00
mike12345567
cb1ff4ac3b Updating definitions to remove the use of the fat model object in workflows and make sure the record structure is common where-ever it is used (as an input or as a trigger output). 2020-09-16 11:20:00 +01:00
Martin McKeaveney
86ae8d038a file attachments and processing working, basic design for dropzone 2020-09-15 16:22:13 +01:00
mike12345567
4625b7a97e Updating block definitions to use pure JSON schema so that it can be used for easy validation. 2020-09-15 15:52:38 +01:00
Andrew Kingston
79c4d1ed65 Update workflow block definitions 2020-09-15 14:45:37 +01:00
mike12345567
e2791d832b This is a breaking change, it updates the block definitions to work with the new structure of inputs and outputs. 2020-09-15 14:27:23 +01:00
Michael Drury
0d2f7759ee
Merge pull request #607 from Budibase/server-workflows
Server workflows
2020-09-15 09:09:55 +01:00
Martin McKeaveney
b1725ec541 v0.1.21 2020-09-14 17:11:47 +01:00
Martin McKeaveney
d414e84748 v0.1.20 2020-09-14 16:26:18 +01:00
Martin McKeaveney
8cd5076f96 lint 2020-09-14 15:41:20 +01:00
Martin McKeaveney
72e3070ad2 update view schema when table updated 2020-09-14 15:40:45 +01:00
mike12345567
b1a8837c0c Adding new API endpoint which provides all definitions in one. 2020-09-14 15:34:09 +01:00
Andrew Kingston
76cfb5062d Revert formatting to 80 print width 2020-09-14 14:35:03 +01:00
mike12345567
c4683a3743 Updating some test cases which were failing silently and changing how environment want handled. 2020-09-14 14:32:20 +01:00
Andrew Kingston
62d02c64c9 Merge branch 'server-workflows' of github.com:Budibase/budibase into server-workflows 2020-09-14 11:53:19 +01:00
mike12345567
5c94210d72 Adding delete record for when we build in contextual awareness. 2020-09-14 11:47:52 +01:00
Andrew Kingston
24c9042824 Remove params from delete record workflow action as it is only a placeholder 2020-09-14 11:46:50 +01:00
Andrew Kingston
4391b94b54 Merge branch 'server-workflows' of github.com:Budibase/budibase into server-workflows 2020-09-14 10:34:36 +01:00
mike12345567
535c4ca5aa Making worker thread decision based on environment variable (BUDIBASE_ENVIRONMENT) and some general tidy up, as well as fixing delete event emitter 2020-09-14 10:30:35 +01:00
Andrew Kingston
b1b8061c3e Merge in master 2020-09-14 10:16:09 +01:00
Andrew Kingston
d13a597ed2 Fix external workflow triggers not passing though instance ID 2020-09-14 09:12:17 +01:00
Andrew Kingston
9467c5562e Merge branch 'server-workflows' of github.com:Budibase/budibase into server-workflows 2020-09-11 21:33:05 +01:00
Michael Shanks
f975237417 stop coercing values on the server - do on client instead 2020-09-11 21:24:52 +01:00
mike12345567
5067d93030 Adding threading for when not running against PouchDB. 2020-09-11 18:47:22 +01:00
Martin McKeaveney
65f5f358d0 attachments 2020-09-11 15:09:56 +01:00
Andrew Kingston
0b3ed7435e Fix workflow filter logic block tagline 2020-09-11 14:46:22 +01:00
Michael Shanks
3696d4b077 fixing some broken tests 2020-09-11 09:29:23 +01:00
Michael Shanks
95da4c8d2c Merge branch 'master' into event-panel + binding fixes 2020-09-10 21:55:04 +01:00
Michael Shanks
14aa33705f events hooked up and working 2020-09-10 21:11:05 +01:00
mike12345567
ad48b9fdd2 Adding joi validation to the workflow update and create to make sure structure is adhered to, this is built through a curried middleware, to validate on headers, body etc add multiple different validator middlewares to your endpoint. 2020-09-10 17:46:34 +01:00
Andrew Kingston
9d83e6002f Fix create user workflow action 2020-09-10 16:46:58 +01:00
Andrew Kingston
7749919e62 Fix record created trigger workflow block description 2020-09-10 15:29:35 +01:00
Andrew Kingston
1729d0ac5c Fix async loading of steps 2020-09-10 15:29:01 +01:00
mike12345567
77f32c8a0f Major update to server workflow backend, implementing a very basic queue API in between triggers and orchestration and then moving everything around to keep it generally more concise, creating a directory to handle all workflow related matters as they do not pertain to the API (running of workflows is a completely separate operation). 2020-09-10 15:00:21 +01:00
mike12345567
9c20dba77b Merge branch 'server-workflows' of https://github.com/Budibase/budibase into server-workflows 2020-09-10 11:44:59 +01:00
mike12345567
6cf1e45eea Merge branch 'master' of https://github.com/Budibase/budibase into server-workflows 2020-09-10 11:44:33 +01:00
Andrew Kingston
20dfc87ab2 Add all workflow blocks to server and remove concept of workflow environment 2020-09-10 11:29:35 +01:00
mike12345567
79cb0c522f Implementing the block definitions as list APIs for the workflow, meaning client has to retrieve structure from API instead of inherently knowing it. 2020-09-10 11:06:13 +01:00
Michael Shanks
25d8f9a8f8 added PATCH record route 2020-09-10 09:36:14 +01:00
Martin McKeaveney
b605d25a4d lint, using bbui component 2020-09-09 16:27:46 +01:00
Martin McKeaveney
bb5d522124 tidy up 2020-09-09 13:45:47 +01:00
Martin McKeaveney
e6840bcffc custom flatpickr styling, tidy up 2020-09-09 13:44:36 +01:00
Martin McKeaveney
fc923cb883 using flatpickr, rollup config for CSS in the builder 2020-09-09 12:06:04 +01:00
Martin McKeaveney
068bb3c500 date field working with HTML5 inputs. Needs more sophisticated parsing 2020-09-08 18:03:41 +01:00
Conor Mack
075866f4ad viewBuilder.spec fix 2020-09-04 11:01:27 +01:00
Conor Mack
e4dd6fd137 Cypress Test Fix - createView.spec.js 2020-09-04 10:53:13 +01:00
Conor Mack
34a19ffda2 Update jest tests - viewbuilder 2020-09-03 15:32:15 +01:00
Conor Mack
89e3ddcab8 Merging with master and fixing conflicts 2020-09-03 15:12:07 +01:00
Martin McKeaveney
7c27957b1b
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
dependabot[bot]
4b0463cf45
Bump bl from 4.0.2 to 4.0.3 in /packages/server
Bumps [bl](https://github.com/rvagg/bl) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/rvagg/bl/releases)
- [Commits](https://github.com/rvagg/bl/compare/v4.0.2...v4.0.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-02 15:54:50 +00:00
cmack
6865fdfb28 Single Calculation Views When Not Grouped 2020-09-02 11:52:32 +01:00
Martin McKeaveney
1d56d9a2ce cypress tests, lint, feature complete 2020-08-24 15:48:34 +01:00
Martin McKeaveney
40bf90c745 view filters operational 2020-08-24 11:46:28 +01:00
Martin McKeaveney
6ba109222b custom filtering working, needs more test coverage 2020-08-21 17:05:26 +01:00
Martin McKeaveney
af6451c33c Merge branch 'master' of github.com:Budibase/budibase into view-filters 2020-08-21 11:41:18 +01:00
Martin McKeaveney
ae4b02cb69 v0.1.19 2020-08-21 11:31:53 +01:00
Martin McKeaveney
1b93c92277 v0.1.18 2020-08-21 10:19:54 +01:00
Martin McKeaveney
a19f370868 start of view filters 2020-08-20 16:31:43 +01:00
Martin McKeaveney
2cea4be763
Merge pull request #545 from Budibase/custom-view-backend
Custom Views
2020-08-20 14:33:48 +01:00
Martin McKeaveney
fbce2da7a3 adding deploy script to upload assets to s3 after release 2020-08-20 11:09:54 +01:00
Martin McKeaveney
0388f8dbb5 merge 2020-08-19 17:14:30 +01:00
Martin McKeaveney
70d4592fc2 fix server unit tests 2020-08-19 17:09:30 +01:00
cmack
73629a81b7 Minor Tidyup - Logs, Dead Code, Comments 2020-08-19 10:34:20 +01:00
Martin McKeaveney
7e2e90e23c tidy up and lint 2020-08-18 17:14:26 +01:00
Martin McKeaveney
d08db301af group by complete 2020-08-18 16:05:15 +01:00
Martin McKeaveney
28b4b6fcb9 deletion of views, statistics calculation popover, unit tests 2020-08-17 21:01:43 +01:00
Michael Shanks
4de8bffec2 removed unecessary dependencies 2020-08-14 17:39:56 +01:00
Martin McKeaveney
6862be744b began UI for custom views 2020-08-14 16:31:53 +01:00
Michael Shanks
3a5d2f8713 remove references to material design components 2020-08-14 11:21:52 +01:00
Martin McKeaveney
f62e7e06d8 new view foundations 2020-08-13 15:04:19 +01:00
Martin McKeaveney
3325af6462 v0.1.17 2020-08-11 15:33:01 +01:00
Martin McKeaveney
203f7d19d8 v0.1.16 2020-08-10 22:30:11 +01:00
Martin McKeaveney
77fd50ff2f v0.1.14 2020-08-10 15:36:33 +01:00
Martin McKeaveney
bbcb282e53
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
Kevin Åberg Kultalahti
deb9c48adf
Merge pull request #523 from Budibase/feature/create-app-modifications
Feature/create app modifications
2020-08-03 17:54:54 +02:00
Michael Shanks
6f851ac489 bugfix: create app pointing to hardcoded standard-components version 2020-08-03 15:28:45 +01:00
kevmodrome
667e70a706
signup flow now works correctly 2020-08-03 16:26:28 +02:00
Martin McKeaveney
284cceb9b7 v0.1.13 2020-08-03 11:45:39 +01:00
Michael Shanks
f6738cec4d
Merge pull request #464 from Budibase/dependabot/npm_and_yarn/packages/server/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19 in /packages/server
2020-08-03 11:13:35 +01:00
kevmodrome
15595d0c7c
setup sidebar 2020-07-31 10:46:23 +02:00
Martin McKeaveney
b254616dbc v0.1.12 2020-07-27 17:50:36 +01:00
Martin McKeaveney
15c35ac0ca fix typo 2020-07-27 17:48:35 +01:00
Martin McKeaveney
bf0a88f626 v0.1.11 2020-07-27 17:08:25 +01:00
Martin McKeaveney
9e978019aa lint 2020-07-27 16:12:06 +01:00
Michael Shanks
51690ed439
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
Martin McKeaveney
9db7944d04 v0.1.10 2020-07-21 17:10:59 +01:00
Michael Shanks
3b4c68163d can delete screens 2020-07-21 15:01:32 +01:00
dependabot[bot]
4a23ddcdbd
Bump lodash from 4.17.15 to 4.17.19 in /packages/server
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-21 09:31:16 +00:00
Martin McKeaveney
c4ee632d58
Merge pull request #462 from Budibase/nodemon-issue
Nodemon issue
2020-07-21 10:01:16 +01:00
Michael Shanks
d11dd74f40 dev script to replicate local dev db to remote couchDb, by appname 2020-07-17 17:02:27 +01:00
Michael Shanks
95e9615ef7 component libraries - looking in wrong dir, in dev 2020-07-17 11:13:55 +01:00
Martin McKeaveney
b9ed98c7ee lint 2020-07-16 15:40:59 +01:00
Martin McKeaveney
fe98d566eb fixing tests 2020-07-16 15:37:05 +01:00
Martin McKeaveney
4ca58ded5b lint 2020-07-16 15:19:46 +01:00
Martin McKeaveney
7714270450 nodemon delay + analytics fixes 2020-07-16 14:27:27 +01:00
Martin McKeaveney
264ade4630 lint 2020-07-15 17:27:33 +01:00
Martin McKeaveney
64d1bd5322 events for web apps built and web apps deployed 2020-07-15 17:25:08 +01:00
Martin McKeaveney
0d0ffeb530 Merge branch 'master' of github.com:Budibase/budibase 2020-07-15 13:51:33 +01:00
Martin McKeaveney
3fbf3f4826 v0.1.9 2020-07-15 13:51:21 +01:00
Martin McKeaveney
9009b675b0
Merge pull request #450 from Budibase/electron-release-docs
docs for release
2020-07-15 13:43:10 +01:00
Martin McKeaveney
c293d1e527 fixing dev path when running in electron 2020-07-15 13:42:12 +01:00
Martin McKeaveney
cc26ca03ec docs for release 2020-07-15 12:05:00 +01:00
Joe
820b9565df
Merge pull request #448 from Budibase/Map,-Icon,-Datalist-components-removed-from-UI
Map, Icon, Datalist components removed from frontend UI
2020-07-15 11:23:21 +01:00
Joe
8df53290ba Map, Icon, Datalist removed from UI 2020-07-15 11:12:43 +01:00
Martin McKeaveney
eff4fa93ca v0.1.8 2020-07-15 10:44:11 +01:00
Martin McKeaveney
915cf29b3c v0.1.7 2020-07-15 09:56:01 +01:00
Martin McKeaveney
63c5cd9af4 lint 2020-07-14 21:10:51 +01:00
Martin McKeaveney
71fc36ec7e download component libraries from NPM tarball 2020-07-14 21:07:53 +01:00
Martin McKeaveney
bc89cf4a74 formatting and tidy up 2020-07-14 16:00:58 +01:00
Martin McKeaveney
18bd05070b
Merge pull request #441 from Budibase/Welcome-screen-links-update
Welcome screen links update
2020-07-14 14:44:52 +01:00
Joe
f7aef429b0 Welcome screen links update 2020-07-14 13:02:34 +01:00
Martin McKeaveney
df0647ddf8 v0.1.6 2020-07-14 10:38:40 +01:00
Martin McKeaveney
79add29c29 posthog updates in builder 2020-07-14 10:19:21 +01:00
Martin McKeaveney
4a7edd9ebe v0.1.5 2020-07-14 09:16:53 +01:00
Martin McKeaveney
262fc9cd71 fix path when running in electron 2020-07-14 09:10:01 +01:00
Martin McKeaveney
a266952b78 v0.1.4 2020-07-14 08:23:46 +01:00
Martin McKeaveney
2be17aa162 lint 2020-07-14 08:21:22 +01:00
Martin McKeaveney
2699362f07 v0.1.3 2020-07-14 08:18:41 +01:00
Martin McKeaveney
f22f3f8eb1 fix mac perm issue 2020-07-14 08:13:05 +01:00
Michael Shanks
10b0f8c379 fix: create app failing from unknown folder copy issues 2020-07-14 07:02:46 +01:00
Martin McKeaveney
6c4f3678fb adding dialog import 2020-07-13 18:11:19 +01:00
Martin McKeaveney
f5671a716d correct electron path for budibase apps 2020-07-13 17:44:13 +01:00
Martin McKeaveney
4ae422354f Merge branch 'master' of github.com:Budibase/budibase into beta-bugfixes 2020-07-13 17:27:26 +01:00
Martin McKeaveney
9dd601c101 v0.1.2 2020-07-13 14:40:25 +01:00
Martin McKeaveney
2673acd46e beta bugfixes 2020-07-10 16:17:12 +01:00
Conor_Mack
f0251ebed6
Merge branch 'master' into colorpicker/palette-drag 2020-07-10 11:46:21 +01:00
cmack
b9e855b6cf WIP: Palette drag to set 2020-07-09 16:30:00 +01:00
Martin McKeaveney
af04b840a3 v0.1.1 2020-07-09 15:30:11 +01:00
Michael Shanks
9ebaa7e04b
Merge pull request #428 from mjashanks/master
Bugfixes and updated default application template
2020-07-09 15:18:25 +01:00
Michael Shanks
d38b1fe888 lint fix 2020-07-09 15:05:56 +01:00
Martin McKeaveney
9d5ff03465 adding icns file 2020-07-09 15:00:42 +01:00
Michael Shanks
12df137c36 Merge branch 'master' of github.com:Budibase/budibase 2020-07-09 14:55:32 +01:00
Michael Shanks
0cdc2db865 yarn lock 2020-07-09 14:54:35 +01:00
Michael Shanks
f2e5ca3b93 Default app template - added screens 2020-07-09 14:47:54 +01:00
Martin McKeaveney
a8a071da51 resize icon 2020-07-09 14:36:05 +01:00
Martin McKeaveney
fb5cfdb36b New budibase logo 2020-07-09 14:26:47 +01:00
Martin McKeaveney
deeadb46e7 pin electron version 2020-07-09 13:44:58 +01:00
Michael Shanks
b2de1ff981 Merge branch 'master' of github.com:Budibase/budibase 2020-07-09 13:12:59 +01:00
Martin McKeaveney
ab4c44a430 adding electron to dev deps 2020-07-09 11:38:07 +01:00
Martin McKeaveney
e4e053cb6f v0.1.0 2020-07-09 11:31:21 +01:00
Martin McKeaveney
67e1e77de2 tidy up 2020-07-09 11:21:42 +01:00
Martin McKeaveney
ae3454c1a4 adding couchdb env 2020-07-08 21:53:15 +01:00
Martin McKeaveney
d87a17eaec PR Comments 2020-07-08 16:31:26 +01:00
Michael Shanks
ea8849c3e6 worflow save record action broken (no ctx.user) 2020-07-08 15:12:55 +01:00
Martin McKeaveney
7b57f0ecc1 merge 2020-07-07 21:32:32 +01:00
Martin McKeaveney
3122334c35 lint 2020-07-07 21:29:20 +01:00
Michael Shanks
944d871608
Merge pull request #420 from mjashanks/bugfixes
Bugfixes from #387
2020-07-07 21:09:36 +01:00
Martin McKeaveney
2204f3589c tidy up 2020-07-07 20:17:09 +01:00
Martin McKeaveney
d6aa94b2e8 budibase complete deployment 2020-07-07 17:51:41 +01:00
kevmodrome
a85d67574a
remove som console.logs 2020-07-07 14:47:27 +02:00
kevmodrome
dc5db6f552
adds delete functionality to application 2020-07-07 14:44:05 +02:00
Martin McKeaveney
8ae6f04290 extra index template for production 2020-07-06 19:43:40 +01:00
Michael Shanks
8bc5cf564b Merge branch 'master' into bugfixes 2020-07-06 14:51:25 +01:00
Kevin Åberg Kultalahti
67ad70166e
Merge pull request #413 from Budibase/features/settings-modal-api-keys-tab
Features/settings modal api keys tab
2020-07-06 14:51:30 +02:00
Michael Shanks
877a9b1033 Login: allow edit of title & button text 2020-07-06 11:30:36 +01:00
kevmodrome
2a13abba4d
lint fixes 2020-07-06 09:07:29 +02:00
kevmodrome
b729527192
use utility to get homedir instead of manually doing it 2020-07-06 09:06:59 +02:00
Michael Shanks
c57b30efdf more understandable screenslot & default header on master screen 2020-07-03 21:48:34 +01:00
Michael Shanks
2bf5702bca #416 auto init of budibase when electron starts 2020-07-03 13:03:50 +01:00
Martin McKeaveney
5cc358e496 deployment E2E 2020-07-02 23:22:20 +01:00
Martin McKeaveney
f8593da365 Merge branch 'master' of github.com:Budibase/budibase into deployment 2020-07-02 20:52:50 +01:00
kevmodrome
acc2acddba
fetching keys now done correctly 2020-07-02 21:25:25 +02:00
kevmodrome
dc35808aea
update process.env with new value 2020-07-02 21:01:34 +02:00
kevmodrome
7a7ad75e12
adds getEnvironmentVariables function 2020-07-02 20:31:26 +02:00
kevmodrome
f6f2dfb8e4
dummy methods wired up to return values to the front-end 2020-07-02 18:38:00 +02:00
kevmodrome
aabde78c47
sets up dummy back-end 2020-07-02 17:53:09 +02:00
Joe
708ec61d0a Merge branch 'master' of https://github.com/Budibase/budibase into welcome-screen-ui-fix 2020-07-02 11:30:10 +01:00
Kevin Åberg Kultalahti
b5ae3a280a
Merge pull request #399 from Budibase/features/edit-application-info
Features/edit application info
2020-07-02 12:14:31 +02:00
Joe
8e8b0c6fb9 Welcome screen fix
Page scroll fix
Card responsiveness fix
Page spacing improved
Button color changed
2020-07-02 11:02:31 +01:00
kevmodrome
69e5086388
remove unneeded appPackage route 2020-07-02 11:30:36 +02:00
Martin McKeaveney
6907f7751f s3 awareness, authentication through API keys 2020-07-01 21:57:35 +01:00
Martin McKeaveney
7f40e89e67 Merge branch 'master' of github.com:Budibase/budibase into deployment 2020-07-01 21:42:47 +01:00
Michael Shanks
30f311eaea apply border-box globally 2020-07-01 11:28:41 +01:00
Martin McKeaveney
59c2f247a7 upload assets to s3 2020-06-29 19:15:43 +01:00
kevmodrome
f50cec4a73
lint fix 2020-06-29 17:49:16 +02:00
kevmodrome
53d8bc3be7
remove log 2020-06-29 17:21:22 +02:00
kevmodrome
4f6283eef2
adds functionality to update name and description of app 2020-06-29 17:18:43 +02:00
Kevin Åberg Kultalahti
6a9397ab2e
Merge pull request #369 from Budibase/feature/settings-modal
Adds a Settings modal for the BB Apps
2020-06-29 16:01:20 +02:00
kevmodrome
b8755e76d7
lint fix 2020-06-29 15:56:41 +02:00
kevmodrome
5e8909cf0e
correct put call to not remove password 😅 2020-06-29 15:55:12 +02:00
kevmodrome
3264441fca
remove console log 2020-06-29 13:24:05 +02:00
kevmodrome
9761ac21e0
fix wrong stuff coming back after updating user 2020-06-29 13:14:15 +02:00
Martin McKeaveney
b9d1b52ec7 cleaned up deploy code 2020-06-29 10:27:38 +01:00
Michael Shanks
2e576800c4 bugfix: add inter and roboto mono fonts 2020-06-29 10:16:19 +01:00
kevmodrome
19981cb223
lint fixes 2020-06-29 10:12:13 +02:00
kevmodrome
6ce9cef407
Merge remote-tracking branch 'origin' into feature/settings-modal 2020-06-29 10:08:23 +02:00
Michael Shanks
3692b92e5b merge from master 2020-06-26 15:41:42 +01:00
Martin McKeaveney
961226a63f
Merge pull request #391 from Budibase/data-model-redesign
Data model redesign
2020-06-26 10:56:07 +01:00
Conor_Mack
08524ab5d8
Merge pull request #392 from Budibase/bugfix/instance-name-login-template
Add _instanceName to login template
2020-06-26 10:35:42 +01:00
Conor_Mack
fcdfddf6da Add _instanceName to login template 2020-06-26 10:31:03 +01:00
kevmodrome
e4fc3e57d1 adds update functionality to users 2020-06-26 11:05:09 +02:00
Martin McKeaveney
e293f3f70a adding renaming test 2020-06-26 09:55:15 +01:00
Martin McKeaveney
fb382329b8 lint 2020-06-25 22:43:10 +01:00
Martin McKeaveney
63fc10e1e0 tidy up 2020-06-25 22:35:52 +01:00
Martin McKeaveney
6ef4ba086c data model rewrite 2020-06-25 22:34:38 +01:00
Martin McKeaveney
66aa2008c9 linked records matched up by name 2020-06-25 20:35:03 +01:00
Martin McKeaveney
48f3392152 record keys as names 2020-06-25 20:04:58 +01:00
Michael Shanks
8ce26a1e19 bugfix: master screen not styleable 2020-06-25 17:46:43 +01:00
Joe
d9a48e3a51 General UI fixing previous styling issues 2020-06-25 15:49:56 +01:00
Michael Shanks
be5f957f2b yarn lock 2020-06-25 10:41:07 +01:00
Michael Shanks
ec1c9c5fb8 merge from master 2020-06-24 18:05:49 +01:00
Martin McKeaveney
6cdd933d09
Merge pull request #367 from Budibase/backend-ui-update
Backend ui update
2020-06-24 17:33:22 +01:00
Martin McKeaveney
5a7fa51907 test fix 2020-06-24 17:26:14 +01:00
Michael Shanks
ef3e802fad Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-06-24 17:19:29 +01:00
Conor_Mack
9898ee0b99
Merge pull request #360 from Budibase/builder/consolidating-missing-code
Instance name fix and consolidation of code
2020-06-24 17:11:08 +01:00
Martin McKeaveney
65d0454377 merge 2020-06-24 17:02:38 +01:00
Martin McKeaveney
ee86d6fb16 update when linked field added 2020-06-24 16:56:13 +01:00
Michael Shanks
8b9c596fdc Merge branch 'master' of github.com:Budibase/budibase 2020-06-24 16:42:41 +01:00
Martin McKeaveney
f1795d51ef fix test 2020-06-24 16:32:16 +01:00
Joe
5b600c4f2b
Merge branch 'master' into Css-update-to-reflect-BBUI 2020-06-24 15:35:40 +01:00
Michael Shanks
4b801f3f37 screenslot added to Private>Master by default 2020-06-24 11:05:09 +01:00
Martin McKeaveney
3c3104be7b enable renaming of records by using IDs 2020-06-23 23:26:54 +01:00
Martin McKeaveney
c5bd314931 lint 2020-06-23 16:20:06 +01:00
Conor_Mack
6eebeb6692
Merge branch 'master' into builder/consolidating-missing-code 2020-06-23 11:21:31 +01:00
Joe
a77be47076 CSS update UI refresh
Font changed to Inter
Colors reflect BBUI
Panel background removed
2020-06-23 08:19:16 +01:00
Martin McKeaveney
6adb2a72e0 merge 2020-06-22 22:39:41 +01:00
Martin McKeaveney
1b1b804bbd bidirectional linked records 2020-06-22 21:30:23 +01:00
Michael Shanks
763e282997 #363 bugfix: page not built until prop changed 2020-06-22 21:16:51 +01:00
Michael Shanks
48d60a7183 removed ADMIN_SECRET env var (no longer needed) 2020-06-21 20:54:37 +01:00
Michael Shanks
44c8ca8b58 Merge branch 'master' into instanceid-url-removal 2020-06-19 17:22:29 +01:00
Michael Shanks
69a36895e7 codereview: looksLikeAppId as variable 2020-06-19 17:21:24 +01:00
Michael Shanks
4dcd482a4f instance Id is gone from API module 2020-06-19 17:19:30 +01:00
Michael Shanks
d7b09f5b65 removed x-user-agent 2020-06-19 16:59:46 +01:00
Michael Shanks
11e56467b8 fixing broken tests 2020-06-18 20:41:37 +01:00
Martin McKeaveney
9cdb6554a5 typo 2020-06-18 17:49:34 +01:00
Michael Shanks
bf952f8677 instanceid removal 2020-06-18 16:59:31 +01:00
Martin McKeaveney
6e187943c4 Merge branch 'master' of github.com:Budibase/budibase into backend-ui-update 2020-06-18 09:16:43 +01:00
Martin McKeaveney
987135f7b4 saving of models and fields 2020-06-16 20:29:18 +01:00
Conor_Mack
37ed95fa96
Merge branch 'master' into builder/consolidating-missing-code 2020-06-16 12:17:32 +01:00
Martin McKeaveney
5d46c572b8 lint 2020-06-15 17:08:59 +01:00
Martin McKeaveney
f70407b6eb budibase dockerfile 2020-06-15 17:06:54 +01:00
Martin McKeaveney
48f6ac2b98 structuring new backend UI 2020-06-15 16:41:31 +01:00
Conor_Mack
47d38f2a28 Lint fixes 2020-06-15 16:02:11 +01:00
Conor_Mack
8b99546326 Instance naming fix for components and screens 2020-06-15 16:01:24 +01:00
Michael Shanks
30f054090f code review - static controller - test app id with regex 2020-06-14 20:36:51 +01:00
Michael Shanks
3b506f59cb lint fix 2020-06-12 21:11:39 +01:00
Michael Shanks
6c8a0dc8f2 fixing tests - not using new auth endpoint 2020-06-12 21:08:00 +01:00
Michael Shanks
bf1da9e94e removal of appRoot - appId comes in cookie 2020-06-12 20:42:55 +01:00
Martin McKeaveney
8b3ce41ba7 update _rev for deleted test model 2020-06-11 18:11:56 +01:00
Martin McKeaveney
3f0465a892 lint 2020-06-11 17:28:19 +01:00
Martin McKeaveney
1c1ac8f1a3 remove other link fields when you delete a model 2020-06-11 17:24:09 +01:00
Martin McKeaveney
0634c5718a Merge branch 'master' of github.com:Budibase/budibase into linked-records 2020-06-11 16:22:28 +01:00
Martin McKeaveney
d2477e1b81 adding record models for brevity 2020-06-11 14:35:45 +01:00
Michael Shanks
6cb7e995a2 changed "master" databse to "clientAppLookup" 2020-06-11 10:12:01 +01:00
Michael Shanks
eddda1d675 lint fix 2020-06-10 21:41:55 +01:00
Michael Shanks
2d4321177f application supports multiple concurrent client DB 2020-06-10 21:39:30 +01:00
Martin McKeaveney
53427bcdfc
Merge pull request #327 from Budibase/fix-email
fix backend workflow
2020-06-04 14:08:11 +01:00
Martin McKeaveney
a92ab5cabb fix backend workflow 2020-06-04 13:55:52 +01:00
Joe
c5b6356219 Welcome screen ui update
UI was not very responsive before and the illustration looked basic.

Image added, button moved, card ui updated with more margin and better sizing,
2020-06-04 11:56:01 +01:00
Michael Shanks
32d1ca641b bugfix: data components hitting correct url again 2020-06-03 22:12:09 +01:00
Martin McKeaveney
fb2e873e2f fix budibase apps dir 2020-06-03 21:23:56 +01:00
Martin McKeaveney
9581bec421 fixing tests 2020-06-03 20:54:17 +01:00
Martin McKeaveney
e74c685956 lint 2020-06-03 20:44:35 +01:00
Martin McKeaveney
0482bc242c fix some other auth bugs 2020-06-03 20:35:30 +01:00
Martin McKeaveney
3d95f4cd58 fixing header in tests 2020-06-03 19:39:53 +01:00
Martin McKeaveney
07cf98b0de use custom user agent header 2020-06-03 19:35:04 +01:00
Michael Shanks
583f024754 test fixes... test didnt have user-agent 2020-06-03 17:21:49 +01:00
Michael Shanks
87f8a9c108 Merge branch 'master' of github.com:Budibase/budibase 2020-06-03 17:05:53 +01:00
Michael Shanks
47162d806b logic to not use builder:token for apps running in dev 2020-06-03 17:05:36 +01:00
Martin McKeaveney
9ec8e71624
Merge pull request #314 from Budibase/fix-dataform
fix dataform
2020-06-03 17:03:51 +01:00
Martin McKeaveney
f939d9ef13 fix dataform 2020-06-03 16:10:03 +01:00
Michael Shanks
47f80b24f7 Merge branch 'master' of github.com:Budibase/budibase 2020-06-03 15:43:53 +01:00
Michael Shanks
77a16f95da autu populated login page 2020-06-03 15:43:37 +01:00
Kevin Åberg Kultalahti
b8df2f15fb
Merge pull request #309 from Budibase/bugfix/navbar-settings
Bugfix/navbar settings
2020-06-03 14:59:35 +02:00
kevmodrome
dba1ff1de1 adds another color to Nav Bar and also adds roboto as default font in created apps 2020-06-03 14:52:18 +02:00
Martin McKeaveney
62d63051f0
Merge pull request #307 from Budibase/electron-fix
electron path fix
2020-06-03 12:42:44 +01:00
Michael Shanks
b8df49e948 Merge branch 'master' of github.com:Budibase/budibase 2020-06-03 12:30:54 +01:00
Michael Shanks
0c2d7a7c66 bugfix: links not respecting appRootPath 2020-06-03 12:30:32 +01:00
Joe
7f656bc28b Removed unused images and added new BB logo 2020-06-03 12:21:26 +01:00
Martin McKeaveney
de8010cdf5 electron path fix 2020-06-03 12:05:40 +01:00
Michael Shanks
14153a4c90 bugfix: could not set style on screen root 2020-06-02 16:18:25 +01:00
Michael Shanks
fb3ccac670 Merge branch 'master' of github.com:Budibase/budibase 2020-06-02 11:54:46 +01:00
Martin McKeaveney
d932670d7e model bugfixes 2020-06-02 11:40:33 +01:00
Michael Shanks
8d474df34e yarn lock 2020-06-02 11:26:28 +01:00
Martin McKeaveney
7137362302 tidy up, styling 2020-06-02 11:08:53 +01:00
Martin McKeaveney
9c3c38d0ac tests 2020-06-01 22:25:44 +01:00
Martin McKeaveney
ba38385d72 lint + format 2020-06-01 21:31:55 +01:00
Martin McKeaveney
aeae4f50e2 tidy up 2020-06-01 21:26:32 +01:00
Martin McKeaveney
398f200661 merge 2020-06-01 16:27:27 +01:00
Martin McKeaveney
cb1fb87d21 server side workflows 2020-06-01 16:22:13 +01:00
Martin McKeaveney
2e42f8033e workflow DAO tests 2020-06-01 11:52:15 +01:00
Martin McKeaveney
a220822e3a move workflow to array data structure 2020-06-01 10:41:28 +01:00
Michael Shanks
0115c13a39
Merge pull request #266 from mjashanks/model-validation
Model validation
2020-06-01 10:16:33 +01:00
Martin McKeaveney
dc90e141f5 server side event emitter 2020-05-31 17:12:52 +01:00
Martin McKeaveney
65d0161007 orchestrator refactor, user creation block 2020-05-30 13:41:46 +01:00
Martin McKeaveney
bba7b93b75 refactor client library 2020-05-29 14:06:36 +01:00
Michael Shanks
0f1a472b6f configurable logLevel - defaults to error 2020-05-29 14:06:25 +01:00
Martin McKeaveney
a3bebe3330 adding workflow blocks, parameter parsing, templating 2020-05-28 20:20:03 +01:00
Michael Shanks
bab7e3ed9e server side record validation 2020-05-28 15:39:29 +01:00
Michael Shanks
521501c4e6 Merge branch 'workflow-v1' of github.com:Budibase/budibase into workflow-v1 2020-05-28 09:17:49 +01:00
Michael Shanks
4eb00c1e4e removed auth on execute workflow action 2020-05-28 09:17:14 +01:00
Martin McKeaveney
08d0b9cb94 workflow UI, orhestrator for executing workflows 2020-05-27 21:51:32 +01:00
Michael Shanks
a1d83cdc4c bugfix: wrong permissions on worfklow endpoint 2020-05-27 19:18:39 +01:00
Michael Shanks
2f1fc8109b few changes from code review 2020-05-27 17:37:07 +01:00
Michael Shanks
2d69d715d0 fixing tests after dodgy merge 2020-05-27 17:29:26 +01:00
Michael Shanks
3bfe7840e4 access levels 2020-05-27 17:23:01 +01:00
kevmodrome
5c3e514fd0 fix another lint error 2020-05-27 13:53:44 +02:00
kevmodrome
aeb7c5dfc9 fix lint erorrs 2020-05-27 13:51:19 +02:00
Michael Shanks
2a8ca59b6d bugfix: create app not creating dirs 2020-05-27 10:54:34 +01:00
Martin McKeaveney
e3271bf765 Merge branch 'master' of github.com:Budibase/budibase into workflow-v1 2020-05-27 10:13:42 +01:00
Martin McKeaveney
b9a6c3ec10 workflow orchestrator 2020-05-26 21:34:01 +01:00
Michael Shanks
b7ad4de09e server - create app endpoint creates files 2020-05-26 16:29:16 +01:00
Michael Shanks
75dd1da6b5 Merge branch 'master' of github.com:Budibase/budibase 2020-05-26 11:06:45 +01:00
Joe
1c35836834 Home page UI design
The majority of HTML and CSS is complete.

Still to be done:
- Activate the create new web app button
- Activate the settings nav item
- Date modified
- Ability to rename web app and provide a description (and an auto screenshot is generated down the line)
2020-05-25 16:57:17 +01:00
Martin McKeaveney
920b47d6aa groundwork for pubsub 2020-05-24 22:54:08 +01:00
Joe
5e98c3e9cb Top nav redesign
New BB logo added, and sizing changed.
Nav items margin changed to reflect designs
Nav items color changed to reflect new simplified color scheme
Bottom border added
Nav background color changed

*Global styles is a work in progress.
2020-05-23 09:49:25 +01:00
Martin McKeaveney
21b1165463 workflow charts 2020-05-22 16:32:23 +01:00
Michael Shanks
9ae0e2e826 merge conflicts 2020-05-21 14:43:49 +01:00
Michael Shanks
1b87edc954 auth, first version, needing tested 2020-05-21 14:31:23 +01:00
Martin McKeaveney
39c894c459 workflow CRUD complete 2020-05-20 17:02:46 +01:00
Martin McKeaveney
932ef17103
Update package.json 2020-05-19 14:52:44 +01:00
kevmodrome
92a04eb415 upgrades routify to latest version 2020-05-19 15:19:32 +02:00
Martin McKeaveney
2fbc043155 electron asar 2020-05-19 14:03:46 +01:00
Martin McKeaveney
2e9bf13496
Merge pull request #241 from Budibase/further-tidy-up
Further tidy up
2020-05-18 19:18:44 +01:00
Martin McKeaveney
8d798579eb adding builder route for testing 2020-05-18 18:05:36 +01:00
Martin McKeaveney
ccbcb0af40 preloading remix, removing unused css 2020-05-18 16:37:19 +01:00
Michael Shanks
85bf8e799a Merge branch 'master' of github.com:Budibase/budibase 2020-05-18 16:34:30 +01:00
Michael Shanks
1b30903940 lint fix 2020-05-18 16:33:41 +01:00
Michael Shanks
9394a74dcd Merge branch 'master' of github.com:Budibase/budibase 2020-05-18 16:23:22 +01:00
Michael Shanks
2b48a92013 id generation in utilities module 2020-05-18 16:22:09 +01:00
Martin McKeaveney
b0644b2234 lint 2020-05-18 15:46:38 +01:00
Martin McKeaveney
2c49206af5 electron fixes 2020-05-18 15:44:52 +01:00
Martin McKeaveney
1139627bf5 pino logging, electron fixes, running integration tests in band 2020-05-18 15:33:29 +01:00
Martin McKeaveney
fd4eb56b5c brotli lint 2020-05-18 14:58:39 +01:00
Martin McKeaveney
1e7aab538d disable brotli 2020-05-18 14:36:42 +01:00
Michael Shanks
8d4faa0bf9 Merge branch 'master' of github.com:Budibase/budibase 2020-05-18 11:53:09 +01:00
Michael Shanks
52a3b4786f removing Authorization header 2020-05-18 11:53:04 +01:00
Martin McKeaveney
e244e099a6 fixing CI 2020-05-18 11:18:31 +01:00
Martin McKeaveney
c8dd48b507 formatting 2020-05-18 11:01:17 +01:00
Martin McKeaveney
e83816df1c remove debug line 2020-05-18 10:56:11 +01:00
Martin McKeaveney
815a539863 test and couchDB init code 2020-05-18 10:55:35 +01:00
Michael Shanks
468dc513a5 merge conflicts.. 2020-05-18 06:43:05 +01:00
Michael Shanks
b62449bf96 removing clientId from frontend, fixing invalid database name 2020-05-18 06:40:29 +01:00
Martin McKeaveney
03593259e8 native plist config for code signing and notarization 2020-05-16 18:19:36 +01:00
Martin McKeaveney
3e0381b524 electron script 2020-05-15 18:13:18 +01:00
Martin McKeaveney
03c5aaa0cb notarization and mac code signing through github CI 2020-05-15 16:06:53 +01:00
Martin McKeaveney
a2e8f2461a
Making budibase downloadable, configuring CI to build executable bina… (#233)
Making budibase downloadable, configuring CI to build executable bina…
2020-05-14 21:18:36 +01:00
Michael Shanks
eabcb48bba bugfix - require order causing env to load to early 2020-05-14 16:26:14 +01:00
Michael Shanks
18375a6d19 server tests in-memory and passing 2020-05-14 15:12:30 +01:00
Martin McKeaveney
947ffa326f
Merge branch 'master' into fix-dev-setup 2020-05-11 16:40:39 +01:00
Michael Shanks
6b492cbe29 bugfix - could not create more than one app 2020-05-11 16:14:31 +01:00
Martin McKeaveney
cc30913e34 fixed dev setup 2020-05-11 16:01:02 +01:00
Michael Shanks
a004aa5838 allow bb home folder to bem anywhere 2020-05-11 15:42:42 +01:00
Michael Shanks
6fac98074d server initialisation & run fixed 2020-05-11 14:50:15 +01:00
Martin McKeaveney
9ff76c799c add initialiseClientDB 2020-05-11 10:28:06 +01:00
Martin McKeaveney
5646ef1101 fixing tests 2020-05-07 22:25:27 +01:00
Martin McKeaveney
0962f102c5 data components 2020-05-07 22:15:09 +01:00
Martin McKeaveney
2ad007fce0 further simplification of server code 2020-05-07 14:04:32 +01:00
Martin McKeaveney
94b2e0f134 further tidy up and removal 2020-05-07 13:52:24 +01:00
Martin McKeaveney
85f1faeb3c client lib tests 2020-05-07 13:33:25 +01:00
Martin McKeaveney
c255883aed formatting + fixing builder tests 2020-05-07 10:53:34 +01:00
Martin McKeaveney
e55120bb62 removed core library 2020-05-06 20:49:21 +01:00
Martin McKeaveney
8f5845943a Auth working 2020-05-06 20:29:55 +01:00
Martin McKeaveney
7da95c23a3 dev setup complete 2020-05-06 12:17:15 +01:00
Martin McKeaveney
392de2efcc development setup, adding data components 2020-05-06 10:33:30 +01:00
Martin McKeaveney
2afd1cd4dd working through auth - adding user instance map 2020-05-04 18:07:03 +01:00
Martin McKeaveney
c3f68e9895 merge 2020-05-04 17:17:03 +01:00
Martin McKeaveney
2c361f3d1d apps being served correctly 2020-05-04 17:13:57 +01:00
Martin McKeaveney
427cdafeda screenslots working again 2020-05-03 11:33:20 +01:00
Martin McKeaveney
abd6da7b11 component library modules and definitions refactor - moved to backend. More routing and middleware reorganisation 2020-05-02 15:29:10 +01:00
Martin McKeaveney
c733b5bee8 access levels, actions and triggers removed. Restructuring and refactoring 2020-04-29 20:29:56 +01:00
Conor_Mack
9d7999938d Libraries for Colorpicker 2020-04-29 16:02:17 +01:00
Martin McKeaveney
588fe5ebaa clientId fetching before app load, custom views, fixed schema 2020-04-28 14:39:35 +01:00
Michael Shanks
b514bfac1b yarn initialise uses new cli 2020-04-27 08:56:51 +01:00
Michael Shanks
754d5224f1 cli - new and run handlers 2020-04-26 21:13:14 +01:00
Michael Shanks
34c6cfc53b Merge branch 'couchdb-api' of github.com:Budibase/budibase into couchdb-api 2020-04-25 08:35:50 +01:00
Michael Shanks
b88044278e cli init now working... 2020-04-25 08:35:34 +01:00
Martin McKeaveney
8e38fab727 tidy up, removing leftover indexeddb files 2020-04-24 18:10:33 +01:00
Martin McKeaveney
7ad66d455a fixing tests 2020-04-24 18:05:29 +01:00
Martin McKeaveney
120344ccae fixing tests 2020-04-24 18:05:29 +01:00
Michael Shanks
32dd1213aa remove config - .env added 2020-04-24 17:28:32 +01:00
Michael Shanks
c7bebf3e48 bugfix, create client db not passing config 2020-04-24 10:03:31 +01:00
Michael Shanks
1db38ee4d6 unsaved file :( 2020-04-24 09:57:16 +01:00