yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 20:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,539 Commits 117 Branches 489 Tags
Commit Graph

30539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ivanThePleasant
b085d2a8b8
Update packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js 
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
 2023-02-08 13:39:01 +02:00
ivanThePleasant
2edbce8dc5
Update packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js 
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
 2023-02-08 13:38:49 +02:00
Josh
0a42f13814
Merge pull request #15738 from strapi/chore/ee-seats-fe-review 2023-02-08 11:26:51 +00:00
Josh
2ff6e7769b chore: remove duplicate file 2023-02-08 11:20:26 +00:00
Rémi de Juvigny
cf4d169168
Merge branch 'main' into fix/audit-log-table 2023-02-08 11:39:51 +01:00
Rémi de Juvigny
4bbfab14fe Move migration to dedicated folder 2023-02-08 11:38:58 +01:00
Pierre Noël
b07ae9750d add todo V5 comment 2023-02-08 11:12:44 +01:00
Rémi de Juvigny
7ab5789794
Merge pull request #15733 from strapi/fix/market-cf-link 
Point CTB to the marketplace custom field category
 2023-02-08 11:11:53 +01:00
Pierre Noël
3c79572705 Set default locale when using Query Engine function createMany 2023-02-08 11:04:06 +01:00
Marc
5645d2ad0a
Merge pull request #15643 from strapi/fix/performance-degradation-in-deeply-nested-coimpos 2023-02-08 11:02:50 +01:00
Gustav Hansen
cabe932c3e Rename useLicenseLimitInfos hook 2023-02-08 10:59:46 +01:00
Convly
9e4436b15a Add a verify util to the transfer runner handler 2023-02-08 10:46:16 +01:00
Gustav Hansen
77be722048 Refactor useLicenseLimitInfos and useLicenseLimitNotifications hooks 
Co-authored-by: Josh Ellis <josh.ellis@strapi.io>
 2023-02-08 10:39:49 +01:00
akcyp
079a0fc984 Fix data import on linux alpine 2023-02-08 09:29:27 +01:00
markkaylor
9c2c9e660a
Merge pull request #15735 from strapi/feature/audit-logs-add-filters 
Add audit log filters
 2023-02-08 09:28:30 +01:00
Rémi de Juvigny
3a33df8e7e Compare content type schema against db columns 2023-02-07 20:35:04 +01:00
Rémi de Juvigny
a3e5ad460b Check schema equality before migration 2023-02-07 20:00:40 +01:00
Julie Plantey
3dbe758f4e feedback fix on tests, visually hidden element, link hover effect 2023-02-07 18:28:46 +01:00
Jamie Howard
d4e111a027 refactor(helper-plugin): function for extracting error values 2023-02-07 17:14:52 +00:00
markkaylor
b4188fc0e6
Merge branch 'main' into feature/audit-logs-add-filters 2023-02-07 17:50:37 +01:00
Rémi de Juvigny
337df63ad1 Merge remote-tracking branch 'origin/main' into fix/audit-log-table 2023-02-07 17:35:23 +01:00
Fernando Chávez
0072ce9789
Merge pull request #15708 from strapi/fix/audit-logs-check-auth-strategy 
[Audit Logs] Check auth strategy to log events on audit logs
 2023-02-07 17:25:04 +01:00
