yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 17:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,097 Commits 115 Branches 488 Tags
Commit Graph

7070 Commits

Author SHA1 Message Date
Mark Kaylor
cfd9262878 Merge branch 'main' of github.com:strapi/strapi into fix/custom-fields-breaking-inputs 2022-11-23 21:36:30 +01:00
markkaylor
94cd474940
Merge pull request #14881 from strapi/chore/refactor-edit-view 
[Content manager] Refactor edit view
 2022-11-23 21:26:09 +01:00
Convly
a60467889d Add media export capabilities for strapi source & fil file destination provider 2022-11-23 18:29:51 +01:00
Convly
1f5ff646b9 Merge branch 'features/deits' of github.com:strapi/strapi into deits/export-media 2022-11-23 16:50:43 +01:00
Jean-Sébastien Herbaux
f67c4b440f
Merge branch 'main' into features/morphs-populate 2022-11-23 16:13:09 +01:00
Jamie Howard
df0fe1c9be fix(entity-validator): improve error messaging 2022-11-23 14:32:26 +00:00
Nathan Pichon
4e6a8bf672
Merge branch 'main' into fix/file-upload-components 2022-11-23 15:00:44 +01:00
Christian Capeans
83d4e6ce2a Delete unnecessary file 2022-11-23 14:19:48 +01:00
Christian Capeans
693e403416 Adapt tests to the last implementation changes 2022-11-23 14:18:41 +01:00
Simone
32dfac9e12
Merge branch 'main' into enhancement/axios-refactoring 2022-11-23 14:15:11 +01:00
Ben Irvin
def5713be8 handle invalid version strings 2022-11-23 14:08:47 +01:00
Mark Kaylor
e63b41b73a Remove comment and named export 2022-11-23 14:01:41 +01:00
Christian Capeans
25eca9a709 Change jest config to use swc 2022-11-23 13:48:48 +01:00
Christian Capeans
fa8d4a5801 Add tests for local file destination provider 2022-11-23 13:41:51 +01:00
Julie Plantey
0c408f9bda
Merge pull request #14883 from alekskorolev3/fix-RU-lang 
Update russian translation
 2022-11-23 13:38:28 +01:00
Alexandre BODIN
7d64a36867
Merge pull request #14870 from jorgeRambla/patch-2 
Resolves https://github.com/strapi/strapi/issues/14869
 2022-11-23 12:18:32 +01:00
Alexandre BODIN
463d78a4c1
Merge pull request #14666 from strapi/dependabot/npm_and_yarn/commander-8.3.0 2022-11-23 12:16:02 +01:00
Ben Irvin
c4a797b696 merge features branch 2022-11-23 12:13:33 +01:00
Ben Irvin
a436e20039 improve schemamatching test 2022-11-23 12:11:17 +01:00
Ben Irvin
60fe1ceb70 add tests for version matching and schema matching 2022-11-23 12:07:20 +01:00
Convly
d99dc608f4 Merge branch 'main' of github.com:strapi/strapi into features/deits 2022-11-23 11:35:53 +01:00
Bassel
40e76c2fa8 Merge branch 'features/deits' into deits/restore-mechanism 2022-11-23 11:50:00 +02:00
Simone
d734345ccd
Merge branch 'main' into enhancement/axios-refactoring 2022-11-23 10:30:08 +01:00
Bassel
357ff8ad49 change name to beforeStreaming 2022-11-23 11:29:49 +02:00
markkaylor
a91fe47990
Merge branch 'main' into fix/custom-fields-breaking-inputs 2022-11-23 10:24:39 +01:00
Madhuri Sandbhor
c693065ad1
Merge pull request #14814 from strapi/feature/marketplace-additional-sort-options 
[Marketplace] Exp-373 Update the sort options in SelectSort component
 2022-11-23 10:22:52 +01:00
Mark Kaylor
dfac1a9edd Use Set instead of filter 2022-11-23 10:21:58 +01:00
Ben Irvin
a2f92459ff move helpers to utils 2022-11-23 10:19:28 +01:00
Simone Taeggi
6591dd051b move the condition inside the function 2022-11-23 10:02:26 +01:00
Simone Taeggi
159a40f2e3 Merge branch 'main' into chore/tracking-edit-field-name 2022-11-23 09:55:11 +01:00
Simone Taeggi
8384278292 Merge branch 'enhancement/axios-refactoring' of github.com:strapi/strapi into enhancement/axios-refactoring 2022-11-23 09:49:38 +01:00
Simone Taeggi
e867a11ebe change how we cancel the axios request using abortController 2022-11-23 09:49:24 +01:00
Simone
e811f82618
Merge branch 'main' into enhancement/axios-refactoring 2022-11-23 09:31:30 +01:00
markkaylor
34b24b485e
Merge branch 'main' into chore/refactor-edit-view 2022-11-23 09:17:28 +01:00
markkaylor
a6193d04e1
Merge pull request #14590 from strapi/feature/custom-field-default-options 
[Custom fields] Add default value to options
 2022-11-23 09:16:42 +01:00
Simone Taeggi
fa89f174c3 Merge branch 'main' into chore/tracking-edit-field-name 2022-11-23 00:14:26 +01:00
Simone Taeggi
59b86944a3 refactor the event didEditFieldNameOnContentType triggered when we edit the field name 2022-11-23 00:13:19 +01:00
Simone Taeggi
e3fa29997f Merge branch 'main' into chore/tracking-edit-field-name 2022-11-22 19:58:12 +01:00
Simone Taeggi
852c9b44d0 Merge branch 'enhancement/axios-refactoring' of github.com:strapi/strapi into enhancement/axios-refactoring 2022-11-22 19:57:28 +01:00
Simone Taeggi
39f1382f6d change comment content 2022-11-22 19:57:17 +01:00
Simone
a4233b4864
Merge branch 'main' into enhancement/axios-refactoring 2022-11-22 19:55:25 +01:00
Artsiom Ulasevich
0e4636b237
Merge branch 'main' into fix-RU-lang 2022-11-22 21:38:30 +03:00
Josh
a73dc6fe78
Merge pull request #14849 from strapi/fix/card-badge 2022-11-22 17:18:53 +00:00
dependabot[bot]
c16f5b9ebb
chore(deps): bump commander from 8.2.0 to 8.3.0 
Bumps [commander](https://github.com/tj/commander.js) from 8.2.0 to 8.3.0.
- [Release notes](https://github.com/tj/commander.js/releases)
- [Changelog](https://github.com/tj/commander.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tj/commander.js/compare/v8.2.0...v8.3.0)

---
updated-dependencies:
- dependency-name: commander
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-22 17:04:47 +00:00
Alexandre Bodin
bcb1b7f472 v4.5.2 2022-11-22 17:54:52 +01:00
Simone
bf5ba30d5b
Merge branch 'main' into enhancement/axios-refactoring 2022-11-22 16:48:04 +01:00
Alexandre BODIN
2574c22b30
Merge pull request #14961 from strapi/chore/fix-webpack-build 2022-11-22 16:45:50 +01:00
Simone Taeggi
8a8b76e034 Merge branch 'main' into chore/tracking-edit-field-name 2022-11-22 16:19:03 +01:00
Simone Taeggi
ed29b46465 Merge branch 'main' into enhancement/axios-refactoring 2022-11-22 16:14:39 +01:00
Simone Taeggi
5638f9bcea test for the getFetchClient 2022-11-22 16:12:00 +01:00