MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,859 Commits 129 Branches 2,987 Tags 944 MiB
Commit Graph

6092 Commits

Author SHA1 Message Date
dependabot[bot] 091bf6ea58 Bump ws from 5.2.2 to 5.2.3 in /packages/server 
Bumps [ws](https://github.com/websockets/ws) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/5.2.2...5.2.3)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-09 10:13:51 +00:00
dependabot[bot] ac98cdd85e Bump ws from 5.2.2 to 5.2.3 in /packages/bbui 
Bumps [ws](https://github.com/websockets/ws) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/5.2.2...5.2.3)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-09 10:13:33 +00:00
Budibase Release Bot 8b1895f10c v0.9.35 2021-06-09 10:12:38 +00:00
dependabot[bot] 069f50615e Bump browserslist from 4.16.3 to 4.16.6 in /packages/client 
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.16.3 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.16.3...4.16.6)

---
updated-dependencies:
- dependency-name: browserslist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-09 10:03:54 +00:00
Martin McKeaveney 6e96329737 Merge pull request #1548 from Budibase/dependabot/npm_and_yarn/packages/bbui/browserslist-4.16.6 
Bump browserslist from 4.16.4 to 4.16.6 in /packages/bbui
 2021-06-09 11:03:22 +01:00
Martin McKeaveney 03ace9f913 Merge pull request #1549 from Budibase/dependabot/npm_and_yarn/packages/builder/browserslist-4.16.6 
Bump browserslist from 4.16.3 to 4.16.6 in /packages/builder
 2021-06-09 11:03:14 +01:00
dependabot[bot] 223648c97f Bump postcss from 8.2.9 to 8.3.0 in /packages/builder 
Bumps [postcss](https://github.com/postcss/postcss) from 8.2.9 to 8.3.0.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.2.9...8.3.0)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-09 10:03:10 +00:00
mike12345567 ae0dbacb31 Merge branch 'master' of github.com:Budibase/budibase into feature/opinionated-sql 2021-06-09 11:03:01 +01:00
dependabot[bot] 08ed1c53ea Bump normalize-url from 4.5.0 to 4.5.1 in /packages/worker 
Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/sindresorhus/normalize-url/releases)
- [Commits](https://github.com/sindresorhus/normalize-url/commits)

---
updated-dependencies:
- dependency-name: normalize-url
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-09 10:02:46 +00:00
Martin McKeaveney 6ab9894f5b Merge pull request #1594 from Budibase/dependabot/npm_and_yarn/packages/string-templates/ws-7.4.6 
Bump ws from 7.4.2 to 7.4.6 in /packages/string-templates
 2021-06-09 11:02:28 +01:00
Martin McKeaveney 5d4e486d36 Merge pull request #1471 from Budibase/dependabot/npm_and_yarn/hosted-git-info-2.8.9 
Bump hosted-git-info from 2.8.5 to 2.8.9
 2021-06-09 11:02:19 +01:00
Martin McKeaveney f16ab86f9f Merge pull request #1591 from Budibase/dependabot/npm_and_yarn/packages/client/ws-7.4.6 
Bump ws from 7.3.1 to 7.4.6 in /packages/client
 2021-06-09 11:02:09 +01:00
Martin McKeaveney db48968d32 Merge pull request #1610 from Budibase/dependabot/npm_and_yarn/packages/worker/urijs-1.19.6 
Bump urijs from 1.19.2 to 1.19.6 in /packages/worker
 2021-06-09 11:01:48 +01:00
Keviin Åberg Kultalahti 09bcbb17a9 Merge branch 'master' into feature/layout-poc 2021-06-09 10:24:05 +02:00
Keviin Åberg Kultalahti 9931c578a1 change name to section, add illegalChildren prop to manifest 2021-06-09 10:23:42 +02:00
dependabot[bot] e13ebf1b7d Bump ws from 7.3.1 to 7.4.6 in /packages/client 
Bumps [ws](https://github.com/websockets/ws) from 7.3.1 to 7.4.6.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/7.3.1...7.4.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 19:58:24 +00:00
dependabot[bot] 44f3ee4d4f Bump ws from 7.4.2 to 7.4.6 in /packages/string-templates 
Bumps [ws](https://github.com/websockets/ws) from 7.4.2 to 7.4.6.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/7.4.2...7.4.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 19:57:59 +00:00
Budibase Release Bot 0ed9cfc939 v0.9.34 2021-06-08 19:56:50 +00:00
Budibase Release Bot 9559aecd5a v0.9.33 2021-06-08 19:28:00 +00:00
Martin McKeaveney 50186daed4 pin posthog version to fix CLI 2021-06-08 20:20:19 +01:00
Budibase Release Bot 7496938a72 v0.9.32 2021-06-08 18:48:22 +00:00
dependabot[bot] 8de6aa6668 Bump urijs from 1.19.2 to 1.19.6 in /packages/worker 
Bumps [urijs](https://github.com/medialize/URI.js) from 1.19.2 to 1.19.6.
- [Release notes](https://github.com/medialize/URI.js/releases)
- [Changelog](https://github.com/medialize/URI.js/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/medialize/URI.js/compare/v1.19.2...v1.19.6)

---
updated-dependencies:
- dependency-name: urijs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 18:42:04 +00:00
Martin McKeaveney fbc09f4b4a Merge pull request #1667 from Budibase/fix/stability-bugfixes 
Fix/stability bugfixes
 2021-06-08 19:40:41 +01:00
Budibase Release Bot ba90d908c0 v0.9.31 2021-06-08 18:15:16 +00:00
dependabot[bot] faa87100a8 Bump hosted-git-info from 2.8.5 to 2.8.9 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.5 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.5...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 18:10:12 +00:00
dependabot[bot] bc78351578 Bump browserslist from 4.16.3 to 4.16.6 in /packages/builder 
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.16.3 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.16.3...4.16.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 18:08:52 +00:00
dependabot[bot] 524980eaeb Bump browserslist from 4.16.4 to 4.16.6 in /packages/bbui 
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.16.4 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.16.4...4.16.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 18:08:12 +00:00
Michael Drury b48342c55c Linting. 2021-06-08 18:29:34 +01:00
mike12345567 033258b495 Updating export template script to remove users as well. 2021-06-08 18:09:09 +01:00
mike12345567 72c3ff8c2e Formatting. 2021-06-08 18:06:56 +01:00
mike12345567 fe66c3535c Fixing a collection of issues, specifically users being exported/imported and issues with database import causing weirdness (metadata doc being wrong). 2021-06-08 18:06:16 +01:00
Martin McKeaveney 65abd63744 lint 2021-06-08 17:14:46 +01:00
mike12345567 b05c67e8b5 Formatting. 2021-06-08 16:11:46 +01:00
mike12345567 33184be064 Re-writing how global users are handled in server, specifically how they are retrieved, so that for relationships it can handle the global user. 2021-06-08 16:06:30 +01:00
Andrew Kingston 746de696fa Fix icon for hAlign center in containers 2021-06-08 15:18:34 +01:00
Andrew Kingston 4138103f68 Improve client app overflow and selection indicators 2021-06-08 15:16:37 +01:00
Martin McKeaveney feca6cc962 remove builder role from google auth, only allow google sign in if local account exists 2021-06-08 14:46:18 +01:00
Martin McKeaveney eeaca8fc82 do not make query execution a requirement 2021-06-08 14:26:06 +01:00
Andrew Kingston 3a6b627609 Fix navigation component due to new wrapping divs around components 2021-06-08 14:22:00 +01:00
Andrew Kingston 65e7453fbf Render builder preview selection indicators via top level component instead of via styleable healper. Add indiciator on hover and add name to indicator 2021-06-08 14:19:03 +01:00
Martin McKeaveney 499583ff22 fixing attachments for public apps 2021-06-08 12:50:58 +01:00
mike12345567 8a10d2e5b5 Merge branch 'master' of github.com:Budibase/budibase into feature/opinionated-sql 2021-06-08 12:27:37 +01:00
Martin McKeaveney 7f934327b7 making new screen modal choose the currently filtered role 2021-06-08 11:42:39 +01:00
Martin McKeaveney d223b3fef0 remove test appID from datasources call 2021-06-08 09:35:50 +01:00
Andrew Kingston c41f57861c Make settings bar spectrum compatible 2021-06-08 08:14:50 +01:00
Andrew Kingston 0dd0748f5c Add back in lock file 2021-06-08 08:02:00 +01:00
Andrew Kingston 888f6cf398 Move settings bar into client library and allow configuration from manifest.json 2021-06-08 08:00:54 +01:00
Budibase Release Bot bb20722b48 v0.9.30 2021-06-07 17:12:41 +00:00
Martin McKeaveney 905c8f461f Merge branch 'master' of https://github.com/Budibase/budibase into plus-datasources 2021-06-07 18:09:03 +01:00
Budibase Release Bot dfed27393a v0.9.29 2021-06-07 16:43:08 +00:00
Budibase Release Bot 3fcc2be1e9 v0.9.28 2021-06-07 16:26:33 +00: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
mike12345567 88290f2a13 Removing unused function. 2021-06-07 17:00:03 +01:00
mike12345567 1f798f594d Fixing conditional issues. 2021-06-07 16:59:54 +01:00
mike12345567 e75b1338c2 Skipping component test case. 2021-06-07 15:46:09 +01:00
Martin McKeaveney ba34b45ea5 Merge branch 'master' of https://github.com/Budibase/budibase into plus-datasources 2021-06-07 14:36:25 +01:00
Martin McKeaveney e4febf1ad0 fix rbac for tables 2021-06-07 14:29:06 +01:00
mike12345567 e20b115b4d Fixing broken backend test cases. 2021-06-07 14:08:49 +01:00
mike12345567 794119ec39 Merge branch 'fix/cypress-fixes' of github.com:Budibase/budibase into fix/cypress-fixes 2021-06-07 13:23:18 +01:00
mike12345567 1e9ce62261 Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-06-07 13:22:27 +01:00
mike12345567 b6be635cb8 Merge branch 'master' of github.com:Budibase/budibase into feature/opinionated-sql 2021-06-07 13:16:36 +01:00
Andrew Kingston b1398340f5 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
Andrew Kingston 58c2ce4959 Fix radio group opacity on firefox on ubuntu 2021-06-07 09:41:27 +01:00
Budibase Release Bot 509375313a v0.9.27 2021-06-04 20:56:30 +00:00
mike12345567 a58cd69133 Managing the finding of old revision in older apps. 2021-06-04 21:34:41 +01:00
mike12345567 b82af48351 Fixing an issue with the various components of a relationship column being edittable after it was created. 2021-06-04 21:25:34 +01:00
mike12345567 5317d7b1f3 Relationship name wasn't editable - fixing this. 2021-06-04 21:19:21 +01:00
mike12345567 4fdbeafca5 Adding test case for data source opinionated query endpoint. 2021-06-04 15:16:15 +01:00
mike12345567 c00f1ea0bc Adding schema validation and API endpoint to data sources for query. 2021-06-04 14:53:49 +01:00
Keviin Åberg Kultalahti f989d18a3f remove unused class 2021-06-04 15:52:28 +02:00
Keviin Åberg Kultalahti 9c7f56a9ae auto-wrapping on size collapse 2021-06-04 15:52:05 +02:00
Budibase Release Bot 4bb24f7e9a v0.9.26 2021-06-04 13:05:28 +00:00
Keviin Åberg Kultalahti 134cf87608 display placeholders 2021-06-04 14:34:52 +02:00
Keviin Åberg Kultalahti b8c7f6d298 rework selector styles 2021-06-04 14:34:40 +02:00
mike12345567 fd2b7c415a Merge branch 'plus-datasources' of github.com:Budibase/budibase into feature/opinionated-sql 2021-06-04 13:28:34 +01:00
mike12345567 0c681e7dea Merge branch 'fix/builder-roles' of github.com:Budibase/budibase into feature/opinionated-sql 2021-06-04 13:10:57 +01:00
mike12345567 7032305f01 Formatting. 2021-06-04 12:13:57 +01:00
mike12345567 fe4fcad77c Fixing issue with builder not always having the correct roles to view an app - global builders are now admins in all apps. 2021-06-04 12:13:29 +01:00
Martin McKeaveney dd69d5480b Joi schema validation for plus datasources 2021-06-04 10:50:02 +01:00
Martin McKeaveney 36d04d010b Merge branch 'master' of https://github.com/Budibase/budibase into plus-datasources 2021-06-04 10:25:14 +01:00
Budibase Release Bot 903adb40a8 v0.9.25 2021-06-04 09:13:55 +00:00
Keviin Åberg Kultalahti ebdbbdc094 wip layout component 2021-06-04 08:57:18 +02:00
Martin McKeaveney ca6735a11a set content type on client lib upload 2021-06-03 21:33:44 +01:00
mike12345567 2fe6efaed3 Updating test cases. 2021-06-03 18:48:04 +01:00
mike12345567 01fabba959 Merge branch 'plus-datasources' of github.com:Budibase/budibase into feature/opinionated-sql 2021-06-03 18:19:33 +01:00
Martin McKeaveney 00e3f06643 todo comment 2021-06-03 17:58:17 +01:00
Martin McKeaveney de4051da45 endpoint for plus datasources 2021-06-03 17:56:04 +01:00
mike12345567 738b5af4c0 Switching from .toString to .toSQL().toNative() for sql injection protection. 2021-06-03 17:45:19 +01:00
mike12345567 20d7d36a16 Using all lowercase 'query' function name for the builder. 2021-06-03 16:47:31 +01:00
mike12345567 f507daa46a Linking up to existing SQL integrations. 2021-06-03 16:45:43 +01:00
mike12345567 0fba3cc8fd Adding base SQL class which processes defined JSON structure into SQL. 2021-06-03 16:31:24 +01:00
Andrew Kingston 966885b1a0 Remove leftover code and add proper comments to action types 2021-06-03 11:38:06 +01:00
Budibase Release Bot 01bd6f40bc v0.9.24 2021-06-03 10:05:33 +00:00
Andrew Kingston 280a09afd7 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 7f1b612e75 Remove placeholder value from data provider API 2021-06-03 09:55:23 +01:00
Andrew Kingston 1eee2ccc04 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
Martin McKeaveney 75d30ed3a1 createView test green 2021-06-02 22:38:04 +01:00
Martin McKeaveney 6f663a1daf view 2021-06-02 19:21:55 +01:00
Martin McKeaveney 5b26d094cc view fixes 2021-06-02 19:20:28 +01:00
mike12345567 32579aede8 Some fixes after test failures in CI. 2021-06-02 18:28:05 +01:00
Budibase Release Bot c7f3d63374 v0.9.23 2021-06-02 12:06:51 +00:00
Martin McKeaveney abc7f04f29 Merge pull request #1607 from Budibase/lab-day-2705 
Bash script automation block, budibase docker updates through UI
 2021-06-02 12:59:13 +01:00
Budibase Release Bot 48d3bff349 v0.9.22 2021-06-02 11:34:24 +00:00
mike12345567 781bd7bab6 Fixing internal table issues and updating createTable cypress test case. 2021-06-02 12:32:07 +01:00
Andrew Kingston 256f6ab065 Merge branch 'master' of github.com:Budibase/budibase into lab-day-plausible 2021-06-02 11:39:41 +01:00
mike12345567 1da4b31890 Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-06-02 10:08:57 +01:00
Andrew Kingston 1a59f9c8ac Add default setting to date range picker and add info text 2021-06-02 08:38:19 +01:00
Andrew Kingston bb7947bb94 Remove '1 hour' selector from date range picker 2021-06-02 08:28:19 +01:00
Martin McKeaveney e927f44c12 removing superfluous controllers 2021-06-01 20:22:56 +01:00
Martin McKeaveney aacaca3d4e update functionality complete 2021-06-01 20:17:06 +01:00
Martin McKeaveney edfc23454d Merge branch 'master' of https://github.com/Budibase/budibase into lab-day-2705 2021-06-01 19:24:24 +01:00
Budibase Release Bot f794cd67a7 v0.9.21 2021-06-01 17:05:46 +00:00
Michael Drury c5257a9852 Merge pull request #1605 from Budibase/fix/roles-issue 
Fix white screen issue
 2021-06-01 17:56:18 +01:00
Budibase Release Bot 59e4cd85b1 v0.9.20 2021-06-01 16:25:29 +00:00
mike12345567 2ab8d3ff22 Merge branch 'master' of github.com:Budibase/budibase into fix/roles-issue 2021-06-01 17:18:42 +01:00
Martin McKeaveney 1487a6012f fixing various babel issues within tests 2021-06-01 17:09:26 +01:00
mike12345567 522ed9706c Formatting. 2021-06-01 16:02:20 +01:00
mike12345567 c81a8ba3ed Fixing issue with roles not being added correctly to global users and cleaning up roles when an app is deleted. 2021-06-01 15:58:40 +01:00
Martin McKeaveney e8f364c3c1 babel config 2021-06-01 15:44:29 +01:00
mike12345567 bdc0567464 Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-06-01 15:25:37 +01:00
Andrew Kingston b375c525be Merge branch 'master' of github.com:Budibase/budibase into lab-day-plausible 2021-06-01 15:16:09 +01:00
Martin McKeaveney b7d9effb58 Merge pull request #1602 from Budibase/fix/google-account-merge 
merge google accounts, improve connection pooling for RDBMS
 2021-06-01 15:13:08 +01:00
Andrew Kingston deacb738cf Revert logo in standard components 2021-06-01 15:06:58 +01:00
Martin McKeaveney a00357838d remove log 2021-06-01 15:03:19 +01:00
Andrew Kingston fbc4253024 Revert logo to BB emblem 2021-06-01 15:02:27 +01:00
Martin McKeaveney 36b39ef4df merge google accounts, improve connection pooling for RDBMS 2021-06-01 15:00:28 +01:00
Andrew Kingston a22fd8a0a1 Improve client performance and add action to control data provider queries 2021-06-01 14:59:42 +01:00
mike12345567 c8e08f293a Re-working conditional logic to work better in cypress. 2021-06-01 14:29:25 +01:00
Budibase Release Bot f132bf7c93 v0.9.19 2021-06-01 12:50:43 +00:00
mike12345567 807379168e Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-06-01 12:15:34 +01:00
Budibase Release Bot cb62d0b36a v0.9.18 2021-05-29 13:01:19 +00:00
Martin McKeaveney 03a9af0369 making HTTP POST and PUT readable, more robust app import to avoid document conflicts 2021-05-29 13:52:31 +01:00
Budibase Release Bot ad3e7d9b9a v0.9.17 2021-05-28 19:13:11 +00:00
mike12345567 9b7cbc9d01 Formatting. 2021-05-28 19:55:01 +01:00
mike12345567 d5431665e9 Fixing issue with min/max in numbers. 2021-05-28 19:52:30 +01:00
mike12345567 507e2587c6 Fixing issue with relationship column not being name-able. 2021-05-28 19:12:14 +01:00
mike12345567 dfd1815041 Fixing an issue with page not loading. 2021-05-28 18:54:30 +01:00
Budibase Release Bot 89fce7b2e3 v0.9.16 2021-05-28 13:18:31 +00:00
Martin McKeaveney 8ee87fcf62 Merge pull request #1586 from Budibase/fix/data-connectors 
Fix/data connectors
 2021-05-28 14:10:40 +01:00
Martin McKeaveney c4449cf1b2 tidy up 2021-05-28 14:06:18 +01:00
Budibase Release Bot a34f72f929 v0.9.15 2021-05-28 12:39:17 +00:00
Martin McKeaveney f348f18621 go straight to app if you only have one published app 2021-05-28 12:44:29 +01:00
Mike Shanks 61506c18aa updated builder license to GPL & copyright to Budibase Inc 2021-05-28 12:14:14 +01:00
mike12345567 544f6a26ef Fixing bug. 2021-05-28 12:05:03 +01:00
mike12345567 6416d7f197 Making sure certain fields aren't cleansed. 2021-05-28 12:04:15 +01:00
mike12345567 70019b9b74 Cleansing input rows against the table schema. 2021-05-28 11:59:04 +01:00
Martin McKeaveney 09ce58aa95 fix mssql encryption option 2021-05-28 11:55:28 +01:00
Martin McKeaveney 0c90f9ffc5 adding watchtower to docker config 2021-05-28 10:09:32 +01:00
Budibase Release Bot faaf49c562 v0.9.14 2021-05-27 15:05:57 +00:00
mike12345567 c9a352bee7 Fixing server test cases. 2021-05-27 15:40:55 +01:00
mike12345567 3d01ac17e9 Updating date helper to use UTC. 2021-05-27 15:21:00 +01:00
Andrew Kingston 1ae8264276 Allow data providers to inherit each other and add full client side lucene implementation 2021-05-27 15:11:08 +01:00
mike12345567 9fb5e97330 Linting. 2021-05-27 14:55:48 +01:00
mike12345567 bf91cb35a6 Formatting. 2021-05-27 14:53:47 +01:00
mike12345567 aab11fa932 Updating permissions to allow roles other than builder/admin to use apps properly. 2021-05-27 14:53:41 +01:00
mike12345567 88b31d7406 Fixing an issue with redirect loop in auth, 2021-05-27 12:05:31 +01:00
Martin McKeaveney 5be2182fef piping errors to stderr when timeout exceeded 2021-05-27 11:47:02 +01:00
mike12345567 de91822ce7 Adding test case for issue found by Andrew with formulas, HBS in deep context objects was being evaluated which is not valid and breaks things. 2021-05-27 11:45:17 +01:00
Martin McKeaveney 7c4ec2f23a execute bash commands in automations 2021-05-27 11:11:44 +01:00
Martin McKeaveney 04cdb7fb8b Merge pull request #1570 from Budibase/fix/stack-fixes 
SSL fixes, update boolean in lucene
 2021-05-27 09:03:03 +01:00
Martin McKeaveney 76620a5083 flip bools to strings 2021-05-27 08:21:05 +01:00
Budibase Release Bot 2c86cb4f43 v0.9.13 2021-05-27 07:19:23 +00:00
Andrew Kingston 21f96a200c Merge pull request #1571 from Budibase/fix/boolean-backend-ui 
Fix toggles in tables in backend UI always showing false
 2021-05-27 08:12:07 +01:00
Andrew Kingston ae297f2fdd Fix toggles in tables in backend UI always showing false 2021-05-27 07:36:46 +01:00
Martin McKeaveney b830265b89 SSL fixes, update boolean in lucene 2021-05-26 22:48:55 +01:00
Budibase Release Bot b970a01def v0.9.12 2021-05-26 16:53:00 +00:00
Andrew Kingston 01be9be963 Fix formula fields causing handlebars enrichment of client component settings to fail 2021-05-26 17:38:49 +01:00
Budibase Release Bot f8a7220a56 v0.9.11 2021-05-26 16:14:47 +00:00
Martin McKeaveney 2f18402ecf Merge branch 'master' of https://github.com/Budibase/budibase 2021-05-26 17:04:39 +01:00
Martin McKeaveney 8585618736 configure AWS S3 credentials to upload standard components 2021-05-26 17:04:32 +01:00
Budibase Release Bot 08b7e3a543 v0.9.10 2021-05-26 15:57:10 +00:00
Budibase Release Bot 7ff173687c v0.9.9 2021-05-26 15:16:54 +00:00
Martin McKeaveney 40634b099b v0.9.8 2021-05-26 15:36:41 +01:00
Martin McKeaveney 10a8f063fb v0.9.7 2021-05-26 15:34:28 +01:00
Andrew Kingston f9157f49f9 Merge pull request #1566 from Budibase/ak-fixes 
Fix issue when exporting apps
 2021-05-26 15:02:34 +01:00
Andrew Kingston ee9d247997 Fix issue when exporting apps 2021-05-26 14:58:24 +01:00
Keviin Åberg Kultalahti fd7050697d checks for user table props in table 2021-05-26 15:44:16 +02:00
Martin McKeaveney 7befe535fc v0.9.6 2021-05-26 13:37:46 +01:00
Andrew Kingston 4a38fa3b71 Merge pull request #1564 from Budibase/ak-fixes 
Proper font support and multiple fixes
 2021-05-26 13:18:40 +01:00
Andrew Kingston 7e95961542 Fix issue with automation action for executing external data connector. Closes #1559 2021-05-26 09:02:59 +01:00
Andrew Kingston 29f81ffe0d Merge branch 'master' of github.com:Budibase/budibase into ak-fixes 2021-05-26 08:53:42 +01:00
Andrew Kingston bb422d1c4e Fix execute query action not working 2021-05-26 08:49:54 +01:00
mike12345567 62ec2f2cc0 Formatting. 2021-05-25 18:08:34 +01:00
mike12345567 8e8223e3bb Fixing create user test case, fixed part of create table and made a start on create components. 2021-05-25 18:06:56 +01:00
mike12345567 1631aa698b Updating binding tests. 2021-05-25 16:52:35 +01:00
mike12345567 1564724dc3 Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-05-25 16:02:06 +01:00
mike12345567 069de1fdb1 Updating Automation cypress tests, now functional. 2021-05-25 15:57:38 +01:00
Martin McKeaveney 1150593e74 v0.9.5 2021-05-25 15:40:12 +01:00
Andrew Kingston 104298371a Fix case of group by button 2021-05-25 15:33:04 +01:00
Andrew Kingston 1b90760c2e Add back in active prop to ActionButton which must have got lost in a merge 2021-05-25 15:32:56 +01:00
Martin McKeaveney bdea7aa528 Merge branch 'master' of https://github.com/Budibase/budibase 2021-05-25 15:15:43 +01:00
Martin McKeaveney 5091289d7e fix app import to create link views and search index 2021-05-25 15:15:36 +01:00
Kevin Åberg Kultalahti bc285a38bc Merge pull request #1556 from Budibase/fixes/kev-cleanups 
Minor fixes
 2021-05-25 15:40:16 +02:00
Keviin Åberg Kultalahti ab56fceaae fix double page component issue in email section 2021-05-25 15:25:56 +02:00
Keviin Åberg Kultalahti 3dc7ba268e remove unused component in manage layout 2021-05-25 15:19:10 +02:00
Keviin Åberg Kultalahti 0cd8d50fcc add node target to cli package 2021-05-25 15:12:25 +02:00
Martin McKeaveney a2337fda15 Merge pull request #1555 from Budibase/fix/0.9.1-fixes 
fix cron trigger output
 2021-05-25 14:11:08 +01:00
Martin McKeaveney 0340c735e8 fix cron trigger output 2021-05-25 13:39:30 +01:00
mike12345567 08fef5fabd Merge branch 'master' of github.com:Budibase/budibase into fix/cypress-fixes 2021-05-25 13:32:43 +01:00
mike12345567 9efc5162ab Removing request button. 2021-05-25 13:29:15 +01:00
mike12345567 1146d508fd Fixing app cypress test cases. 2021-05-25 13:25:42 +01:00
Martin McKeaveney 3a53dbe1f7 v0.9.4 2021-05-25 12:44:36 +01:00
Martin McKeaveney 9564285917 fix stale topNav history state causing wrong apps to show 2021-05-25 12:42:55 +01:00
mike12345567 921eb39227 Fixing the creation of user in cypress. 2021-05-25 11:06:50 +01:00
Andrew Kingston 41fb234499 Update autoscreens to use better spectrum-compatible styles and fonts 2021-05-25 10:15:10 +01:00
Andrew Kingston 6c960dd9e2 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 3c5696199a Remove Inter font fully and replace with Source Sans Pro, fix favicon import path 2021-05-25 09:41:23 +01:00
Andrew Kingston e81b9ce66a Remove login form component 2021-05-25 08:26:43 +01:00
Andrew Kingston 4e67369277 Fix case of edit roles button 2021-05-25 08:24:00 +01:00
Andrew Kingston 6477b2d2ed Merge branch 'master' of github.com:Budibase/budibase into ak-fixes 2021-05-25 08:21:38 +01:00
Andrew Kingston c91fb7d500 Default logo URL in navigation component and add setting to hide logo 2021-05-25 08:21:28 +01:00
Andrew Kingston 3f9bdd9589 Remove dependency on server repo to provide logo URL to navigation component 2021-05-25 08:21:07 +01:00
Martin McKeaveney b923b63a44 fix test 2021-05-24 22:50:58 +01:00
Martin McKeaveney 0fce78d19d removing electron config 2021-05-24 22:39:13 +01:00
Martin McKeaveney 617a3035d2 amend s3 path URL 2021-05-24 22:17:03 +01:00
Martin McKeaveney 4c9c7b05a3 v0.9.3 2021-05-24 21:54:28 +01:00
Martin McKeaveney 064f1e961b sanitizing client lib URL 2021-05-24 21:30:46 +01:00
Michael Drury b5da856c64 Merge pull request #1545 from Budibase/fix/user-setup-builder-admin 
Ability to configure invited users as admins/builders
 2021-05-24 20:40:32 +01:00
Martin McKeaveney 39b6ab7790 Merge pull request #1547 from Budibase/fix/minio 
remove public folder concept, upload client lib directly
 2021-05-24 20:19:12 +01:00
Martin McKeaveney 39fb5f9b78 removed node modules upload call 2021-05-24 19:54:00 +01:00
Martin McKeaveney 1b920a2f16 remove public folder concept, upload client lib directly 2021-05-24 19:49:34 +01:00
Andrew Kingston 8c52af4cf7 Merge pull request #1546 from Budibase/ak-fixes 
More logo updates + fixes
 2021-05-24 19:39:08 +01:00
Andrew Kingston 1e818a35c5 Add back readable text for oauth checklist step 2021-05-24 19:33:28 +01:00
Andrew Kingston 2f29573df5 Replace logo in navigation template with new space logo 2021-05-24 19:24:05 +01:00
Andrew Kingston 4c1fb33ad0 Replace builder logo with new space logo 2021-05-24 19:23:46 +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 a77e1c0365 Update favicon 2021-05-24 18:29:34 +01:00
Martin McKeaveney 40abd4fe3d v0.9.2 2021-05-24 17:20:20 +01:00
Michael Drury ea447b410b Merge pull request #1543 from Budibase/fix/mike-fixes 
Some fixes for Redis
 2021-05-24 17:06:33 +01:00
mike12345567 ab4e880807 Fixing issue with redis updates in tests. 2021-05-24 17:05:46 +01:00
Andrew Kingston 4a53d4c11e Hide developer mode option when you aren't a developer 2021-05-24 16:49:43 +01:00
mike12345567 55aba6b824 Changing cypress commands. 2021-05-24 16:32:42 +01:00
mike12345567 85102fab4e Changing how connection is waited for. 2021-05-24 16:31:50 +01:00
mike12345567 3a9a32f5f6 Adding an initial connection timeout of 5 seconds which after it will retry again. 2021-05-24 16:30:24 +01:00
Andrew Kingston d856eae6f7 Fix logo size on create admin screen 2021-05-24 16:28:08 +01:00
Andrew Kingston 2c580e6b30 Fix links to apps from non-builder app list not working 2021-05-24 16:22:39 +01:00
mike12345567 3873d12476 Formatting. 2021-05-24 16:20:28 +01:00
mike12345567 7e6f215598 Linting and fixing an issue with the dev pass through. 2021-05-24 16:20:02 +01:00
Andrew Kingston 9ea9b83fee Add real Budibase space logo as the default logo 2021-05-24 16:19:29 +01:00
Andrew Kingston 844158bb3c Add real updated timestamp to non-builder app list 2021-05-24 15:47:55 +01:00
mike12345567 b7f739d54a Logging and adding better messaging around startup. 2021-05-24 14:58:54 +01:00
mike12345567 4b786f51d2 Formatting. 2021-05-24 14:56:23 +01:00
mike12345567 0a4c4f1cc0 Adding some changes for to redis library, allowing reconnection. 2021-05-24 14:54:47 +01:00
Andrew Kingston bba1cea7b3 Implement real sorting by app updated timestamp 2021-05-24 14:16:28 +01:00
Andrew Kingston ecfd41d535 Add real updated timestamp to app table view 2021-05-24 14:11:45 +01:00
Andrew Kingston 5691280961 Stop / route screen being called Login when set to public access 2021-05-24 14:09:19 +01:00
Andrew Kingston b9cfebdad2 Update deployment status message on error 2021-05-24 14:08:55 +01:00
Andrew Kingston 200d006971 Update deployment status message to not confuse user 2021-05-24 14:08:08 +01:00
Michael Drury 0b728f07fa Merge pull request #1538 from Budibase/fix/lockdown-admin 
Locking down administration endpoints and routes
 2021-05-24 13:49:22 +01:00
Andrew Kingston 514d74a7aa Remove console.log 2021-05-24 12:45:09 +01:00
Andrew Kingston c1a30f8ea1 Remove admin only pages from non-admin menu 2021-05-24 12:44:59 +01:00
Andrew Kingston 1f1431344c Prevent flashing and intermittent errors when navigating to admin screens as a non admin 2021-05-24 12:40:36 +01:00
Martin McKeaveney b328875ebd fix tests 2021-05-24 12:14:04 +01:00
Martin McKeaveney 4091013376 tidy up 2021-05-23 15:52:21 +01:00
Martin McKeaveney 35e361717c make attachments downloadable and images clickable 2021-05-23 15:40:00 +01:00
Martin McKeaveney f58ad3a12c allow deletion of relationships 2021-05-23 15:06:33 +01:00
mike12345567 0838a45efc Fixing issue with users that don't have admin structure. 2021-05-21 17:19:13 +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
mike12345567 348c61a8c5 Merge branch 'master' of github.com:Budibase/budibase into fix/lockdown-admin 2021-05-21 16:54:52 +01:00
mike12345567 c6a6d49cd7 Updating administration middleware so that internal requests allowed through automatically. 2021-05-21 16:43:01 +01:00
mike12345567 27fc3a3c5e Adding ability to create new admins. 2021-05-21 16:30:37 +01:00
Michael Drury 7fb9673217 Merge pull request #1537 from Budibase/feature/app-updated-at 
Mike fixes + application updated at timestamps
 2021-05-21 16:10:29 +01:00
Martin McKeaveney 29faf18147 remove superfluous copy 2021-05-21 16:02:49 +01:00
mike12345567 b119ae19c6 Fixing broken server test cases. 2021-05-21 16:02:21 +01:00
Martin McKeaveney d161f979b6 Merge pull request #1533 from Budibase/martin-fixes 
WIP: fixes
 2021-05-21 15:49:52 +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 9f99058452 Revert login on enter 2021-05-21 15:44:27 +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
Martin McKeaveney c75d898ca6 Merge branch 'master' of https://github.com/Budibase/budibase into martin-fixes 2021-05-21 15:18:16 +01:00
mike12345567 31d0a8b483 Upping debounce to 30 seconds as it has no real negative. 2021-05-21 15:14:35 +01:00
mike12345567 aa51bf7f07 Switching logic for lazy evaluation. 2021-05-21 15:03:28 +01:00
mike12345567 ede7e38442 Merge branch 'master' of github.com:Budibase/budibase into feature/app-updated-at 2021-05-21 14:57:41 +01:00
mike12345567 a6e196a351 Making sure roles object is always present, issue #1529. 2021-05-21 14:56:06 +01:00
Martin McKeaveney bef216527d simpler check using checklist 2021-05-21 14:55:11 +01:00
mike12345567 095e513f9f Formatting 2021-05-21 14:49:59 +01:00
Martin McKeaveney c06edd8b44 enter to login, google auth only show if configured 2021-05-21 14:45:56 +01:00
mike12345567 a54b582e0d Updating UI to use the updated at. 2021-05-21 14:38:58 +01:00
mike12345567 06353409bc Making sure the email sends out the write port if no platform URL is set. 2021-05-21 14:38:46 +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 152a2d921b Remove question mark from field label 2021-05-21 13:56:18 +01:00
Andrew Kingston 1d9ef7f3bf Fix styles of tag renderer to make it readable but remove hover state 2021-05-21 13:55:17 +01:00
Andrew Kingston 2c1c407e81 Fix small typo in user details page 2021-05-21 13:49:25 +01:00
Andrew Kingston ba45481cd7 Add readable labels to Google oauth fields 2021-05-21 13:46:13 +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 532c48896a Add repeat password input to admin user creation 2021-05-21 13:35:38 +01:00
Andrew Kingston 7ed13d2b4c Allow enter keypress to submit login form 2021-05-21 13:27:27 +01:00
Andrew Kingston 4deedfc27c Update user avatar to use correct initials 2021-05-21 13:17:45 +01:00
Andrew Kingston 01b6c443ea Fix issue on hot reload when user object was null 2021-05-21 13:17:35 +01:00
Andrew Kingston bc8be04a32 Derive initials from user names and email address 2021-05-21 13:17:09 +01:00
Andrew Kingston 68ed6b6359 Update avatar to take initials prop and render text as uppercase 2021-05-21 13:16:54 +01:00
mike12345567 a1ed0a113b Merge branch 'master' of github.com:Budibase/budibase into feature/app-updated-at 2021-05-21 13:16:49 +01:00
Keviin Åberg Kultalahti 4314a30999 Merge branch 'master' into fixes/user-management 2021-05-21 14:10:36 +02:00
mike12345567 0ff7bc672a Adding redis to exclusion from coverage (can't currently test). 2021-05-21 13:08:59 +01:00
mike12345567 6ccec1632a Adding a debounced updated at timestamp to applications. 2021-05-21 13:07:10 +01:00
Andrew Kingston 05281c83cb Merge pull request #1516 from Budibase/enhanced-app-list 
Enhanced app list + placeholder removal
 2021-05-21 13:03:36 +01:00
Keviin Åberg Kultalahti d51e1949fa lint fix 2021-05-21 13:43:27 +02:00
Keviin Åberg Kultalahti 9994c61f8f fix login page 2021-05-21 13:33:05 +02:00
Keviin Åberg Kultalahti a4de6d49c8 Merge branch 'master' into fixes/user-management 2021-05-21 13:32:55 +02:00
Martin McKeaveney 6233de1fc1 Merge pull request #1508 from Budibase/postgres-connection-pool 
postgres connection pooling
 2021-05-21 12:28:51 +01:00
Keviin Åberg Kultalahti 53f38f6f8f move extracted components into page components 2021-05-21 13:26:55 +02:00
Keviin Åberg Kultalahti 090c54beb9 fix erroneous disable state in resetform 2021-05-21 13:25:40 +02:00
Andrew Kingston 52d0be8b58 Simplify lock logic 2021-05-21 11:49:23 +01:00
Andrew Kingston 93d77d058c Update normal user home screen to reflect changes with app fetching 2021-05-21 11:17:23 +01:00
Andrew Kingston 613841e7dd Remove accidental text 2021-05-21 11:15:35 +01:00
Andrew Kingston b904bba4c7 Merge branch 'master' of github.com:Budibase/budibase into enhanced-app-list 2021-05-21 11:11:43 +01:00
Michael Drury f76c7d9684 Merge pull request #1514 from Budibase/fix/per-app-login 
Removing per app login screens
 2021-05-21 11:11:21 +01:00
Keviin Åberg Kultalahti 8735ef088f change forceReset bool name 2021-05-21 12:10:02 +02:00
Keviin Åberg Kultalahti ac989fb282 move ResetForm to page component 2021-05-21 12:09:38 +02:00
Keviin Åberg Kultalahti f050b65c45 add check after Login to redirect to resetpassword 2021-05-21 12:09:10 +02:00
Keviin Åberg Kultalahti fc45408d0f add force reset modal 2021-05-21 12:08:31 +02:00
Keviin Åberg Kultalahti acc8fc6232 add forceResetPassword check to layout 2021-05-21 12:08:18 +02:00
mike12345567 7886600d75 Linting. 2021-05-21 11:06:57 +01:00
Andrew Kingston 28e71e8cef Remove global search bar 2021-05-21 11:02:40 +01:00
Andrew Kingston c174602704 Merge branch 'master' of github.com:Budibase/budibase into enhanced-app-list 2021-05-21 11:00:26 +01:00
Andrew Kingston e1c37752db Rename general settings to organisation and add builder theme to Theming page, add password changing and user info changing to avatar dropdown 2021-05-21 11:00:08 +01:00
Andrew Kingston cc21ed354b Improve app list empty state screen and fix order of app context menu options 2021-05-21 10:37:19 +01:00
Andrew Kingston f63f9a7c51 Update app list screen to show unified app list with publish status 2021-05-21 10:32:16 +01:00
Andrew Kingston d30a9ef494 Add StatusLight and Badge components to BBUI 2021-05-21 10:31:45 +01:00
Martin McKeaveney 7ef5a01f04 v0.9.1 2021-05-21 10:04:45 +01:00
Martin McKeaveney e83f600b9e removing skip_setup as it was preventing init 2021-05-20 21:42:27 +01:00
mike12345567 0b924908fd Formatting. 2021-05-20 20:48:46 +01:00
mike12345567 4d6e4475d3 Fixing some issues found when testing. 2021-05-20 20:48:24 +01:00
mike12345567 5e412fa497 Merge branch 'fix/per-app-login' of github.com:Budibase/budibase into fix/per-app-login 2021-05-20 16:18:32 +01:00
mike12345567 835e097d6e Fixing test cases. 2021-05-20 16:18:09 +01:00
Keviin Åberg Kultalahti 8ca3624e24 fix bug when switching between tabs 2021-05-20 16:57:38 +02:00
Keviin Åberg Kultalahti 8175fdd7a0 workaround to strange onMount bug with many Tabs components 2021-05-20 16:46:20 +02:00
Andrew Kingston 71296670c2 Add return URL's to any unauthenticated requests in the portal or builder 2021-05-20 15:01:59 +01:00
Andrew Kingston 64496759fd Redirect away from auth routes if already authenticated 2021-05-20 15:01:34 +01:00
Keviin Åberg Kultalahti 1a4a13d431 remove unused var 2021-05-20 15:59:08 +02:00
Martin McKeaveney 7103df0013 v0.9.1 2021-05-20 14:53:22 +01:00
Martin McKeaveney fd9f4a3027 v0.9.0 2021-05-20 14:49:19 +01:00
Andrew Kingston 99a2a5caf0 Add return URL to login form 2021-05-20 14:47:36 +01:00
Andrew Kingston 74a8eb4c1a Redirect to login from client apps when required 2021-05-20 14:47:17 +01:00
Keviin Åberg Kultalahti 236b17e575 fix not being able to navigate directly to email template 2021-05-20 15:39:21 +02:00
Keviin Åberg Kultalahti 3d746b1217 remove unused imports 2021-05-20 15:13:16 +02:00
Keviin Åberg Kultalahti 46ddaada4d remove transitions because of bug 2021-05-20 15:13:08 +02:00
Keviin Åberg Kultalahti 8f6205a4db fixes layout issues in email templates 2021-05-20 15:03:34 +02:00
Martin McKeaveney 3a422be071 simplify docker build before push 2021-05-20 13:54:18 +01:00
Keviin Åberg Kultalahti f730900ed5 fix email templates being unreachable 2021-05-20 14:49:53 +02:00
Keviin Åberg Kultalahti eca38a6fec fixes missing cursor styling 2021-05-20 14:34:19 +02:00
Keviin Åberg Kultalahti 30eb523bd1 Merge branch 'master' into fixes/user-management 2021-05-20 14:12:48 +02:00
Martin McKeaveney e28a5e98ab fix lint 2021-05-20 13:09:02 +01:00
mike12345567 d301ea48a9 Removing all login/logout functionality from apps. 2021-05-20 13:05:58 +01:00
Martin McKeaveney 237642e4af merge 2021-05-20 12:41:54 +01: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
mike12345567 148cf87224 Cleanup after testing/looking through hosting files. 2021-05-20 12:21:58 +01:00
mike12345567 3437f620d6 Fixing automation test case. 2021-05-20 12:07:07 +01:00
mike12345567 80704111d4 Merge branch 'master' of github.com:Budibase/budibase into fix/onboarding 2021-05-20 11:56:19 +01:00
Martin McKeaveney 7ab24fed2b merge with master 2021-05-20 10:40:15 +01:00
Martin McKeaveney e6aa34afb5 fix analytics code 2021-05-20 10:26:23 +01:00