yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-16 02:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,413 Commits 107 Branches 504 Tags
Commit Graph

7295 Commits

Author SHA1 Message Date
Simone Taeggi
20c19132cb clean up code, change baseURL and fix some typos 2023-01-11 15:06:08 +01:00
Simone Taeggi
88956575f9 replace the singleton instance 2023-01-11 14:47:13 +01:00
Julie Plantey
7ff704ad90 chore: fix snapshot 2023-01-11 14:06:37 +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
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
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
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
Convly
6f07d33f88 Disable lodash template's escape 2023-01-09 18:28:30 +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
Julie Plantey
835b47f433 fix sort CM LeftMenu 2023-01-09 15:58:27 +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
denisukvadim
e137627f07
fix runMigrations (15308) 2023-01-07 01:36:38 +02:00
Jamie Howard
148d6f0e49 chore(content-manager): code cleanup 2023-01-06 16:42:14 +00:00
Jamie Howard
b6d570a9dc chore(content-manager): refactor 2023-01-06 16:30:33 +00:00
Jamie Howard
7c6ff32d53 test(content-manager): cover nested content cases 2023-01-06 16:01:11 +00:00
Josh
210bce6ff0 refactor: use browserlistrc 2023-01-06 15:48:39 +00:00
Jamie Howard
b2ca1f074a fix(content-manager): use __temp_key__ indexing with deeply nested content 2023-01-06 13:18:26 +00:00
Josh
d365106a17 chore: add browserlist spec 2023-01-06 11:54:09 +00:00
Gustav Hansen
16fb8dfe0c
Merge pull request #15288 from ivan-ha/fix/relations-i18n 
fix: translations of RelationInputDataManager
 2023-01-06 10:04:28 +01:00
Ivan Ha
e41226d794 fixup! fix: translations of RelationInputDataManager 2023-01-06 11:43:54 +08:00
Jamie Howard
74e3870eca test(content-manager): EditViewDataManagerProvider/reducer 
test(content-manager): useRelation

test(content-manager): RelationInputDataManager
 2023-01-05 16:05:35 +00:00
Marc-Roig
a05bdd83ae change firstSeen to mappedRelationsIndex 2023-01-05 16:44:18 +01:00
Jamie Howard
48a8cba6db chore(content-manager): revert unnecessary changes 2023-01-05 14:40:37 +00:00
Jamie Howard
d2bb3e2254 fix(content-manager): EditViewDataManagerProvider load relations using __temp_key__ 2023-01-05 14:26:58 +00:00