Commit Graph

379 Commits

Author SHA1 Message Date
Rory Powell 0d9147be77 Merge branch 'master' into merge-master 2022-05-17 08:35:29 +01:00
mike12345567 08f53591e6 Fixing test cases. 2022-05-16 12:31:07 +01:00
Rory Powell 30c12f2625 Merge branch 'master' into merge-master 2022-05-13 10:05:21 +01:00
Rory Powell 1716328a77 Update lockfiles 2022-05-12 15:51:14 +01:00
mike12345567 0218ba5210 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-05-11 19:47:22 +01:00
Rory Powell b5e25e125c Bump pro 2022-05-11 11:57:55 +01:00
Rory Powell 879a62c989 Add query quota increment to rows CRUD 2022-05-10 21:59:39 +01:00
Rory Powell e134400465 Merge branch 'master' into merge-master 2022-05-09 14:22:01 +01:00
mike12345567 7693de8a61 Merge branch 'master' of github.com:Budibase/budibase into fix/5778 2022-05-09 13:46:38 +01:00
Rory Powell 59ab628b85 Fix pro version 2022-05-09 12:55:13 +01:00
mike12345567 8e704cc70f Fixing issue #5778 - making sure to only remove the first app_ element of the app ID. 2022-05-09 12:29:44 +01:00
Rory Powell e4976eb320 Fix lockfile 2022-05-05 10:04:33 +01:00
Rory Powell 34474d5c10 Re-enable gsheets for verification 2022-05-05 09:59:10 +01:00
Rory Powell 7f77d895ce Merge branch 'master' into merge-master-develop 2022-05-04 13:29:51 +01:00
mike12345567 dfb292862f Fixing an issue with JSONparse helper always being considered invalid due to a lack of input. 2022-05-04 12:14:01 +01:00
mike12345567 c66cbcd522 Fix for automation issue, doInAppContext for automation thread wasn't async, was immediately closing the database, rather than waiting for the operations to complete. 2022-05-03 15:54:03 +01:00
mike12345567 d090f2a8aa Fix for #5553 - when importing for SQL databases attempt to manage date and time only column times, handle these when displaying in tables and when filtering. 2022-05-03 14:11:06 +01:00
dependabot[bot] 7de264c0e2 Bump ejs from 3.1.6 to 3.1.7 in /packages/server
Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.7.
- [Release notes](https://github.com/mde/ejs/releases)
- [Changelog](https://github.com/mde/ejs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mde/ejs/compare/v3.1.6...v3.1.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-03 12:48:58 +00:00
Rory Powell a9717f3b8f Add workflow_dispatch to ci, release-develop and release 2022-05-03 13:27:22 +01:00
mike12345567 48eda78f67 Fix for issue being able to delete apps. 2022-04-27 15:58:55 +01:00
Rory Powell 7160db6466 Decrement pro version to pass release 2022-04-27 10:09:59 +01:00
Michael Drury 8d78698c60 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-04-26 20:10:26 +01:00
mike12345567 bcee277acb Fixing issue with db init as part of the jest require. 2022-04-26 18:28:37 +01:00
mike12345567 f37712a453 Fixing context issues in sync apps/rows test cases. 2022-04-26 15:42:21 +01:00
Rory Powell 3991f25c5c Test fixes 2022-04-26 15:07:21 +01:00
Martin McKeaveney 9ca4dacbaa merge with master 2022-04-26 10:21:45 +01:00
Rory Powell dd0e6099b8 Fix: google sso 2022-04-25 22:49:56 +01:00
Rory Powell b9a39e193e Fix developer count migration when only single developer 2022-04-25 15:38:37 +01:00
Martin McKeaveney fa66c07578 PR review 2022-04-25 11:45:15 +01:00
Martin McKeaveney 25703889a3 merge 2022-04-25 10:24:49 +01:00
Rory Powell 507ab8bed3 fix versions 2022-04-22 16:18:27 +01:00
Vinoth Kirubakaran 7ffe77c72d chore: resolved merge conflicts from develop branch 2022-04-22 15:23:05 +05:30
Rory Powell 0edc8800bd Pro build fixes 2022-04-22 09:43:51 +01:00
Martin McKeaveney 79a8a63ede use ioredis mock for in memory redis tests 2022-04-21 20:24:43 +01:00
Rory Powell 81cb05b9ef Add explicit pro dependency to worker and server 2022-04-21 15:08:14 +01:00
mike12345567 9899781fc5 Some updates, making sure databases will always close directly using finally checks around the actual tasks, updating how replication works to have a close statement (to make sure it is controlled correctly) and then updating to PouchDB 7.3.0 for one of the memory leak fixes. 2022-04-20 17:33:42 +01:00
Vinoth Kirubakaran ad87bc2bcf feat: made changes to worker and server packages to use global-agent to setup proxy from env variables 2022-04-20 16:00:03 +05:30
Rory Powell fa1f9ad6cc Merge branch 'develop' into feature/licensing 2022-04-13 21:24:07 +01:00
dependabot[bot] 6264bbb48f Bump urijs from 1.19.8 to 1.19.11 in /packages/server
Bumps [urijs](https://github.com/medialize/URI.js) from 1.19.8 to 1.19.11.
- [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.8...v1.19.11)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-13 00:14:16 +00:00
Rory Powell 03ba6d914f Merge branch 'develop' into feature/licensing 2022-04-12 16:18:41 +01:00
Martin McKeaveney 417ba977fa redis integration complete 2022-03-31 15:44:06 +01:00
dependabot[bot] 16f16dba40 Bump minimist from 1.2.5 to 1.2.6 in /packages/server
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-25 14:09:06 +00:00
Rory Powell f5809a2cbf clean and bootstrap 2022-03-25 13:14:44 +00:00
Rory Powell 69b2b38aea Merge branch 'master' into merge-master 2022-03-25 13:10:37 +00:00
Rory Powell dd9503ac09 Add typescript linting at the top level 2022-03-25 11:17:58 +00:00
Rory Powell 4856cdd819 Revert lock files 2022-03-24 13:53:47 +00:00
Andrew Kingston 2242044f3b Allow deep-getting of pagination params from REST responses 2022-03-24 10:07:23 +00:00
Rory Powell a68abf2730 Fix cross tenant apps with session 2022-03-23 16:45:06 +00:00
mike12345567 d64df5fd78 Adding a fix for #4996 - checks if WSL is in use when configuring nginx. 2022-03-23 15:31:08 +00:00
Rory Powell 0a4b1eb552 Tests complete + backwards compatibility for deployment 2022-03-22 00:23:22 +00:00