yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-06 07:50:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,583 Commits 112 Branches 487 Tags
Commit Graph

8993 Commits

Author SHA1 Message Date
Convly
1dd825035c Merge branch 'main' of github.com:strapi/strapi into features/data-transfer 2023-02-08 17:22:20 +01:00
Convly
17a7845e3d v4.6.1 2023-02-08 17:00:11 +01:00
nathan-pichon
548ad3e931
fix(file-utils): rewrite requires 2023-02-08 16:02:42 +01:00
nathan-pichon
57009a0f30
fix(file-utils): rewrite requires 2023-02-08 15:57:14 +01:00
nathan-pichon
5316123801
fix(upload-local-provider): use package require instead of absolute path 2023-02-08 15:33:49 +01:00
Jean-Sébastien Herbaux
c62c1400fb
Merge pull request #15737 from akcyp/alpine-import-fix 2023-02-08 14:24:32 +01:00
Josh
1479574ff0
Merge pull request #15744 from strapi/fix/custom-inputs-rerendering-hook 2023-02-08 12:58:00 +00:00
Josh
1f99ddfed1 Update useLazyComponents.test.js 2023-02-08 12:45:05 +00:00
Josh
642cb3d34f fix: handle the hook being re-rendered 2023-02-08 11:46:04 +00:00
ivanThePleasant
fd6bfe9f0d
Update packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js 
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
 2023-02-08 13:39:17 +02:00
ivanThePleasant
414941d28d
Update packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js 
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
 2023-02-08 13:39:09 +02:00
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
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
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
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
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
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
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
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
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
DMehaffy
bd2d0d1a12
Merge branch 'main' into fix-sharp-version 2023-02-06 14:00:43 -07:00
Boegie19
a1a09fc588 fix sharp version for macOS < 11 2023-02-06 21:53:08 +01:00
Marc-Roig
0b641bc05e pass options to forEachAsync 2023-02-06 19:11:58 +01:00
markkaylor
f0ff25c27a
Merge branch 'main' into chore/bump-ds-dep 2023-02-06 18:24:49 +01:00
Mark Kaylor
f97c352fa0 Update snapshots 2023-02-06 18:24:10 +01:00
Mark Kaylor
22abe8d250 Bump design system from 1.6.2 to 1.6.3 2023-02-06 18:20:35 +01:00