yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-05 15:29:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 112 Branches 487 Tags
Commit Graph

9899 Commits

Author SHA1 Message Date
Julie Plantey
7ff704ad90 chore: fix snapshot 2023-01-11 14:06:37 +01:00
Marc-Roig
1ef6230f20 change attribute name displayed in warning 2023-01-11 13:55:45 +01:00
Josh
031640ea36
Merge pull request #15265 from strapi/fix/reorder-dz-and-repeatbles-relations 
Fixes https://github.com/strapi/strapi/issues/14908
 2023-01-11 12:52:01 +00:00
Julie Plantey
aa043810b5 Merge branch 'main' of https://github.com/strapi/strapi into features/authLogo 2023-01-11 13:49:26 +01:00
Simone Taeggi
d865af072b temporary solution 2023-01-11 13:41:29 +01:00
Mark Kaylor
8aa41242bf Add JSON component to modal 2023-01-11 13:20:32 +01:00
Ben Irvin
7a49c8998d remove export 2023-01-11 12:18:53 +01:00
Ben Irvin
e9eed5668e add tests 2023-01-11 12:18:44 +01:00
Marc-Roig
37ff580b1d change error to warning 2023-01-11 11:51:54 +01:00
Jamie Howard
8677580c38 test(content-manager): utils/paths getInitialDataPathUsingTempKeys 2023-01-11 10:42:18 +00:00
Jamie Howard
5ef73b2e93 test(content-manager): update snapshot 2023-01-11 10:27:21 +00:00
Gustav Hansen
467080cb94
Merge pull request #15405 from strapi/dependabot/npm_and_yarn/storybook/manager-webpack5-6.5.15 
chore(deps-dev): bump @storybook/manager-webpack5 from 6.4.10 to 6.5.15
 2023-01-11 11:20:11 +01:00
Josh
985e1930a2
Update packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js 2023-01-11 10:15:20 +00:00
Ben Irvin
cbfcdf95f6 remove export 2023-01-11 11:13:25 +01:00
Ben Irvin
11b8d3c9f3 refactor 2023-01-11 11:07:51 +01:00
dependabot[bot]
e3222fd9ba
chore(deps-dev): bump @storybook/manager-webpack5 from 6.4.10 to 6.5.15 
Bumps [@storybook/manager-webpack5](https://github.com/storybookjs/storybook/tree/HEAD/lib/core) from 6.4.10 to 6.5.15.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.15/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.15/lib/core)

---
updated-dependencies:
- dependency-name: "@storybook/manager-webpack5"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-11 09:44:05 +00:00
Josh
4d5f2fd152 fix: use browserlist for minification 2023-01-11 09:42:26 +00:00
Jean-Sébastien Herbaux
f1312e6b88
Merge pull request #14208 from strapi/fix/service-typings 2023-01-11 10:23:42 +01:00
Pierre Noël
576ef90f51
Merge pull request #14767 from iifawzi/single-types-not-publish 
Fix: Publishing single-type if config is true, and allow updating the drafts - api
 2023-01-11 10:20:57 +01:00
Nathan Pichon
f51778cf4f
Merge pull request #15051 from strapi/authLogo/backend 
feat: added authLogo setting
 2023-01-11 09:55:55 +01:00
DMehaffy
82947f0375
Merge pull request #15397 from strapi/security/fixJWT 
Fix CVE-2022-23539 / CVE-2022-23541 / CVE-2022-23540 / CVE-2022-23529
 2023-01-10 12:26:16 -07:00
Josh
18216cae43 tests: fix em 2023-01-10 17:55:22 +00:00
Josh
a9d481673d fix: cleanData can now check the original location of the relation for correct comparison 2023-01-10 17:43:29 +00:00
Simone Taeggi
3fdd100107 move the logic from admin to helper-plugin 2023-01-10 17:59:58 +01:00
Jean-Sébastien Herbaux
4291b033a2
Merge branch 'main' into fix/service-typings 2023-01-10 17:04:19 +01:00
Jean-Sébastien Herbaux
e3995c594c
Merge branch 'main' into fix/factories-types 2023-01-10 17:00:43 +01:00
derrickmehaffy
c770a253ba Fix CVE-2022-23539 / CVE-2022-23541 / CVE-2022-23540 / CVE-2022-23529 2023-01-10 07:50:43 -07:00
Marc-Roig
64bf4b8f1d return entities without loaded relations 2023-01-10 15:15:01 +01:00
Josh
99f1b3a8b6 Merge branch 'main' into feature/relations-reordering 2023-01-10 14:03:27 +00:00
Josh
8d6a247b14 fix: tidy-up name solving function and handle refetching and removing 2023-01-10 13:58:55 +00:00
Jamie Howard
168fe777d5 fix(content-manager): initial data indexing 2023-01-10 12:56:32 +00:00
Marc-Roig
610ce2aadf simplify marking relation as computed 2023-01-10 11:20:16 +01:00
Ben Irvin
17a547e78f
Merge branch 'main' into bagfix/15308 2023-01-10 11:07:30 +01:00
Marc-Roig
5a185f1e00 delete duplicate relation in connect array 2023-01-10 10:58:56 +01:00
Jean-Sébastien Herbaux
921d30961d
Merge pull request #15385 from strapi/fix/email-templates-interpolation 2023-01-10 10:45:33 +01:00
Marc-Roig
b81cfb0055 do not allow to connect same relation more than once 2023-01-10 10:45:31 +01:00
Julie Plantey
479bdde67e
Merge pull request #15032 from lkho/pr/admin-content-type-builder-nav-sort 
[admin] fix left menu sorting behaviour
 2023-01-10 10:36:50 +01:00
Fernando Chavez
65e29e5f61 Merge fix 2023-01-10 09:42:33 +01:00
Convly
6f07d33f88 Disable lodash template's escape 2023-01-09 18:28:30 +01:00
Christian Capeans
14cf30e400 Rename number of content types 2023-01-09 18:15:38 +01:00
Convly
7c391c2c19 Merge branch 'main' of github.com:strapi/strapi into fix/email-templates-interpolation 2023-01-09 16:53:21 +01:00
Jamie Howard
143ddc8466 chore(content-manager) 2023-01-09 15:03:02 +00:00
Jamie Howard
71ce491e2a fix(content-manager): compute path to initialData in RelationInputDataManager 2023-01-09 15:00:00 +00:00
Convly
9c1581c94f Fix remote push controller typings 2023-01-09 15:58:41 +01:00
Julie Plantey
835b47f433 fix sort CM LeftMenu 2023-01-09 15:58:27 +01:00
Convly
5172f7bc8f Rename providers' create read/write stream methods 2023-01-09 15:27:48 +01:00
Rémi de Juvigny
9b5dd1b562 Fix modal labelledBy 2023-01-09 14:37:50 +01:00
Josh
107e0d59b9 feat: add in prompt to CTB modals to avoid premature closing and data loss 2023-01-09 12:13:16 +00:00
Rémi de Juvigny
26f750d8a6 feedback 2023-01-09 12:06:36 +01:00
Fernando Chavez
4a2cc232fe Fix tests 2023-01-09 11:31:28 +01:00