ivanThePleasant
0c3fdb43e9 Snapshot update 2023-02-07 18:12:40 +02:00
ivanThePleasant
d26d08e933 Merge branch 'main' into chore/ee-seats 2023-02-07 18:11:44 +02:00
ivanThePleasant
4e9c94f75c Fix tests, various improvements and conditions 2023-02-07 18:00:00 +02:00
Rémi de Juvigny
73a2558023 Point CTB to the marketplace custom field category 2023-02-07 16:47:16 +01:00
Christian Capeans
3a45faaf6e Merge branch 'main' into features/db-config-env-var 2023-02-07 16:38:40 +01:00
Rémi de Juvigny
3b0309b06f Fix test 2023-02-07 16:00:45 +01:00
Julie Plantey
a9ce0409bb use PopoverContent & Portal 2023-02-07 15:05:07 +01:00
Julie Plantey
f3f961d5e6 Merge branch 'main' of https://github.com/strapi/strapi into enh/helper-box 2023-02-07 14:50:11 +01:00
nathan-pichon
4eb990952f
test(review-workflow): add check on workflow data after updating stages 2023-02-07 14:49:29 +01:00
Simone Taeggi
4c8c7cf38f replace axiosInstance with the get and post methods in the getFetchClient inside the fetchEmailSettings and postEmailTest utils 2023-02-07 14:09:23 +01:00
Rémi de Juvigny
d1a1754d3d Typo 2023-02-07 12:27:35 +01:00
Rémi de Juvigny
ee2f5f07b4 Add auto db migration 2023-02-07 12:11:28 +01:00
Mark Kaylor
b437225fc4 Merge branch 'main' of github.com:strapi/strapi into audit-logs/add-filters 2023-02-07 11:14:32 +01:00
markkaylor
b4c67d427e
Merge pull request #15706 from strapi/chore/bump-ds-dep 
Bump design system from 1.6.1 to 1.6.3
 2023-02-07 11:14:05 +01:00
Simone
862e5e8d8b
Merge branch 'main' into enhancement/axios-migration-i18n 2023-02-07 10:55:49 +01:00
Nathan Pichon
62f1c3d04a
Merge pull request #15216 from tomscytale/features/patreon-auth-provider 
Add Patreon as an Oauth2 Provider in the Users & Permissions plugin
 2023-02-07 10:49:58 +01:00
markkaylor
53a0664b40
Merge pull request #15687 from strapi/fix/json-input-validation 
[content manager] Return required error if empty for json input
 2023-02-07 10:47:45 +01:00
Simone Taeggi
8ddfc49652 replace axiosInstance in the CMEditViewCopyLocale component to replace the api call with the useFetchClient get method 2023-02-07 10:46:34 +01:00
ivanThePleasant
7edd834712 Merge branch 'main' into chore/ee-seats 2023-02-07 11:28:21 +02:00
ivanThePleasant
ebdf9c06c2 WIP add redux support to license limit hook, various minor changes 
Co-authored-by: Gustav Hansen <gu@stav.dev>
 2023-02-07 11:27:44 +02:00
Gustav Hansen
6942cf5002
Merge pull request #15695 from strapi/chore/jest-coverage-ee 
Jest: Collect coverage for ee admin folders
 2023-02-07 10:05:32 +01:00
dependabot[bot]
27ff5c0a0d
chore(deps): bump nodemailer from 6.8.0 to 6.9.1 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.8.0 to 6.9.1.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.8.0...v6.9.1)

---
updated-dependencies:
- dependency-name: nodemailer
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-07 09:02:39 +00:00
nathan-pichon
8f622ae7e0
feat(review-workflow): add update route for stages on workflows 2023-02-07 09:55:32 +01:00
Gustav Hansen
2c9d875fea Jest: Collect coverage for ee admin folders 2023-02-07 09:04:21 +01:00
Gustav Hansen
fb4b40bde4 Merge branch 'main' into feature/review-workflow 2023-02-07 09:01:38 +01:00
Josh
3e1bfbbe87
Merge pull request #15725 from Boegie19/fix-sharp-version 
fix https://github.com/strapi/strapi/issues/15614
fixes https://github.com/strapi/strapi/issues/15614
 2023-02-07 08:01:04 +00:00
DMehaffy
03c0a8fbaa
Merge pull request #15696 from strapi/workflows/deits 
Update auto-label workflow to include DEITS label
 2023-02-06 21:38:42 -07:00
DMehaffy
bd2d0d1a12
Merge branch 'main' into fix-sharp-version 2023-02-06 14:00:43 -07:00