MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,102 Commits 123 Branches 2,995 Tags 955 MiB
Commit Graph

664 Commits

Author SHA1 Message Date
mike12345567 7437eb4513 Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage 2022-05-19 10:45:26 +01:00
Rory Powell 99ebb96f3e Merge branch 'master' into merge-master 2022-05-18 14:24:35 +01:00
mike12345567 39806d470d Merge branch 'develop' of github.com:Budibase/budibase into feature/portal-usage 2022-05-18 10:56:44 +01:00
mike12345567 36a190b0ed 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 f549f38b16 Add explicit bson dependency version instead of * to fix build 2022-05-17 11:03:54 +01:00
Rory Powell a056027bf3 Fix release build 2022-05-17 10:11:58 +01:00
Rory Powell eb935cf143 Fix tests and build 2022-05-17 10:05:05 +01:00
Rory Powell b1c5f09651 Merge branch 'master' into merge-master 2022-05-17 08:35:29 +01:00
mike12345567 bcf7e1782a Fixing test cases. 2022-05-16 12:31:07 +01:00
Rory Powell 8f121852b0 Merge branch 'master' into merge-master 2022-05-13 10:05:21 +01:00
Rory Powell 20076e69d7 Update lockfiles 2022-05-12 15:51:14 +01:00
mike12345567 b6499c911c Merge branch 'master' of github.com:Budibase/budibase into develop 2022-05-11 19:47:22 +01:00
Rory Powell a269f123a1 Bump pro 2022-05-11 11:57:55 +01:00
Rory Powell f5da1a04e2 Add query quota increment to rows CRUD 2022-05-10 21:59:39 +01:00
Rory Powell 631aebba06 Merge branch 'master' into merge-master 2022-05-09 14:22:01 +01:00
mike12345567 1b1938950f Merge branch 'master' of github.com:Budibase/budibase into fix/5778 2022-05-09 13:46:38 +01:00
Rory Powell 150c4c3937 Fix pro version 2022-05-09 12:55:13 +01:00
mike12345567 7b461c03dd 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 a35824d50e Fix lockfile 2022-05-05 10:04:33 +01:00
Rory Powell 2cfb7be30a Re-enable gsheets for verification 2022-05-05 09:59:10 +01:00
Rory Powell 2fb532e1e8 Merge branch 'master' into merge-master-develop 2022-05-04 13:29:51 +01:00
mike12345567 6ffeaab597 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 d666ad3126 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 107c9e2dfc 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] 40d2146b7c
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 f7b568d37f Add workflow_dispatch to ci, release-develop and release 2022-05-03 13:27:22 +01:00
mike12345567 4a02f7f9aa Fix for issue being able to delete apps. 2022-04-27 15:58:55 +01:00
Rory Powell 51ca618558 Decrement pro version to pass release 2022-04-27 10:09:59 +01:00
Michael Drury 8e786bfd53 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-04-26 20:10:26 +01:00
mike12345567 95bcb1ca9c Fixing issue with db init as part of the jest require. 2022-04-26 18:28:37 +01:00
mike12345567 8e5c4dea77 Fixing context issues in sync apps/rows test cases. 2022-04-26 15:42:21 +01:00
Rory Powell 0f29b0cb03 Test fixes 2022-04-26 15:07:21 +01:00
Martin McKeaveney e01ef9bdfb merge with master 2022-04-26 10:21:45 +01:00
Rory Powell 0f04715062 Fix: google sso 2022-04-25 22:49:56 +01:00
Rory Powell b7cbd2a56a Fix developer count migration when only single developer 2022-04-25 15:38:37 +01:00
Martin McKeaveney ff7ad47b0a PR review 2022-04-25 11:45:15 +01:00
Martin McKeaveney b05d1d9708 merge 2022-04-25 10:24:49 +01:00
Rory Powell 1edf879db7 fix versions 2022-04-22 16:18:27 +01:00
Vinoth Kirubakaran 3fe651b0fb chore: resolved merge conflicts from develop branch 2022-04-22 15:23:05 +05:30
Rory Powell df5f9c1fef Pro build fixes 2022-04-22 09:43:51 +01:00
Martin McKeaveney 690ba4f81f use ioredis mock for in memory redis tests 2022-04-21 20:24:43 +01:00
Rory Powell e62858be8b Add explicit pro dependency to worker and server 2022-04-21 15:08:14 +01:00
mike12345567 7792a07899 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 5803fcc6b1 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 5085358423 Merge branch 'develop' into feature/licensing 2022-04-13 21:24:07 +01:00
dependabot[bot] 42c5611946
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 dd740df387 Merge branch 'develop' into feature/licensing 2022-04-12 16:18:41 +01:00
Martin McKeaveney 6d8254d5f0 redis integration complete 2022-03-31 15:44:06 +01:00
dependabot[bot] f318379d7f
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 7f79b30b58 clean and bootstrap 2022-03-25 13:14:44 +00:00