yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 16:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,604 Commits 112 Branches 488 Tags
Commit Graph

21604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniele Aurilio
63da344269
Merge branch 'strapi:master' into releases/v4 2022-06-18 17:05:15 +02:00
tiagolima90
ce278635a9
Merge branch 'strapi:master' into master 2022-06-17 10:54:44 +00:00
Pierre Noël
0039c33952 add deprecation message 2022-06-16 19:49:30 +01:00
Pierre Noël
0fbcd89ec8 add e2e test to check image dimensions are populated 2022-06-16 19:37:18 +01:00
Pierre Noël
c69ac511f4 Save dimensions for svg and gif images 2022-06-16 17:56:12 +01:00
Pierre Noël
02768b6fff
Merge pull request #13370 from cortopy/upload-plugin-replace-media-await 
add missing await in upload plugin
 2022-06-16 16:45:26 +01:00
meherchandan
584ed889c6 Merge remote-tracking branch 'upstream/master' 2022-06-16 16:16:43 +04:00
Convly
38e29b7110 fix style 2022-06-16 13:00:41 +02:00
Noeemi
512082fc09 fix(content-type-builder/attribute-option): align text to the left 2022-06-16 12:22:59 +02:00
Klaudia
fc385940a4
Merge branch 'master' into update-pl-translation 2022-06-16 11:51:30 +02:00
Noeemi
4b08395b47 feat(translations): update and add missing PL translations 2022-06-16 11:27:07 +02:00
Convly
34bb591cea Enable filtering on nested components 2022-06-16 10:21:03 +02:00
Anjali MahawR
73795d13b0 tests updated successfully in languageNativeNames.js 2022-06-16 00:20:33 -04:00
ronronscelestes
e4b9249576 updated branch and fixed snapshots 2022-06-15 19:37:13 +01:00
ronronscelestes
459e04f99b Merge branch 'master' of https://github.com/strapi/strapi into fix/authenticated-app-tests 2022-06-15 19:21:00 +01:00
Pierre Burgy
632672a95c
Merge pull request #13567 from strapi/releases/4.2.0 
Releases/4.2.0
 2022-06-15 18:04:45 +02:00
Jean-Sébastien Herbaux
c5ffea6ff2
Merge pull request #13566 from strapi/4.2.0 
4.2.0
 2022-06-15 15:17:49 +02:00
Convly
642b6a37e0 4.2.0 2022-06-15 15:09:07 +02:00
Gustav Hansen
fec5e68074
Merge pull request #13562 from strapi/dependabot/npm_and_yarn/eslint-plugin-react-hooks-4.6.0 
Bump eslint-plugin-react-hooks from 4.5.0 to 4.6.0
 2022-06-15 14:02:58 +02:00
dependabot[bot]
3ac38aa733
Bump eslint-plugin-react-hooks from 4.5.0 to 4.6.0 
Bumps [eslint-plugin-react-hooks](https://github.com/facebook/react/tree/HEAD/packages/eslint-plugin-react-hooks) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/HEAD/packages/eslint-plugin-react-hooks)

---
updated-dependencies:
- dependency-name: eslint-plugin-react-hooks
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-15 09:06:28 +00:00
Jean-Sébastien Herbaux
2cc62a0756
Merge pull request #13561 from strapi/master 
Update 4.2.0 with master
 2022-06-15 10:35:56 +02:00
Jean-Sébastien Herbaux
aeb21ff85e
Merge pull request #13105 from jorgeRambla/fix/upload-plugin 
Fix upload plugin
 2022-06-15 09:45:42 +02:00
markkaylor
b21bfb0e8d
Merge pull request #13543 from strapi/features/providers 
[Marketplace] Add providers to marketplace
 2022-06-15 09:36:52 +02:00
杨飞
4606ffeb90 feat(translations): add several items in zh-Hans 2022-06-15 13:43:55 +08:00
markkaylor
e75fbef7f0
Merge pull request #13546 from strapi/providers/submit-provider-button 
[Marketplace] Add submit providers button
 2022-06-14 17:23:50 +02:00
Julie Plantey
07bc405c06
Merge pull request #13442 from kiri-rin/PR/karakalpak-locale 
kara-kalpak locale
 2022-06-14 16:11:42 +02:00
Mark Kaylor
6ebc596603 update translation 2022-06-14 15:40:40 +02:00
Mark Kaylor
db343dc78c remove your from cta 2022-06-14 15:39:24 +02:00
meherchandan
e00b8f048d fix: postgres timeout error due to complex join queries to fect foreign key references 2022-06-14 17:17:53 +04:00
Mark Kaylor
54d5f9d0ae add tests 2022-06-14 14:15:58 +02:00
Mark Kaylor
e6f395e901 use default prop 2022-06-14 12:29:43 +02:00
Mark Kaylor
9c30260c21 add submit provider button 2022-06-14 12:22:35 +02:00
Mark Kaylor
a7bb9539e0 Merge branch 'master' of github.com:strapi/strapi into features/providers 2022-06-14 10:02:01 +02:00
Rémi de Juvigny
c8cf579fb7
Merge pull request #13501 from strapi/providers/search 
Add search to marketplace providers
 2022-06-13 16:47:55 +02:00
markkaylor
1b939315b6
Merge pull request #13462 from strapi/providers/add-tabs 
[marketplace] add providers tabs
 2022-06-13 14:13:07 +02:00
Sijawusz Pur Rahnama
acd12eaab7
Use ctx._matchedRoute instead of ctx.request.url for Sentry transaction name 2022-06-09 22:37:33 +02:00
kiri
c85b2a8963 update snapshot 2022-06-09 22:21:02 +07:00
Rémi de Juvigny
cf22c0febd Add tests for provider search 2022-06-08 11:44:32 +02:00
Rémi de Juvigny
c01c8b0857 Update search translations 2022-06-08 11:26:51 +02:00
Rémi de Juvigny
68b0c271df Add providers search to marketplace 2022-06-08 11:09:00 +02:00
Daniele Aurilio
c093a70690
Merge branch 'strapi:master' into releases/v4 2022-06-07 20:49:11 +02:00
Mark Kaylor
9d40d0caa7 add tests for providers tab 2022-06-07 15:21:06 +02:00
Mark Kaylor
00f5dd39c6 add tests for plugins tab 2022-06-07 15:07:05 +02:00
Mark Kaylor
e9288e20fd update snapshot 2022-06-07 14:11:57 +02:00
Alexandre Bodin
c12bde7e87 Merge branch 'master' into releases/4.2.0 2022-06-07 12:15:44 +02:00
Gustav Hansen
86e57e17f4
Merge pull request #13484 from strapi/dependabot/npm_and_yarn/qs-6.10.5 
Bump qs from 6.10.3 to 6.10.5
 2022-06-07 11:13:44 +01:00
dependabot[bot]
f35de37649
Bump qs from 6.10.3 to 6.10.5 
Bumps [qs](https://github.com/ljharb/qs) from 6.10.3 to 6.10.5.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.3...v6.10.5)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-07 09:08:25 +00:00
Mark Kaylor
73bc7686a8 add label for tab group 2022-06-07 09:52:44 +02:00
Mark Kaylor
1d46b0f9ef add translations 2022-06-07 09:50:26 +02:00
Mark Kaylor
29558b960f point providers to npm 2022-06-07 09:45:54 +02:00