yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-23 16:19:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,106 Commits 121 Branches 490 Tags
Commit Graph

9373 Commits

Author SHA1 Message Date
Ben Irvin
0fb2249d2b revert re-ordering 2022-12-07 12:01:34 +01:00
Ben Irvin
2b3206afea fixes from bad merge 2022-12-07 11:56:21 +01:00
Ben Irvin
6d0251ea2b
Merge branch 'features/deits' into deits/ts-strapi-eslint-config 2022-12-07 11:52:37 +01:00
Bassel
f55ec2a673 use any instead 2022-12-07 12:00:45 +02:00
Bassel
7a9a1d27ba check strapi exists before running restore 2022-12-07 11:41:12 +02:00
Bassel
db8dac601f Merge branch 'features/deits' into deits/import-configs 2022-12-07 11:36:18 +02:00
Bassel
3122926a55 add types for webhook and corestore 2022-12-07 11:30:33 +02:00
Convly
cc2aabfcc3 Merge branch 'features/deits' of github.com:strapi/strapi into deits/import-entities 2022-12-07 10:09:29 +01:00
dependabot[bot]
472e72fe44
chore(deps): bump sharp from 0.31.0 to 0.31.2 
Bumps [sharp](https://github.com/lovell/sharp) from 0.31.0 to 0.31.2.
- [Release notes](https://github.com/lovell/sharp/releases)
- [Changelog](https://github.com/lovell/sharp/blob/main/docs/changelog.md)
- [Commits](https://github.com/lovell/sharp/compare/v0.31.0...v0.31.2)

---
updated-dependencies:
- dependency-name: sharp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-07 09:06:36 +00:00
dependabot[bot]
a3d3471a1f
chore(deps): bump debug from 4.3.1 to 4.3.4 
Bumps [debug](https://github.com/debug-js/debug) from 4.3.1 to 4.3.4.
- [Release notes](https://github.com/debug-js/debug/releases)
- [Commits](https://github.com/debug-js/debug/compare/4.3.1...4.3.4)

---
updated-dependencies:
- dependency-name: debug
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-07 09:05:10 +00:00
dependabot[bot]
14f0d2e047
chore(deps): bump sanitize-html from 2.7.1 to 2.7.3 
Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) from 2.7.1 to 2.7.3.
- [Release notes](https://github.com/apostrophecms/sanitize-html/releases)
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apostrophecms/sanitize-html/compare/2.7.1...2.7.3)

---
updated-dependencies:
- dependency-name: sanitize-html
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-07 09:02:41 +00:00
Convly
60fd096e90 Remove decompress & decrypt commands, automatically detect export file transforms 2022-12-07 09:43:27 +01:00
Josh
24074df173 chore: fix tests 2022-12-07 08:30:23 +00:00
Josh
06934f2323 fix: use a flag to specifically set modified data only when copying a locales data over 2022-12-06 17:00:47 +00:00
Pierre Noël
05f3335b2a reduce temporary table name length 2022-12-06 17:21:48 +01:00
gitstart
552f8b5056 fix: application crash when deleting a filter 2022-12-06 16:08:15 +00:00
Julie Plantey
bda682de43 Merge branch 'main' of https://github.com/strapi/strapi into features/authLogo 2022-12-06 17:03:24 +01:00
Jamie Howard
141f89f81f
Merge pull request #14973 from strapi/fix/entity-validator-error-messaging 
[entity-validator] Improve error messaging
 2022-12-06 15:50:49 +00:00
Julie Plantey
5a6529ab8d Merge branch 'main' of https://github.com/strapi/strapi into features/MediaLibrary-listview 2022-12-06 16:32:38 +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
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
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
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
Josh
b041dcb8c4 chore: tweak action placement 2022-12-06 08:18:50 +00: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