Commit Graph

2511 Commits

Author SHA1 Message Date
Martin McKeaveney cd44281b31 merge 2022-08-01 16:53:37 +01:00
Martin McKeaveney 61a61e5703 merge with master 2022-08-01 16:51:51 +01:00
Budibase Staging Release Bot 97b9a9628a Update pro version to 1.1.32-alpha.6 2022-08-01 15:49:14 +00:00
Budibase Staging Release Bot b9b3d11570 v1.1.32-alpha.6 2022-08-01 15:46:13 +00:00
Budibase Release Bot 26e6e050bb Update pro version to 1.1.32 2022-08-01 15:45:14 +00:00
Budibase Release Bot c7eff641fc v1.1.32 2022-08-01 15:43:39 +00:00
Budibase Staging Release Bot e0dbe20cc0 Update pro version to 1.1.32-alpha.5 2022-08-01 15:06:25 +00:00
Budibase Staging Release Bot 6accd07c07 v1.1.32-alpha.5 2022-08-01 15:03:22 +00:00
Budibase Staging Release Bot 25d2619668 Update pro version to 1.1.32-alpha.4 2022-08-01 11:51:16 +00:00
Budibase Staging Release Bot 20c1196aad v1.1.32-alpha.4 2022-08-01 11:47:51 +00:00
Budibase Staging Release Bot ae956bc334 Update pro version to 1.1.32-alpha.3 2022-08-01 08:57:16 +00:00
Budibase Staging Release Bot 52a2e5bbeb v1.1.32-alpha.3 2022-08-01 08:53:34 +00:00
Peter Clement c3a4941119 Merge pull request #6989 from Budibase/pc/fixes
User Management UI fixes
2022-08-01 09:39:55 +01:00
Budibase Staging Release Bot e41666b10f Update pro version to 1.1.32-alpha.2 2022-08-01 08:22:08 +00:00
Budibase Staging Release Bot 575ffb1500 v1.1.32-alpha.2 2022-08-01 08:19:07 +00:00
Peter Clement 85c63a17f8 pr comments 2022-08-01 09:03:47 +01:00
Peter Clement 79f7fd380d pr comments and updating group check to be more safe 2022-07-30 11:38:08 +01:00
Budibase Staging Release Bot 07979bba8e Update pro version to 1.1.32-alpha.1 2022-07-29 18:39:44 +00:00
Budibase Staging Release Bot 8950e25af1 v1.1.32-alpha.1 2022-07-29 18:36:47 +00:00
Budibase Staging Release Bot 11c95b8a1a Update pro version to 1.1.32-alpha.0 2022-07-29 16:10:07 +00:00
Budibase Staging Release Bot 4a43f348d3 v1.1.32-alpha.0 2022-07-29 16:06:40 +00:00
Martin McKeaveney 4fc25e6af2 latest from master 2022-07-29 16:12:38 +01:00
Budibase Release Bot 194002e777 Update pro version to 1.1.31 2022-07-29 14:59:43 +00:00
Budibase Release Bot a8ea8a0cf3 v1.1.31 2022-07-29 14:57:51 +00:00
Budibase Staging Release Bot 130d43565b Update pro version to 1.1.29-alpha.2 2022-07-29 13:11:08 +00:00
Budibase Staging Release Bot e4fadd5cc4 v1.1.29-alpha.2 2022-07-29 13:07:37 +00:00
Peter Clement 8a77aca540 more efficient fetching of total users per app 2022-07-29 13:10:00 +01:00
Budibase Release Bot c42978109f Update pro version to 1.1.30 2022-07-28 15:25:59 +00:00
Budibase Release Bot dd1d000ca7 v1.1.30 2022-07-28 15:24:10 +00:00
Budibase Release Bot f7cf13059f Update pro version to 1.1.29 2022-07-28 09:38:37 +00:00
Budibase Release Bot 3d45434654 v1.1.29 2022-07-28 09:36:48 +00:00
Budibase Staging Release Bot 8d9794df5c Update pro version to 1.1.29-alpha.1 2022-07-28 09:36:07 +00:00
Budibase Staging Release Bot 98343adfcc v1.1.29-alpha.1 2022-07-28 09:32:56 +00:00
Budibase Staging Release Bot 6c555c121c Update pro version to 1.1.29-alpha.0 2022-07-27 20:46:40 +00:00
Budibase Staging Release Bot e30f71fc03 v1.1.29-alpha.0 2022-07-27 20:43:38 +00:00
Rory Powell 1dc062a3fb Merge branch 'master' into develop 2022-07-27 16:32:36 -04:00
Budibase Staging Release Bot 104c23f58c Update pro version to 1.1.25-alpha.5 2022-07-27 18:37:07 +00:00
Budibase Staging Release Bot 08176ad006 v1.1.25-alpha.5 2022-07-27 18:33:57 +00:00
Rory Powell 51e66d271e update pro release script 2022-07-27 14:23:17 -04:00
Budibase Staging Release Bot 3a8ad633c8 Update pro version to 1.1.25-alpha.4 2022-07-27 17:59:16 +00:00
Budibase Staging Release Bot bed505f451 v1.1.25-alpha.4 2022-07-27 17:57:32 +00:00
Rory Powell e190d1cae9 Update lockfiles in pro release 2022-07-27 13:42:06 -04:00
Budibase Release Bot 72cee3057d Update pro version to 1.1.28 2022-07-27 16:51:16 +00:00
Budibase Staging Release Bot 648c4c63b5 Update pro version to 1.1.25-alpha.3 2022-07-27 16:49:53 +00:00
Budibase Release Bot 632479ee0e v1.1.28 2022-07-27 16:49:29 +00:00
Budibase Staging Release Bot 4c39cf1baf v1.1.25-alpha.3 2022-07-27 16:47:54 +00:00
Budibase Release Bot 58984ea849 Update pro version to 1.1.27 2022-07-27 15:48:36 +00:00
Budibase Release Bot 6713c0b46d v1.1.27 2022-07-27 15:46:51 +00:00
Budibase Staging Release Bot b71050501f Update pro version to 1.1.25-alpha.2 2022-07-27 15:21:25 +00:00
Budibase Staging Release Bot 29ae9b9479 v1.1.25-alpha.2 2022-07-27 15:19:37 +00:00
Peter Clement 998f30642d Merge pull request #6571 from Budibase/feat/user-groups-tab
User Groups and User Management UI redesign
2022-07-27 16:07:30 +01:00
Peter Clement ae2b64f597 fix test naming 2022-07-27 14:45:55 +01:00
Peter Clement 6a44c60d51 update tests 2022-07-27 14:18:54 +01:00
Peter Clement 67bbe4836d comment out tests for meanwhile 2022-07-27 14:01:00 +01:00
Budibase Release Bot 75c216a94d Update pro version to 1.1.26 2022-07-27 12:36:45 +00:00
Budibase Release Bot 9fa39b0538 v1.1.26 2022-07-27 12:35:02 +00:00
Martin McKeaveney a9ef2e0193 bumping lockfiles 2022-07-27 13:24:01 +01:00
Peter Clement ff350ff295 fix type 2022-07-27 10:25:06 +01:00
Peter Clement dca37a61da adding tests and pr comments 2022-07-27 10:20:39 +01:00
Budibase Staging Release Bot 95aa4443ce Update pro version to 1.1.25-alpha.1 2022-07-26 19:44:16 +00:00
Budibase Staging Release Bot fa39900672 v1.1.25-alpha.1 2022-07-26 19:42:38 +00:00
Peter Clement 196130af08 user post processing 2022-07-26 20:20:12 +01:00
Peter Clement 548e8d518c Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab 2022-07-26 20:19:33 +01:00
Peter Clement 46a6fc5048 refactor groups into pro and some other pr comments 2022-07-26 20:04:29 +01:00
Budibase Release Bot e4b8933067 Update pro version to 1.1.25 2022-07-26 17:08:33 +00:00
Budibase Release Bot 2e3ef1c3ed v1.1.25 2022-07-26 17:06:56 +00:00
Budibase Staging Release Bot 7502d54461 Update pro version to 1.1.25-alpha.0 2022-07-26 16:37:58 +00:00
Budibase Staging Release Bot 7a2e82d6fb v1.1.25-alpha.0 2022-07-26 16:36:18 +00:00
mike12345567 d30e27d27d Merge branch 'master' of github.com:Budibase/budibase into develop 2022-07-26 17:25:55 +01:00
Budibase Release Bot 29efc89fe2 Update pro version to 1.1.24 2022-07-26 15:55:53 +00:00
Budibase Staging Release Bot b341b7e067 Update pro version to 1.1.22-alpha.2 2022-07-26 15:55:00 +00:00
Budibase Release Bot b364b7bcfe v1.1.24 2022-07-26 15:54:14 +00:00
Budibase Staging Release Bot b8d05abd8c v1.1.22-alpha.2 2022-07-26 15:53:16 +00:00
Budibase Staging Release Bot 0c9e6978bf Update pro version to 1.1.22-alpha.1 2022-07-26 14:12:42 +00:00
Budibase Staging Release Bot 9bd6cbd35c v1.1.22-alpha.1 2022-07-26 14:11:00 +00:00
Budibase Release Bot 59282f31eb Update pro version to 1.1.23 2022-07-26 12:46:25 +00:00
Budibase Release Bot 25714061df v1.1.23 2022-07-26 12:44:54 +00:00
Peter Clement cd426a5ca7 adding limits for uploading users 2022-07-26 12:17:01 +01:00
Peter Clement 3f8a006626 some more pr comments 2022-07-25 18:57:10 +01:00
Peter Clement 269701f97d moar bulkdocs 2022-07-25 17:36:57 +01:00
Peter Clement c07281639c fix builder assignment issue 2022-07-25 17:18:42 +01:00
Peter Clement 25d13d4a72 move bulk update / delete functionality out of controller 2022-07-25 16:58:30 +01:00
Budibase Release Bot ebdc871848 Update pro version to 1.1.22 2022-07-25 14:13:32 +00:00
Budibase Release Bot c96b78a9d4 v1.1.22 2022-07-25 14:11:42 +00:00
Peter Clement df3dd6431e Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab 2022-07-25 15:09:42 +01:00
Budibase Staging Release Bot 2521b59de2 Update pro version to 1.1.22-alpha.0 2022-07-22 18:38:56 +00:00
Budibase Staging Release Bot 8372900b0e v1.1.22-alpha.0 2022-07-22 18:37:20 +00:00
mike12345567 f631b17d4f Updating yarn locks. 2022-07-22 19:16:11 +01:00
mike12345567 bd7ace561a Merge branch 'master' of github.com:Budibase/budibase into develop 2022-07-22 19:14:35 +01:00
Budibase Staging Release Bot 3286d842b6 Update pro version to 1.1.18-alpha.5 2022-07-22 17:14:37 +00:00
Budibase Staging Release Bot e2b6ebc168 v1.1.18-alpha.5 2022-07-22 17:12:47 +00:00
Peter Clement af451840ac move worker middleware to backend-core 2022-07-22 11:50:51 +01:00
Peter Clement 723bbd65e4 fixing bug on multi tenant environment 2022-07-22 10:12:16 +01:00
Budibase Release Bot 7a41363098 Update pro version to 1.1.21 2022-07-22 07:34:34 +00:00
Budibase Release Bot 372e957258 v1.1.21 2022-07-22 07:32:36 +00:00
Peter Clement 0895c17a1c switch import order 2022-07-21 13:03:33 +01:00
Peter Clement d3f47a8152 removing test fix 2022-07-21 12:56:38 +01:00
Peter Clement 4ff53e5c13 test unit test fix 2022-07-21 12:48:39 +01:00
Budibase Release Bot 48648fc0fc Update pro version to 1.1.20 2022-07-21 11:24:10 +00:00
Budibase Release Bot 092e4bd98b v1.1.20 2022-07-21 11:22:27 +00:00
Peter Clement ad1cf0726f Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab 2022-07-21 11:47:08 +01:00
Peter Clement 587b02552b stop matching on prodId in some cases 2022-07-21 11:43:50 +01:00
Budibase Staging Release Bot 121e869caf Update pro version to 1.1.18-alpha.4 2022-07-21 10:02:12 +00:00
Budibase Staging Release Bot 7065fa3f60 v1.1.18-alpha.4 2022-07-21 10:00:09 +00:00
Peter Clement 88f1db74b7 updating license check to search for feature 2022-07-21 09:52:01 +01:00
Budibase Staging Release Bot 6334165b4f Update pro version to 1.1.18-alpha.3 2022-07-21 08:43:20 +00:00
Budibase Staging Release Bot bee5b6b603 v1.1.18-alpha.3 2022-07-21 08:41:47 +00:00
Budibase Release Bot fece2b639d Update pro version to 1.1.19 2022-07-21 08:36:03 +00:00
Budibase Release Bot bc4d858803 v1.1.19 2022-07-21 08:34:26 +00:00
Peter Clement 83b22fec8a move group routes to pro module 2022-07-20 15:28:20 +01:00
Budibase Release Bot 5185696b62 Update pro version to 1.1.18 2022-07-20 12:21:17 +00:00
Budibase Release Bot d106afdb16 v1.1.18 2022-07-20 12:19:41 +00:00
Budibase Staging Release Bot 8bd81367f5 Update pro version to 1.1.18-alpha.2 2022-07-20 11:13:23 +00:00
Budibase Staging Release Bot e062d2bb55 v1.1.18-alpha.2 2022-07-20 11:11:31 +00:00
Budibase Staging Release Bot 8f499d0810 Update pro version to 1.1.18-alpha.1 2022-07-20 09:23:10 +00:00
Budibase Staging Release Bot c77c5fa406 v1.1.18-alpha.1 2022-07-20 09:21:34 +00:00
Peter Clement 3fa7feeaab move controller funcs into bb pro 2022-07-19 16:03:02 +01:00
Peter Clement 94d999faf9 Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab 2022-07-19 14:54:29 +01:00
Budibase Staging Release Bot 2f317dfe73 Update pro version to 1.1.18-alpha.0 2022-07-19 13:26:44 +00:00
Budibase Staging Release Bot b54fd14cf4 v1.1.18-alpha.0 2022-07-19 13:24:56 +00:00
Peter Clement ba74fa9500 update handling of group roles 2022-07-19 14:20:57 +01:00
mike12345567 1c02c3d3c3 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-07-19 14:12:48 +01:00
Budibase Staging Release Bot 8080ddfa2b Update pro version to 1.1.15-alpha.3 2022-07-19 10:25:17 +00:00
Budibase Staging Release Bot b98c724c04 v1.1.15-alpha.3 2022-07-19 10:23:48 +00:00
Peter Clement ca41e88045 Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab 2022-07-19 11:23:31 +01:00
Michael Drury 00efa5eb04 Merge pull request #6584 from Budibase/labday/backups
CLI backups functionality
2022-07-19 11:13:59 +01:00
Budibase Release Bot 164f606cd3 Update pro version to 1.1.17 2022-07-18 17:53:26 +00:00
Budibase Release Bot 302a64b8e1 v1.1.17 2022-07-18 17:51:38 +00:00
Budibase Staging Release Bot 53f3b6d43b Update pro version to 1.1.15-alpha.2 2022-07-18 17:25:08 +00:00
Budibase Staging Release Bot df4da22a4b v1.1.15-alpha.2 2022-07-18 17:23:36 +00:00
mike12345567 dbc77049d6 Updating dependencies and pinning. 2022-07-18 17:56:04 +01:00
mike12345567 082b5571a5 Merge branch 'develop' of github.com:Budibase/budibase into labday/backups 2022-07-18 17:53:28 +01:00
Budibase Release Bot 44200d5639 Update pro version to 1.1.16 2022-07-18 14:26:22 +00:00
Budibase Release Bot bee10b5211 v1.1.16 2022-07-18 14:24:55 +00:00
Budibase Staging Release Bot 14923d3ff6 Update pro version to 1.1.15-alpha.1 2022-07-18 14:18:46 +00:00
Budibase Staging Release Bot 6768125fe9 v1.1.15-alpha.1 2022-07-18 14:17:03 +00:00
Budibase Staging Release Bot e190d67430 Update pro version to 1.1.15-alpha.0 2022-07-18 13:25:54 +00:00
Budibase Staging Release Bot f1c99997e5 v1.1.15-alpha.0 2022-07-18 13:23:56 +00:00
Budibase Release Bot d2e78b9099 Update pro version to 1.1.15 2022-07-18 13:18:27 +00:00
Budibase Release Bot c95abe380f v1.1.15 2022-07-18 13:16:48 +00:00
mike12345567 6f78b5eea8 Merge branch 'develop' of github.com:Budibase/budibase into labday/backups 2022-07-18 14:16:39 +01:00
mike12345567 6afdd6dcec Merge branch 'master' of github.com:Budibase/budibase into develop 2022-07-18 14:09:02 +01:00
mike12345567 a8a7bea658 Merge branch 'develop' of github.com:Budibase/budibase into labday/backups 2022-07-18 13:59:46 +01:00
Budibase Release Bot f8d912c36c Update pro version to 1.1.14 2022-07-18 12:15:05 +00:00
Budibase Release Bot 1ce75b1a19 v1.1.14 2022-07-18 12:13:20 +00:00
Peter Clement fb7456fa33 lint 2022-07-18 12:33:56 +01:00
Budibase Release Bot 9aa3ced132 Update pro version to 1.1.13 2022-07-18 09:55:14 +00:00
Budibase Release Bot 7f57435beb v1.1.13 2022-07-18 09:53:41 +00:00
Budibase Staging Release Bot 6395aa5387 Update pro version to 1.1.10-alpha.4 2022-07-18 09:13:56 +00:00
Budibase Staging Release Bot 468573ea91 v1.1.10-alpha.4 2022-07-18 09:12:15 +00:00