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

395 Commits

Author SHA1 Message Date
mike12345567 8bc0142a37 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-05-25 18:12:27 +01:00
mike12345567 84d0b61588 Swapping bcryptjs for bcrypt. 2022-05-25 16:14:45 +01:00
Rory Powell 45005217be Fix build 2022-05-24 20:09:22 +01:00
Rory Powell 5d8bd9c2a3 Merge branch 'master' into develop 2022-05-24 10:20:08 +01:00
Rory Powell b78f8eeb5f Fix pro and core versions 2022-05-24 10:11:55 +01:00
mike12345567 a7e6eb2851 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-05-23 23:43:57 +01:00
Martin McKeaveney d18de6c4c9 prevent issue with TTL dependency import 2022-05-23 17:38:02 +01:00
mike12345567 76f19def26 Moving the withCache function to backend-core so that it can be shared, as well as adding a cache busting function which can be used when one of the checklist configs changes. 2022-05-23 15:03:52 +01:00
mike12345567 513d901ab4 Adding user load testing script. 2022-05-22 17:14:24 +01:00
mike12345567 663f5aef7b Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage 2022-05-19 10:45:26 +01:00
Rory Powell 2ce76881f2 Merge branch 'master' into merge-master 2022-05-18 14:24:35 +01:00
mike12345567 e61efc5474 Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage 2022-05-18 10:56:44 +01:00
mike12345567 c528896e2d Finishing off UI, expanding settings menus from 80ch to 90ch as they were quite restricted and made the usage UI a bit difficult to view. Added a DISABLE_DEVELOPER_LICENSE env variable for testing. 2022-05-17 17:44:40 +01:00
Rory Powell 5ff2d2a538 Add explicit bson dependency version instead of * to fix build 2022-05-17 11:03:54 +01:00
Rory Powell 39e8a2bc10 Fix release build 2022-05-17 10:11:58 +01:00
Rory Powell fb18904ad8 Fix tests and build 2022-05-17 10:05:05 +01:00
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