Michael Drury
|
ec89e27a8c
|
Merge branch 'develop' of github.com:Budibase/budibase into group-fixes
|
2022-09-24 17:04:31 +01:00 |
mike12345567
|
b294fdd495
|
Fixing display of user role in apps in the user management page.
|
2022-09-23 17:02:32 +01:00 |
Dean
|
e199bd410a
|
Fix to ensure licensing flags display correctly
|
2022-09-23 14:45:44 +01:00 |
mike12345567
|
fae80e8910
|
Merge branch 'develop' of github.com:Budibase/budibase into group-fixes
|
2022-09-23 14:37:50 +01:00 |
Rory Powell
|
5f9f8b1694
|
default quotaUsage in licensing store to undefined - some checks rely on this field being undefined, however in the current intialisation flow it is always set to the full object by the time the inspections are made. set to undefined for additional safety
|
2022-09-23 13:30:47 +01:00 |
Andrew Kingston
|
9b02286a96
|
Rename some usages of feature flags to tenant feature flags
|
2022-09-23 12:13:15 +01:00 |
Rory Powell
|
33719ef27e
|
Update group upgrade UX
|
2022-09-23 11:40:19 +01:00 |
mike12345567
|
9b29bd6709
|
Merge branch 'develop' of github.com:Budibase/budibase into group-fixes
|
2022-09-22 18:44:16 +01:00 |
mike12345567
|
31208b1f8f
|
Renaming function to more accurately reflect its group app ID lookup purpose.
|
2022-09-22 13:57:44 +01:00 |
mike12345567
|
25b8f0ca3b
|
Updating group types to accurately reflect the state of the documents, as well as centralising the logic for getting the app IDs in a group.
|
2022-09-22 13:55:52 +01:00 |
mike12345567
|
6247f686e8
|
Adding group app cleanup.
|
2022-09-21 23:12:38 +01:00 |
mike12345567
|
7406086c12
|
Switching over app role assignment to use the new backend rather than being performed in the frontend.
|
2022-09-21 22:58:06 +01:00 |
mike12345567
|
4d9de7f658
|
Updates to use new backend API for adding/removing users from groups.
|
2022-09-21 16:58:47 +01:00 |
Peter Clement
|
0443cca321
|
Fix error when plugin is added
|
2022-09-21 16:19:07 +01:00 |
mike12345567
|
e6c91b6f8e
|
Adding group cleanup, removing group IDs from users when group is deleted.
|
2022-09-21 12:43:09 +01:00 |
mike12345567
|
34771e1ef7
|
Updates to improve the view development experience.
|
2022-09-20 19:12:48 +01:00 |
Rory Powell
|
f699bf1b56
|
Wrap licensing banners and modals in feature flag, disable logo
|
2022-09-20 10:15:28 +01:00 |
mike12345567
|
1be71933ca
|
Merge branch 'develop' of github.com:Budibase/budibase into group-fixes
|
2022-09-16 17:02:08 +01:00 |
mike12345567
|
ee40819c9e
|
Merge branch 'master' of github.com:Budibase/budibase into develop
|
2022-09-16 16:13:20 +01:00 |
mike12345567
|
7736acd0c0
|
PR comments, removing console logs, as well as trying to get jest tests working in builder.
|
2022-09-15 22:47:37 +01:00 |
Rory Powell
|
f7fa9969f4
|
Fixes
|
2022-09-15 11:59:46 +01:00 |
Dean
|
f0f222f9ea
|
Merge branch 'feature/day-pass-pricing' of github.com:Budibase/budibase into feature/day-pass-pricing
|
2022-09-15 09:06:48 +01:00 |
Dean
|
132f347916
|
Apps Page update to hide apps when sessions are maxed. General refactoring and updates to the licensing notification flows.
|
2022-09-14 18:04:58 +01:00 |
Dean
|
60feccaac0
|
Merge commit
|
2022-09-13 11:52:31 +01:00 |
melohagan
|
abdb156559
|
Merge pull request #7333 from Budibase/feature/select-tables-to-fetch
Allow list of named tables to be fetched
|
2022-09-13 11:19:49 +01:00 |
mike12345567
|
30817751ad
|
Updating plugin backend, refactoring a bit, correctly allowing a set of headers to be used for a URL.
|
2022-09-12 19:12:05 +01:00 |
mike12345567
|
e7cfdd4fde
|
Updating add/delete process to have better notifications, removing some errors.
|
2022-09-12 17:43:13 +01:00 |
mike12345567
|
f6e5524b07
|
Refactoring some plugin adding work - changing how source is specified to remove lower casing.
|
2022-09-12 17:04:27 +01:00 |
Peter Clement
|
0ebe0b8275
|
remove verify and fix deletion bug
|
2022-09-07 16:08:29 +01:00 |
Peter Clement
|
43dbf96f47
|
add update modal
|
2022-09-07 13:51:14 +01:00 |
Peter Clement
|
e6f127c33f
|
update upload request to handle source correctly
|
2022-09-06 10:37:49 +01:00 |
Peter Clement
|
cb4b918e5a
|
remove name selection from UI
|
2022-09-05 11:27:43 +01:00 |
NEOLPAR
|
7d8940f0cb
|
Merge branch 'plugins-dev-experience' into feature/plugin-management-ui
|
2022-09-05 09:38:24 +01:00 |
NEOLPAR
|
54eed13541
|
create plugin github public and private
|
2022-09-01 20:04:45 +01:00 |
Dean
|
1a6d50008e
|
Merge branch 'feature/day-pass-pricing' of github.com:Budibase/budibase into feature/day-pass-pricing
|
2022-09-01 15:33:16 +01:00 |
Dean
|
16a505a36f
|
Merge commit
|
2022-09-01 15:30:04 +01:00 |
NEOLPAR
|
6daa49927e
|
plugins npm and url working
|
2022-08-31 17:53:00 +01:00 |
NEOLPAR
|
0e2a86460c
|
uploading npm and url plugins
|
2022-08-31 16:09:47 +01:00 |
NEOLPAR
|
e5446d2f8a
|
plugin create npm
|
2022-08-30 21:37:08 +01:00 |
Peter Clement
|
a8eb172953
|
lint
|
2022-08-30 10:50:25 +01:00 |
Peter Clement
|
b9b8d59005
|
add plugins ui
|
2022-08-30 10:49:19 +01:00 |
Rory Powell
|
5c7869d21d
|
Update user deletion UI
|
2022-08-25 23:28:54 +01:00 |
Rory Powell
|
0d396c326e
|
Update user creation UI
|
2022-08-25 22:56:58 +01:00 |
Mel O'Hagan
|
fb51090752
|
Allow list of named tables to be fetched
|
2022-08-17 18:16:11 +01:00 |
Rory Powell
|
a5db53c539
|
Disable pageview event
|
2022-08-08 12:28:39 +01:00 |
Rory Powell
|
cc9bc937b6
|
Reduce event frequency
|
2022-08-08 10:47:39 +01:00 |
Andrew Kingston
|
136bb5742f
|
Fix multiple issues in user details page
|
2022-08-04 15:33:51 +01:00 |
Andrew Kingston
|
19b8271c1b
|
Navigate to group upon creation
|
2022-08-04 11:31:06 +01:00 |
Andrew Kingston
|
24fdef92b4
|
Fix issue when using an invalid group ID in url
|
2022-08-04 11:28:55 +01:00 |
Andrew Kingston
|
c2fb17e948
|
Fix users invited by email not being able to take priveleged roles
|
2022-08-03 15:16:26 +01:00 |
Andrew Kingston
|
96e239c66c
|
Prevent showing any mention of groups when groups are not enabled both the platform and license level
|
2022-08-02 20:03:39 +01:00 |
Peter Clement
|
8a77aca540
|
more efficient fetching of total users per app
|
2022-07-29 13:10:00 +01:00 |
Peter Clement
|
25d13d4a72
|
move bulk update / delete functionality out of controller
|
2022-07-25 16:58:30 +01:00 |
Peter Clement
|
dd34282a33
|
2nd fix for multi tenancy groups
|
2022-07-22 10:56:16 +01:00 |
Peter Clement
|
723bbd65e4
|
fixing bug on multi tenant environment
|
2022-07-22 10:12:16 +01:00 |
Peter Clement
|
88f1db74b7
|
updating license check to search for feature
|
2022-07-21 09:52:01 +01:00 |
Peter Clement
|
ba74fa9500
|
update handling of group roles
|
2022-07-19 14:20:57 +01:00 |
Peter Clement
|
ca41e88045
|
Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab
|
2022-07-19 11:23:31 +01:00 |
Martin McKeaveney
|
b5c712bb8a
|
only add account portal people to intercom
|
2022-07-15 10:26:41 +01:00 |
Martin McKeaveney
|
0975fa6413
|
only show intercom in cloud
|
2022-07-15 09:32:46 +01:00 |
Peter Clement
|
8034b85db3
|
Merge branch 'feat/user-groups-tab' of github.com:Budibase/budibase into feat/user-groups-tab
|
2022-07-14 16:58:41 +01:00 |
Peter Clement
|
e5931d6fec
|
update groups doc to take a roles object
|
2022-07-14 16:58:32 +01:00 |
NEOLPAR
|
afee19c361
|
changing user roles from users table
|
2022-07-14 16:55:19 +01:00 |
Peter Clement
|
819ce4e360
|
Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab
|
2022-07-14 13:32:51 +01:00 |
Peter Clement
|
eadac09e1e
|
tidy up
|
2022-07-14 10:01:26 +01:00 |
Peter Clement
|
10e046d8a2
|
Merge branch 'feat/user-groups-tab' of github.com:Budibase/budibase into feat/user-groups-tab
|
2022-07-14 09:19:08 +01:00 |
NEOLPAR
|
6b83fcb8d9
|
fixed duplicating users in user creation frontend
|
2022-07-13 17:12:44 +01:00 |
Peter Clement
|
f980d55af3
|
some user table fixes
|
2022-07-13 15:46:10 +01:00 |
mike12345567
|
22d2e41f7b
|
Allowing query backend to attempt to convert types in returned JSON to build a better base schema.
|
2022-07-13 10:53:50 +01:00 |
Peter Clement
|
eff78240a6
|
improve performance of adding users and groups
|
2022-07-11 15:29:39 +01:00 |
Andrew Kingston
|
16116f2877
|
Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui
|
2022-07-11 10:33:50 +01:00 |
Peter Clement
|
2399dbceb9
|
linting and tidy
|
2022-07-07 08:55:32 +01:00 |
Peter Clement
|
f2139df344
|
Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab
|
2022-07-06 16:30:24 +01:00 |
Peter Clement
|
93f11584df
|
access tab refreshing correctly
|
2022-07-06 14:30:15 +01:00 |
Peter Clement
|
8489ae36a4
|
take into account pagination
|
2022-07-06 12:58:55 +01:00 |
Peter Clement
|
6df456411f
|
fixing users api references
|
2022-07-06 08:45:22 +01:00 |
mike12345567
|
48975be041
|
Merge branch 'master' of github.com:Budibase/budibase into develop
|
2022-07-05 17:37:04 +01:00 |
Peter Clement
|
00ef0e3ef9
|
Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab
|
2022-07-05 16:04:01 +01:00 |
Peter Clement
|
3de2123dc4
|
group / user app assignment
|
2022-07-05 09:21:59 +01:00 |
Martin McKeaveney
|
889a8a2882
|
filter out non-admins in intercom
|
2022-07-04 12:51:38 +01:00 |
Martin McKeaveney
|
836af2ffbe
|
Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui
|
2022-07-01 00:34:50 +01:00 |
mike12345567
|
1efd77c790
|
Updating to maintain the old worker API for deprecation purposes, but removing from frontend usage.
|
2022-06-30 16:01:14 +01:00 |
mike12345567
|
062d834950
|
Updating user page to search through the backend and building a basic pagination store that can be used for it.
|
2022-06-30 15:39:26 +01:00 |
Martin McKeaveney
|
385004ca1c
|
cherry pick new ui from develop
|
2022-06-30 12:52:07 +01:00 |
mike12345567
|
98c486655b
|
Adding user pagination, removing usages of the global user list from builder and replacing with direct user lookups where possible, still need to apply filtering to username/email serverside.
|
2022-06-29 19:11:00 +01:00 |
Martin McKeaveney
|
251520bcd1
|
adding types
|
2022-06-28 12:16:23 +01:00 |
Peter Clement
|
f28186e75c
|
user table updates
|
2022-06-24 14:41:52 +01:00 |
Peter Clement
|
d952b9a3bb
|
updated store and finished groups tab
|
2022-06-22 13:55:31 +01:00 |
Peter Clement
|
b7cc71a623
|
saving and fetching groups from couch
|
2022-06-15 16:51:30 +01:00 |
Andrew Kingston
|
b5d635c83f
|
Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui
|
2022-06-15 15:32:33 +01:00 |
Martin McKeaveney
|
02320c0ee0
|
Beta tab initial test for E2E, needs styled
|
2022-06-08 10:20:47 +01:00 |
Rory Powell
|
6fbb5afeec
|
Remove ui events except for component created and view published app
|
2022-06-06 12:51:22 +01:00 |
Rory Powell
|
33f44f6ee7
|
Remove todos
|
2022-06-06 11:11:13 +01:00 |
Martin McKeaveney
|
dabbab4c83
|
rough implementation
|
2022-06-03 12:50:38 +01:00 |
Andrew Kingston
|
fcf682b827
|
Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui
|
2022-05-23 11:54:24 +01:00 |
Rory Powell
|
70fff5c7b9
|
Merge branch 'develop' into feature/posthog-v2
|
2022-05-23 09:04:00 +01:00 |
mike12345567
|
b24a108d80
|
Porting UI, still needs testing.
|
2022-05-16 18:13:59 +01:00 |
Andrew Kingston
|
316d5d682f
|
Improve role colours and ordering
|
2022-05-10 14:02:00 +01:00 |
Rory Powell
|
e4257f1e04
|
Merge branch 'develop' into feature/posthog-v2
|
2022-05-05 08:47:06 +01:00 |
Mel O'Hagan
|
696d1714f6
|
Refetch the admin checklist on SMTP config save
|
2022-05-03 10:36:50 +01:00 |
Rory Powell
|
3e5e95a9c1
|
Add analytics to backend-core. Update server posthog usage
|
2022-03-25 13:04:34 +00:00 |
Rory Powell
|
b77234b8ce
|
Merge branch 'develop' into labday/status-banner
|
2022-03-09 21:39:30 +00:00 |
mike12345567
|
eec65930f4
|
Fixing an issue with the tables store, some calls depended on the fetch returning the table list.
|
2022-03-09 11:22:02 +00:00 |
Rory Powell
|
7151c86224
|
Merge branch 'develop' into labday/status-banner
|
2022-03-08 16:31:07 +00:00 |
mike12345567
|
fa41548e13
|
Merge branch 'develop' of github.com:Budibase/budibase into feature/budibase-api
|
2022-03-01 18:43:52 +00:00 |
Rory Powell
|
c1a2836dd1
|
Fix REST Import
|
2022-03-01 07:36:47 +00:00 |
mike12345567
|
4086c8f439
|
Fixes for review comments.
|
2022-02-28 18:39:05 +00:00 |
Rory Powell
|
9e0a10955a
|
Add status banner that reacts to cypress healthcheck failures
|
2022-02-24 14:41:24 +00:00 |
mike12345567
|
6cbf186ead
|
Merge branch 'develop' of github.com:Budibase/budibase into feature/budibase-api
|
2022-02-21 14:34:06 +00:00 |
mike12345567
|
e5289ddcee
|
Fixing #4522 - frontend-core refactor changed how some of these endpoints were used.
|
2022-02-16 13:13:40 +00:00 |
mike12345567
|
594cb77b1e
|
Getting api key/dev info docs setup and in use.
|
2022-02-10 19:06:49 +00:00 |
Michael Drury
|
911f2780ef
|
Start of API key modal.
|
2022-02-09 20:30:52 +00:00 |
Andrew Kingston
|
de12e0dc79
|
Merge branch 'develop' of github.com:Budibase/budibase into frontend-core
|
2022-02-01 16:46:00 +00:00 |
Rory Powell
|
bdc37b6ff7
|
Fix CSRF token not present using local auth
|
2022-01-31 11:07:54 +00:00 |
Andrew Kingston
|
45547f1efc
|
Improve handling of 403 logouts and return URL cookie
|
2022-01-25 15:28:31 +00:00 |
Andrew Kingston
|
e1a1d47238
|
Don't show an error if analytics fails to activate
|
2022-01-24 18:58:22 +00:00 |
Andrew Kingston
|
db3b4c0b8c
|
Update remaining builder stores to use new core API and handle errors properly
|
2022-01-24 14:32:27 +00:00 |
Andrew Kingston
|
453386696f
|
Refactor all backend stores and their usages to use new core API and handle errors
|
2022-01-24 12:37:22 +00:00 |
Andrew Kingston
|
f100ae42fd
|
Add more work on API refactor in builder
|
2022-01-21 09:10:59 +00:00 |
Andrew Kingston
|
6a7aed1c0d
|
Update parts of builder with core API refactor
|
2022-01-20 18:42:30 +00:00 |
Rory Powell
|
b5250ac244
|
Fix return url using cookies
|
2022-01-13 14:07:49 +00:00 |
Rory Powell
|
22407446ee
|
Navigation fixes for duplicate and delete query
|
2022-01-05 13:27:15 -05:00 |
mike12345567
|
d61cb6c037
|
Some fixes after testing dynamic variables in rest a bit more.
|
2021-12-17 14:08:48 +00:00 |
Peter Clement
|
841feac5fa
|
Merge pull request #3737 from Budibase/feature/home-screen-redesign
Home Screen Redesign
|
2021-12-15 09:47:03 +00:00 |
Peter Clement
|
d099865c3d
|
add templates store
|
2021-12-14 15:58:19 +00:00 |
Peter Clement
|
8bbcc3f0df
|
update handling of app updates
|
2021-12-14 15:30:20 +00:00 |
Peter Clement
|
14213006e0
|
add option to change icon / colour
|
2021-12-08 18:51:24 +00:00 |
Rory Powell
|
8df37dae85
|
Merge branch 'develop' into feature/rest-redesign
|
2021-12-08 12:36:12 +00:00 |
Rory Powell
|
ad52b06a75
|
Merge pull request #3644 from Budibase/rest-import
Rest import
|
2021-12-08 11:54:38 +00:00 |
Rory Powell
|
4f642a03a4
|
Refactor store actions to allow self reference
|
2021-12-08 11:01:12 +00:00 |
mike12345567
|
c0512fa242
|
Adding query save, fixing routing to handle existing rest queries, adding in full saving of enabled headers functionality, fixing various issues discovered while testing.
|
2021-12-07 18:24:10 +00:00 |
Rory Powell
|
52ea1fe1da
|
Duplicate queries
|
2021-12-07 12:26:00 +00:00 |
mike12345567
|
5936fe0f5f
|
Adding all response capabilities.
|
2021-12-06 17:39:51 +00:00 |
Rory Powell
|
224516787d
|
Merge + Linting
|
2021-12-02 14:54:47 +00:00 |
Rory Powell
|
c421499a46
|
cURL import working
|
2021-11-29 17:21:30 +00:00 |
Rory Powell
|
c53f5e3d2b
|
Update backend to be extensible for different import sources
|
2021-11-29 10:37:31 +00:00 |
mike12345567
|
5e9f3969c9
|
Fixing a few issues that became obvious when I was looking at examples of what gets sent to the API for table saving.
|
2021-11-26 14:14:53 +00:00 |
Rory Powell
|
71ba024974
|
WIP: Rest API import
|
2021-11-25 17:14:07 +00:00 |
mike12345567
|
9336ae5826
|
Updating test case to mock response value.
|
2021-11-24 15:10:52 +00:00 |
mike12345567
|
f959ea0add
|
Adding more error tracking around column creation, to reduce confusion/users not understanding required settings.
|
2021-11-24 14:55:14 +00:00 |
mike12345567
|
ea0000df51
|
Updating UI to have a table/column deletion check which makes sure the user understands what they are doing, also disabling external table deletion.
|
2021-11-22 15:26:24 +00:00 |
Michael Drury
|
a726d158b8
|
Merge pull request #3338 from Budibase/feature/query-rbac-timeouts
Query RBAC, query and automation threading/timeouts
|
2021-11-17 11:39:09 +00:00 |
Rory Powell
|
4235aba7a2
|
Merge pull request #3354 from Budibase/rory/fixes-platform-url
Fixes for google sso, cloud email url and cloud logo updates
|
2021-11-16 13:46:06 +00:00 |
Rory Powell
|
6af8ab2dc0
|
Fixes for google sso, cloud email url and cloud logo updates
|
2021-11-12 13:31:55 +00:00 |
mike12345567
|
599702bfe9
|
Fixing issue where deleted datasources wouldn't clear out queries.
|
2021-11-11 17:13:35 +00:00 |
mike12345567
|
5c8670c7f4
|
Merge branch 'develop' of github.com:Budibase/budibase into feature/query-rbac-timeouts
|
2021-11-11 13:50:42 +00:00 |
mike12345567
|
dc8d0aa533
|
Merge branch 'master' of github.com:Budibase/budibase into develop
|
2021-11-11 13:48:07 +00:00 |
Martin McKeaveney
|
aae287e6e8
|
track pageviews in PH, add job role and company size into intercom
|
2021-11-10 19:40:55 +01:00 |
mike12345567
|
c0e3505ce8
|
Fixing constants import.
|
2021-11-10 17:55:37 +00:00 |
mike12345567
|
7f055ed8dc
|
Adding a way to switch between string and options, as well as number and boolean types, this is very useful for SQL tables.
|
2021-11-10 15:01:44 +00:00 |
Martin McKeaveney
|
7cf916a00d
|
code review, simplify iframeTemplate
|
2021-11-10 12:12:33 +01:00 |
Martin McKeaveney
|
4367c9adf6
|
prevent redirect to acct portal when not necessary
|
2021-11-09 18:00:32 +01:00 |
Martin McKeaveney
|
0cc2069929
|
fixes for templates, ensured iframetemplate fires ready event
|
2021-11-09 17:40:31 +01:00 |
mike12345567
|
b3590537ba
|
Adding the ability to set a permission for data source queries.
|
2021-11-09 16:25:23 +00:00 |
mike12345567
|
6455f51d4f
|
Merge branch 'master' of github.com:Budibase/budibase into develop
|
2021-11-08 14:00:47 +00:00 |
Martin McKeaveney
|
cb5df8fe1e
|
Merge pull request #3159 from Budibase/feature/template-urls
allow opening a template directly from a URL
|
2021-11-04 14:46:18 +01:00 |
Martin McKeaveney
|
b80a93d6d5
|
cookie based approach
|
2021-11-04 14:03:18 +01:00 |
Rory Powell
|
8f2910ad32
|
Merge branch 'master' into develop
|
2021-11-03 16:24:16 +00:00 |
Rory Powell
|
fbaedd6a34
|
Fix: Prevent user updates in multi tenant mode from deleting user password. Also forward the authentication error from the backend to the login page to warn when an sso user is trying to log in with a password when one is not present
|
2021-11-03 15:04:05 +00:00 |
Martin McKeaveney
|
fa3bb8c119
|
set template URL in store instead of passing around param
|
2021-11-03 12:43:52 +01:00 |
mike12345567
|
c82cf534d8
|
Updating external table UI a bit, adding the concept of defining an existing relationship, updating the data sources UI to make it a bit less cluttered and make the creation of tables more obvious.
|
2021-11-01 21:15:46 +00:00 |
mike12345567
|
329156d6cc
|
SQL table building.
|
2021-10-28 19:39:42 +01:00 |
mike12345567
|
ce00ddcf68
|
Fixing builder jest tests.
|
2021-10-27 13:33:11 +01:00 |
mike12345567
|
ac1d6ee23e
|
Fixing #2820 - SQL system no longer includes tables without a primary key constraint and it displays an error to handle this.
|
2021-10-26 20:03:54 +01:00 |
Martin McKeaveney
|
7d5d4e5d36
|
merge with master
|
2021-10-26 14:28:49 +02:00 |
Martin McKeaveney
|
9a1807bc89
|
get company size and role into intercom
|
2021-10-25 11:00:33 +02:00 |
mike12345567
|
f18a28f0c8
|
When adding a user through the basic onboarding flow they get a temporary password, but we didn't set force password reset, meaning the user wouldn't necessarily have to change the temp password.
|
2021-10-21 17:25:29 +01:00 |
Peter Clement
|
63b0938d36
|
Don't show the create datasource popup in dev environments
|
2021-10-14 16:45:27 +01:00 |
mike12345567
|
7a26f3769d
|
Fixing some issues with cloud export/import, removing the ability to export and import your users as this was dangerous and didn't really work with passwords/SSO.
|
2021-10-08 18:21:40 +01:00 |
Martin McKeaveney
|
f6a52ad92a
|
fix intercom createdAt
|
2021-10-07 12:03:08 +01:00 |
Rory Powell
|
d63186ff8f
|
Fix email link from internal bb onboarding. Prevent account holder from being deleted
|
2021-10-04 11:30:59 +01:00 |
mike12345567
|
f8562015ac
|
Merge branch 'develop' of github.com:Budibase/budibase into feature/cloud-export
|
2021-09-30 12:22:28 +01:00 |
Andrew Kingston
|
38b32d78a8
|
Merge pull request #2790 from Budibase/data-ui-pagination
Data UI pagination and searching
|
2021-09-30 11:13:47 +01:00 |
Peter Clement
|
afa3cd53f6
|
Merge pull request #2735 from Budibase/feature/datasource-wizard
Datasource wizard
|
2021-09-30 11:05:22 +01:00 |
mike12345567
|
a0f69251c8
|
Adding the ability to run the monorepo in cloud mode without the connected account portal (login, org setting and admin creation are all available again) as well as re-working how the redirects work to massively reduce the chance of cycles which I was experiencing constantly.
|
2021-09-29 16:55:59 +01:00 |
Rory Powell
|
a299e30556
|
Respect tenant in url in UI app. Reject tenant and session mismatch
|
2021-09-29 16:41:58 +01:00 |
Andrew Kingston
|
f9c8cd8506
|
Automatically refresh data as needed when rows or columns are updated
|
2021-09-29 12:07:35 +01:00 |
Andrew Kingston
|
e4a57253fa
|
Merge branch 'develop' of github.com:Budibase/budibase into data-ui-pagination
|
2021-09-29 10:34:03 +01:00 |
Martin McKeaveney
|
402365f5b3
|
remove company size logic from the code
|
2021-09-28 17:18:56 +01:00 |
Peter Clement
|
f45638d874
|
Merge remote-tracking branch 'origin/develop' into feature/datasource-wizard
|
2021-09-28 14:26:25 +01:00 |
Peter Clement
|
1a1c0f2892
|
check tables can be fetched before saving config
|
2021-09-28 12:25:57 +01:00 |
Andrew Kingston
|
f5f8e25c9f
|
Fix huge amount of bugs with data UI state, URL parameters and state/URL sync
|
2021-09-27 18:25:19 +01:00 |
Andrew Kingston
|
ec2f727af3
|
Merge branch 'develop' of github.com:Budibase/budibase into ak-fixes
|
2021-09-23 09:18:52 +01:00 |
Martin McKeaveney
|
24837ef2f1
|
lint
|
2021-09-22 12:26:02 +01:00 |
Martin McKeaveney
|
2523d54641
|
account for user size in intercom
|
2021-09-22 09:38:32 +01:00 |
Martin McKeaveney
|
0a7512a4d9
|
changed events to constants, instantiated analytics client at right time
|
2021-09-21 20:21:15 +01:00 |
Andrew Kingston
|
16febcf3b9
|
Ensure datasource containing the currently selected table is always expanded
|
2021-09-21 17:21:25 +01:00 |
Andrew Kingston
|
a6e48194f1
|
Merge branch 'master' of github.com:Budibase/budibase into develop
|
2021-09-20 10:33:18 +01:00 |
Andrew Kingston
|
46c1aa1eb7
|
Update app ID parsing to be able to account for new tenant ID's and fix crash whenever a dev counterpart doesn't exist for a published app
|
2021-09-20 09:58:38 +01:00 |
Rory Powell
|
689065d2b8
|
Redirect to account portal login page in the cloud
|
2021-09-14 14:18:13 +01:00 |
Rory Powell
|
73981680ba
|
Replace 'sandbox' with 'cloud' in builder, reuse 'SELF_HOSTED' flag
|
2021-09-14 13:03:38 +01:00 |
Andrew Kingston
|
2f986bedf1
|
Fix bug with determining checklist progress
|
2021-09-10 08:25:30 +01:00 |
Maurits Lourens
|
1790e777cc
|
fix tests
|
2021-09-06 17:55:19 +02:00 |
Maurits Lourens
|
dafd06737c
|
add link to checklist items for direct navigation (and lint issues)
|
2021-09-06 15:16:21 +02:00 |
Martin McKeaveney
|
0cbc23dc3d
|
Revert "Filter users table out of DataSource component and NewScreenModal"
|
2021-08-26 10:11:48 +01:00 |
Maurits Lourens
|
180d857d1d
|
Filter users table out of DataSource component and NewScreenModal
|
2021-08-24 12:33:02 +02:00 |
Maurits Lourens
|
de944480da
|
update the name of the datasource
|
2021-08-17 23:57:11 +02:00 |
Peter Clement
|
e49b8236a1
|
linting
|
2021-08-12 14:27:05 +01:00 |
Peter Clement
|
3ef05e3d36
|
Add default config to admin store
|
2021-08-12 14:20:23 +01:00 |
Peter Clement
|
b2bc9a5e20
|
Add self-hosting upgrade button to builder pane
|
2021-08-12 11:51:08 +01:00 |
mike12345567
|
46ea3f3e9e
|
Revert "Merge pull request #2253 from Budibase/revert-2076-feature/multi-tenants"
This reverts commit 4834b765be , reversing
changes made to 2456e69483 .
|
2021-08-05 09:59:08 +01:00 |
Michael Drury
|
b86a6fddc9
|
Revert "Multi-tenancy/organisations"
|
2021-08-04 10:02:24 +01:00 |
Michael Drury
|
2456e69483
|
Merge pull request #2076 from Budibase/feature/multi-tenants
Multi-tenancy/organisations
|
2021-08-04 10:01:22 +01:00 |
mike12345567
|
f6d0db4c4b
|
Updating API endpoints, to include the new system one, updating hosting envoy yaml to cover these.
|
2021-08-02 12:09:03 +01:00 |
mike12345567
|
af9b0a738d
|
Fixing issues with pages reloading in weird ways.
|
2021-07-30 20:39:42 +01:00 |
Maurits Lourens
|
c9dd9594bc
|
fix lint issue
|
2021-07-28 00:09:15 +02:00 |
mike12345567
|
35f1b50511
|
Fixing an issue where you could accidentally end up on org/admin page due to the reactivity statements firing all the time.
|
2021-07-27 17:56:39 +01:00 |
Maurits Lourens
|
c84cf22129
|
rename an app
|
2021-07-27 17:34:18 +02:00 |
mike12345567
|
1d6a350311
|
Changing how flags are handled.
|
2021-07-22 16:36:21 +01:00 |
mike12345567
|
27b2a13817
|
Swapping admin -> global in worker to reduce confusion in API url naming.
|
2021-07-22 12:56:47 +01:00 |
mike12345567
|
63368fdae9
|
Adding query string functionality to skip org setup.
|
2021-07-21 18:23:49 +01:00 |
mike12345567
|
be1558e1e7
|
Adding mechanism to disable org functionality when multi-tenancy disabled.
|
2021-07-21 17:52:42 +01:00 |
mike12345567
|
b09c2d45f9
|
Linting and adding tenancy API.
|
2021-07-20 18:03:16 +01:00 |
mike12345567
|
9d89362af1
|
Fixing some issues discovered with logging in.
|
2021-07-20 17:46:41 +01:00 |
mike12345567
|
129ff3fef2
|
Merge branch 'develop' of github.com:Budibase/budibase into feature/multi-tenants
|
2021-07-20 15:56:12 +01:00 |
mike12345567
|
83db31f899
|
A lot of general fixes around getting logged in, setting up users etc.
|
2021-07-19 19:00:53 +01:00 |
mike12345567
|
d6ae82e719
|
Linting.
|
2021-07-16 18:26:17 +01:00 |
mike12345567
|
d157285918
|
Adding organisation page.
|
2021-07-16 18:24:32 +01:00 |
mike12345567
|
f3156fca06
|
Further work, tenancy now working but some more work to be done.
|
2021-07-16 18:04:49 +01:00 |
mike12345567
|
b7995dd61d
|
Updating auth to utilise the tenant system.
|
2021-07-16 15:08:58 +01:00 |
Peter Clement
|
8297d058b5
|
More error handling around config saving
|
2021-07-16 14:07:48 +01:00 |
Peter Clement
|
70ab4e4dc5
|
add new logic to support oauth and oidc buttons
|
2021-07-15 15:49:10 +01:00 |
Peter Clement
|
9dd05ec96e
|
Add UUID to each oidc config to distinguish each provider
|
2021-07-13 15:52:21 +01:00 |
Peter Clement
|
af792cc09e
|
improve structure of OIDC config
|
2021-07-13 14:55:14 +01:00 |
Peter Clement
|
5a86d6bb6d
|
Linting and Optimisation
|
2021-07-09 15:05:39 +01:00 |
mike12345567
|
61d810edfe
|
Implementing feature #1700 and making it possible to remove logo.
|
2021-06-21 18:01:25 +01:00 |
Martin McKeaveney
|
0399e15ef0
|
refetch rows when row created
|
2021-06-21 11:10:46 +01:00 |
mike12345567
|
40e06cc5d1
|
Formatting and fixing an issue with mysql not being able to return a row that it has created, updated or deleted.
|
2021-06-18 13:14:45 +01:00 |
Martin McKeaveney
|
dd4ed9b69d
|
tidy up, fix UI tests
|
2021-06-17 14:45:08 +01:00 |
Martin McKeaveney
|
08b74d2cec
|
lint
|
2021-06-17 14:06:31 +01:00 |
Martin McKeaveney
|
a7029017b0
|
table, view, datasource selection logic
|
2021-06-17 13:57:27 +01:00 |
Martin McKeaveney
|
2737949602
|
Merge branch 'feature/opinionated-sql' of github.com:Budibase/budibase into feature/opinionated-sql
|
2021-06-16 23:27:47 +01:00 |
Martin McKeaveney
|
9841a74e39
|
datasource selection logic - unselect other entities when choosing datasource
|
2021-06-16 23:27:38 +01:00 |
mike12345567
|
615b207fbb
|
Formatting.
|
2021-06-16 18:39:59 +01:00 |
Martin McKeaveney
|
9e41068a5d
|
end to end data providers and opinionated sql
|
2021-06-16 17:50:22 +01:00 |
Martin McKeaveney
|
ba09f2df4b
|
consolidate postgres datas sources
|
2021-06-16 15:45:57 +01:00 |
mike12345567
|
6733b61b78
|
Merge branch 'master' of github.com:Budibase/budibase into feature/opinionated-sql
|
2021-06-16 14:13:57 +01:00 |
Martin McKeaveney
|
e3cced9d97
|
consolidate data sources and queries together in one UI
|
2021-06-15 19:48:05 +01:00 |
Andrew Kingston
|
32a3c2bbb6
|
Lint with prettier
|
2021-06-15 19:39:40 +01:00 |
Martin McKeaveney
|
de279fa6a9
|
removing _all concept for tables, more work on plus datasource
|
2021-06-15 13:32:11 +01:00 |
Martin McKeaveney
|
114eac4134
|
external/internal tables and datasources merged, removed autocapture, re-added logout action
|
2021-06-11 17:52:08 +01:00 |
Michael Drury
|
81a9a40a18
|
Merge pull request #1558 from Budibase/fix/cypress-fixes
Fix/Update Cypress test cases
|
2021-06-07 17:16:37 +01:00 |
Martin McKeaveney
|
e4febf1ad0
|
fix rbac for tables
|
2021-06-07 14:29:06 +01:00 |
mike12345567
|
781bd7bab6
|
Fixing internal table issues and updating createTable cypress test case.
|
2021-06-02 12:32:07 +01:00 |
mike12345567
|
18dd7322e4
|
Updating system to allow setting builder/admin as a toggle during the invitation phase of a user.
|
2021-05-24 18:45:43 +01:00 |
Andrew Kingston
|
9ea9b83fee
|
Add real Budibase space logo as the default logo
|
2021-05-24 16:19:29 +01:00 |
Andrew Kingston
|
514d74a7aa
|
Remove console.log
|
2021-05-24 12:45:09 +01:00 |
mike12345567
|
59de40c4ef
|
Formatting and adding routing checks to push the user out of admin menus when they are not an admin.
|
2021-05-21 17:12:25 +01:00 |
Andrew Kingston
|
b00895c7b4
|
Merge pull request #1526 from Budibase/ak-fixes
AK fixes
|
2021-05-21 15:44:58 +01:00 |
Andrew Kingston
|
d4518073c6
|
Change update self method to automatically merge new fields with existing user object
|
2021-05-21 15:23:39 +01:00 |
Andrew Kingston
|
3cbbde1fe4
|
Render email template inside iframe and render custom templates inside base template
|
2021-05-21 14:22:22 +01:00 |
Andrew Kingston
|
a9c3194eba
|
Merge branch 'master' of github.com:Budibase/budibase into ak-fixes
|
2021-05-21 13:42:43 +01:00 |
Andrew Kingston
|
bc8be04a32
|
Derive initials from user names and email address
|
2021-05-21 13:17:09 +01:00 |
Keviin Åberg Kultalahti
|
4314a30999
|
Merge branch 'master' into fixes/user-management
|
2021-05-21 14:10:36 +02:00 |
Keviin Åberg Kultalahti
|
d51e1949fa
|
lint fix
|
2021-05-21 13:43:27 +02:00 |
Keviin Åberg Kultalahti
|
090c54beb9
|
fix erroneous disable state in resetform
|
2021-05-21 13:25:40 +02:00 |
Andrew Kingston
|
f63f9a7c51
|
Update app list screen to show unified app list with publish status
|
2021-05-21 10:32:16 +01:00 |
Keviin Åberg Kultalahti
|
30eb523bd1
|
Merge branch 'master' into fixes/user-management
|
2021-05-20 14:12:48 +02:00 |
mike12345567
|
58f40da036
|
Fixing an issue with checkAuth function not checking response status before attempting to get JSON.
|
2021-05-20 12:39:33 +01:00 |
Keviin Åberg Kultalahti
|
0346ef9bb1
|
Merge branch 'next' into fixes/user-management
|
2021-05-20 11:02:15 +02:00 |
Andrew Kingston
|
445471efa7
|
Default org platform URL to localhost
|
2021-05-19 15:03:27 +01:00 |
Andrew Kingston
|
5de98bb672
|
Implement new admin get self endpoint, move auth store to the portal, and implement working password changing and name changing
|
2021-05-19 14:05:08 +01:00 |
Keviin Åberg Kultalahti
|
cdc7e604e5
|
update function names on users store
|
2021-05-19 11:51:54 +02:00 |
Andrew Kingston
|
f1a7f2a440
|
Merge branch 'next' of github.com:Budibase/budibase into user-app-list
|
2021-05-19 10:09:20 +01:00 |
Andrew Kingston
|
84510d0551
|
Use correct logo everywhere in the portal and fix some layouts
|
2021-05-18 18:48:37 +01:00 |
mike12345567
|
e9b9ada128
|
Building up the API interactions for the forgotten password flow.
|
2021-05-18 15:26:09 +01:00 |
Andrew Kingston
|
e5d1d8c214
|
Add default budibase org details
|
2021-05-18 13:54:04 +01:00 |
Keviin Åberg Kultalahti
|
9f5e891b72
|
lint:fix
|
2021-05-18 12:21:57 +02:00 |
Keviin Åberg Kultalahti
|
56e09c9b7b
|
Merge branch 'feature/draft-apps' into admin/user-management-ui
|
2021-05-17 15:21:48 +02:00 |
Keviin Åberg Kultalahti
|
24d84ee2b4
|
fix erroneous import
|
2021-05-17 13:12:43 +02:00 |
Keviin Åberg Kultalahti
|
d70e336574
|
adds updateRoles method to users store
|
2021-05-17 13:01:16 +02:00 |
Martin McKeaveney
|
0f2bcf581d
|
revert functionality working
|
2021-05-16 21:25:37 +01:00 |
Keviin Åberg Kultalahti
|
4df56ce457
|
Merge branch 'feature/draft-apps' into admin/user-management-ui
|
2021-05-14 17:32:08 +02:00 |
Keviin Åberg Kultalahti
|
47bc197b45
|
lint fixes
|
2021-05-14 16:09:07 +02:00 |
Keviin Åberg Kultalahti
|
ac883053e0
|
adds dummy updateRoles functioon to users store
|
2021-05-14 15:04:15 +02:00 |
Martin McKeaveney
|
c3e7548255
|
dev mode E2E
|
2021-05-13 11:06:08 +01:00 |
Keviin Åberg Kultalahti
|
11c8c74111
|
remove log
|
2021-05-12 17:21:15 +02:00 |
Keviin Åberg Kultalahti
|
6885c7ad04
|
fix broken settings page
|
2021-05-12 17:16:31 +02:00 |
Keviin Åberg Kultalahti
|
17eca8c30b
|
Merge branch 'next' into admin/user-management-ui
|
2021-05-12 14:08:58 +02:00 |
Keviin Åberg Kultalahti
|
b610bf446e
|
add acceptInvite method to users store
|
2021-05-12 14:07:55 +02:00 |
Keviin Åberg Kultalahti
|
b3c63defb3
|
sets up invite action in onboarding modal
|
2021-05-12 11:33:04 +02:00 |
Keviin Åberg Kultalahti
|
3d37e3e335
|
remove unneeded refetch in user delete method
|
2021-05-12 11:15:40 +02:00 |
Keviin Åberg Kultalahti
|
7137cc6f60
|
enables functionality to delete users from frontend
|
2021-05-12 11:08:21 +02:00 |
Keviin Åberg Kultalahti
|
f196f480be
|
adds create user flow
|
2021-05-12 11:00:18 +02:00 |
Martin McKeaveney
|
b1d60cc6b6
|
email template E2E, adding preview
|
2021-05-11 14:44:43 +01:00 |
Keviin Åberg Kultalahti
|
d4d8506fd5
|
enables front-end search of users
|
2021-05-07 13:24:07 +02:00 |
Keviin Åberg Kultalahti
|
ca06e5d16e
|
Merge branch 'app-list' into admin/user-management-ui
|
2021-05-07 12:15:58 +02:00 |
Keviin Åberg Kultalahti
|
ad7e892226
|
Merge branch 'next' into admin/user-management-ui
|
2021-05-07 09:47:45 +02:00 |
Keviin Åberg Kultalahti
|
0a42bce2c0
|
adds users store and moves some components
|
2021-05-07 09:47:05 +02:00 |
Andrew Kingston
|
735c724a0d
|
Handle auth in top level routes and redirect as required. Change default route to be portal
|
2021-05-06 14:49:11 +01:00 |
Andrew Kingston
|
1ed08a8a8b
|
Merge branch 'next' of github.com:Budibase/budibase into app-list
|
2021-05-06 14:01:03 +01:00 |
Andrew Kingston
|
6164f38cf9
|
Move app list to admin portal
|
2021-05-06 13:59:06 +01:00 |
Martin McKeaveney
|
42e0b3c1f9
|
lint ✨
|
2021-05-06 10:57:24 +01:00 |
Martin McKeaveney
|
56018828c3
|
budibase config checklist complete
|
2021-05-06 10:28:06 +01:00 |
Keviin Åberg Kultalahti
|
baca6a6621
|
lintfix
|
2021-05-05 18:53:38 +02:00 |
Keviin Åberg Kultalahti
|
3b570fff83
|
moves admin store to `stores/portal`
|
2021-05-05 18:52:45 +02:00 |
Keviin Åberg Kultalahti
|
677106a58b
|
lint fix
|
2021-05-05 18:41:16 +02:00 |
Keviin Åberg Kultalahti
|
ef129b7595
|
update org store and add loading state + notifications to save action
|
2021-05-05 18:30:03 +02:00 |
Keviin Åberg Kultalahti
|
1f451d07de
|
introduces portal stores concept and adds an org one that handles configs
|
2021-05-05 17:50:45 +02:00 |
Andrew Kingston
|
797e8a8b67
|
Add explicit prettier options
|
2021-05-04 11:32:22 +01:00 |
Keviin Åberg Kultalahti
|
0afbf1649e
|
lint:fix
|
2021-05-03 09:31:09 +02:00 |
mike12345567
|
b4c8bf81f7
|
Swapping over everything to use the new user ID and updating everything after some end to end testing.
|
2021-04-20 17:17:44 +01:00 |
mike12345567
|
9af9761753
|
Some changes to initial login form, improvements based on testing and attempts to fix cypress test failures.
|
2021-04-15 15:57:55 +01:00 |
mike12345567
|
6c58c90a7a
|
Adding some controls around cookies, expiring them when a 403 is hit.
|
2021-04-14 15:43:34 +01:00 |
Martin McKeaveney
|
509a04d914
|
logout button
|
2021-04-13 13:56:28 +01:00 |
Martin McKeaveney
|
252c50029f
|
prevent login page flash on initial render
|
2021-04-13 13:41:12 +01:00 |
Martin McKeaveney
|
d72a6dc8df
|
currentapp being set correctly for user
|
2021-04-13 13:26:13 +01:00 |
Martin McKeaveney
|
3226ee90e2
|
Authentication working on builder homepage, integration with currentapp middleware
|
2021-04-13 11:56:57 +01:00 |
Martin McKeaveney
|
c4a9d8c9f0
|
self endpoint, simple auth
|
2021-04-12 11:20:01 +01:00 |
Martin McKeaveney
|
468b9b97f9
|
builder login
|
2021-04-12 10:47:48 +01:00 |
Martin McKeaveney
|
98576f586e
|
login page
|
2021-04-11 11:35:55 +01:00 |
Keviin Åberg Kultalahti
|
66cd1c6c04
|
lint fixes
|
2021-04-01 12:55:09 +02:00 |
Keviin Åberg Kultalahti
|
dd5959eb0c
|
re-arrange tables store saveField method
|
2021-04-01 12:45:06 +02:00 |
Keviin Åberg Kultalahti
|
50da4159e1
|
fixes views store
|
2021-04-01 11:53:22 +02:00 |
Keviin Åberg Kultalahti
|
e57fc278c2
|
adds back babel-jest
|
2021-04-01 09:26:36 +02:00 |
Keviin Åberg Kultalahti
|
82485607df
|
lint fix
|
2021-04-01 08:40:30 +02:00 |
Keviin Åberg Kultalahti
|
12fbd6245c
|
fix merge regression
|
2021-03-31 13:48:30 +02:00 |
Keviin Åberg Kultalahti
|
c5bdb590f9
|
merge next
|
2021-03-31 11:26:44 +02:00 |
Keviin Åberg Kultalahti
|
17dea3124d
|
wip: views store tests
|
2021-03-30 18:10:58 +02:00 |
Keviin Åberg Kultalahti
|
9bdfe8336d
|
adds tables store tests
|
2021-03-30 15:37:53 +02:00 |
Keviin Åberg Kultalahti
|
71dc4938da
|
adds an init method to the tables store
|
2021-03-30 11:32:01 +02:00 |
Keviin Åberg Kultalahti
|
d22d5c7c28
|
fix last roles store test
|
2021-03-30 10:49:42 +02:00 |
Keviin Åberg Kultalahti
|
dd21ee2386
|
wip: roles store test
|
2021-03-29 18:23:53 +02:00 |
Keviin Åberg Kultalahti
|
292a891883
|
update query store
|
2021-03-29 17:52:38 +02:00 |
Keviin Åberg Kultalahti
|
e1034ae5ac
|
fix last query test
|
2021-03-29 17:50:12 +02:00 |
Keviin Åberg Kultalahti
|
003c1c75d4
|
fixes queries and datasource tests
|
2021-03-29 17:45:18 +02:00 |
Keviin Åberg Kultalahti
|
d86467ecd7
|
fix datasource test
|
2021-03-29 16:23:58 +02:00 |
Keviin Åberg Kultalahti
|
d0aca74e4a
|
wip: queries store tests
|
2021-03-29 14:57:01 +02:00 |
Keviin Åberg Kultalahti
|
58546754b8
|
adds test for permissions store
|
2021-03-29 13:16:41 +02:00 |
Keviin Åberg Kultalahti
|
f8475bfdc2
|
finishes datasources stores
|
2021-03-29 12:54:41 +02:00 |
Keviin Åberg Kultalahti
|
a1f242a628
|
adds fetch and delete tests to datasources store
|
2021-03-29 12:03:34 +02:00 |
Keviin Åberg Kultalahti
|
6711801f97
|
add some temporary testing files
|
2021-03-26 15:43:55 +01:00 |
Keviin Åberg Kultalahti
|
44e3f29a0b
|
moves backend stores to "stores" in the root src directory
|
2021-03-26 09:50:37 +01:00 |