yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 01:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 115 Branches 488 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Irvin
1a8b26386f update yarn.lock 2022-12-06 16:27:10 +01:00
Julie Plantey
4e873bd6c8
Merge pull request #15058 from strapi/authLogo/frontend 
[features][authLogo] customize auth logo through admin panel
 2022-12-06 16:01:25 +01:00
Ben Irvin
fdf5a83ff9
Merge branch 'features/deits' into deits/ts-strapi-eslint-config 2022-12-06 16:00:55 +01:00
Ben Irvin
5cd9ab530e merge features/deits 2022-12-06 15:52:42 +01:00
Julie Plantey
c4ddaa7538 add formDisabled test for EditFolderDialog 2022-12-06 15:26:59 +01:00
Convly
4561228824 Merge branch 'features/deits' of github.com:strapi/strapi into deits/fix-local-file-source-archive-extraction 2022-12-06 15:05:04 +01:00
Pierre Noël
b174c7a5d8 use table instead of temporary table for mysql 5 2022-12-06 14:29:56 +01:00
Pierre Noël
ded213f13f manual rollback 2022-12-06 14:29:56 +01:00
Pierre Noël
12f3bb794c add comment 2022-12-06 14:29:56 +01:00
Pierre Noël
09bd93e28d add test that is sensible to foreign key deadlocks 2022-12-06 14:29:56 +01:00
Pierre Noël
3a2f6490e6 reduce transaction size 2022-12-06 14:29:56 +01:00
Pierre Noël
e295276048 update/create/delete components sequentially instead of in parallel 2022-12-06 14:29:55 +01:00
Josh
f1a47fbc4a
Merge pull request #15079 from strapi/feat/dynamic-zone-dragndrop 2022-12-06 12:58:15 +00:00
Gustav Hansen
fafdaa4e11
Merge pull request #14359 from GitStartHQ/STRAP-63 
ML: Empty state is shown after deleting all assets from a page
 2022-12-06 13:29:07 +01:00
Gustav Hansen
acada6047e
Merge pull request #15090 from strapi/dependabot/npm_and_yarn/jest-styled-components-7.1.1 
chore(deps-dev): bump jest-styled-components from 7.0.2 to 7.1.1
 2022-12-06 13:10:01 +01:00
Gustav Hansen
4cf4638a01
Merge pull request #15092 from strapi/fix/upload-crop-folders 
Preserve folder id when cropping images
 2022-12-06 12:56:59 +01:00
Josh
32a95dea16 test: fix reducer tests 2022-12-06 11:41:21 +00:00
Gustav Hansen
77ee53db64
Merge pull request #15083 from strapi/dependabot/npm_and_yarn/decode-uri-component-0.2.2 
chore(deps): bump decode-uri-component from 0.2.0 to 0.2.2
 2022-12-06 12:40:19 +01:00
Josh
15cd86c542 fix: button background 2022-12-06 11:36:03 +00:00
Gustav Hansen
67ad079472 Chore: Update snapshot tests 2022-12-06 12:35:31 +01:00
Gustav Hansen
851425e82b
Merge pull request #14988 from strapi/dependabot/npm_and_yarn/react-router-dom-5.3.4 
chore(deps): bump react-router-dom from 5.2.0 to 5.3.4
 2022-12-06 12:31:38 +01:00
Julie Plantey
89cda31a8d expend MediaLibrary and BrowseStep tests coverage for listview 2022-12-06 12:27:39 +01:00
Gustav Hansen
ee3f87243f
Merge pull request #15052 from GitStartHQ/fix/editor-wrong-focus-checking 
fix: wrong editor focus checking method
 2022-12-06 12:27:29 +01:00
Mark Kaylor
972bdd72cc Move service to the ee folder 2022-12-06 12:14:33 +01:00
Gustav Hansen
eabf3ebc0e EditAssetDialog: Create cropped image in the same folder as the original 2022-12-06 12:13:32 +01:00
Gustav Hansen
a19579634c useEditAsset: Send folder.id instead of full folder object 2022-12-06 12:12:58 +01:00
Mark Kaylor
353e9a4116 Pr feedback 2022-12-06 11:45:27 +01:00
Josh
04a6cd4861 fix: use __temp_key__ for when you've just added components and theres no IDs 2022-12-06 10:26:00 +00:00
Julie Plantey
6b97780038 chore: breakdown ImageCardAsset format and size displayed test 2022-12-06 11:10:21 +01:00
dependabot[bot]
bcd8f86dde
chore(deps-dev): bump jest-styled-components from 7.0.2 to 7.1.1 
Bumps [jest-styled-components](https://github.com/styled-components/jest-styled-components) from 7.0.2 to 7.1.1.
- [Release notes](https://github.com/styled-components/jest-styled-components/releases)
- [Changelog](https://github.com/styled-components/jest-styled-components/blob/main/CHANGELOG.md)
- [Commits](https://github.com/styled-components/jest-styled-components/compare/v7.0.2...v7.1.1)

---
updated-dependencies:
- dependency-name: jest-styled-components
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-06 09:05:14 +00:00
Bassel
1e66b27892 Merge branch 'features/deits' into deits/import-configs 2022-12-06 11:02:56 +02:00
Bassel
c0f10750b7 add some changes and types 2022-12-06 10:59:48 +02:00
Jean-Sébastien Herbaux
8755085241
Update package.json 2022-12-06 09:44:21 +01:00
Josh
b041dcb8c4 chore: tweak action placement 2022-12-06 08:18:50 +00:00
Alexandre BODIN
aab5b9cb11
Merge pull request #14986 from strapi/dependabot/npm_and_yarn/sqlite3-5.1.2 2022-12-06 09:16:36 +01:00
Hasta
84033967d8
Merge branch 'main' into main 2022-12-05 19:05:15 +01:00
Daniele Rubetti
f3f06c31e9
Merge branch 'main' into fix/factories-types 2022-12-05 18:56:45 +01:00
Convly
27f94c6e13 Remove console.log 2022-12-05 18:31:26 +01:00
Convly
26a7f82221 Modify the local file source provider and how it extracts information from the archive 2022-12-05 18:17:31 +01:00
Mark Kaylor
fe3ae1dad8 Test audit log service 2022-12-05 18:06:07 +01:00
Julie Plantey
3835a29126 Merge branch 'main' of https://github.com/strapi/strapi into features/MediaLibrary-listview 2022-12-05 17:32:52 +01:00
Josh
968aec8a11 chore: pr amends 2022-12-05 15:31:21 +00:00
Josh
c6d875982b
Merge pull request #15016 from tomscytale/fix/plugin-example 2022-12-05 15:26:00 +00:00
Julie Plantey
40b3a78e76 chore: design and wording fixes 2022-12-05 15:24:10 +01:00
Rémi de Juvigny
cfc2fb5604 Init audit logs service 2022-12-05 15:13:48 +01:00
Julie Plantey
d20474630f chrore: feedback fix Form tests 2022-12-05 14:59:58 +01:00
Marc-Roig
02a23a00ef rephrase connect relation error 2022-12-05 14:41:20 +01:00
dependabot[bot]
90957be180
chore(deps): bump decode-uri-component from 0.2.0 to 0.2.2 
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-05 12:58:32 +00:00
Josh
d6d7465e04
Merge pull request #15022 from strapi/dependabot/npm_and_yarn/msw-0.49.1 2022-12-05 12:57:44 +00:00
Christian Capeans
0770e312fd Merge branch 'features/deits' into deits/import-assets 2022-12-05 13:14:54 +01:00