yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-04 23:03:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,700 Commits 111 Branches 487 Tags
Commit Graph

28700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julie Plantey
f3f961d5e6 Merge branch 'main' of https://github.com/strapi/strapi into enh/helper-box 2023-02-07 14:50:11 +01:00
Simone Taeggi
4c8c7cf38f replace axiosInstance with the get and post methods in the getFetchClient inside the fetchEmailSettings and postEmailTest utils 2023-02-07 14:09:23 +01:00
Rémi de Juvigny
d1a1754d3d Typo 2023-02-07 12:27:35 +01:00
Rémi de Juvigny
ee2f5f07b4 Add auto db migration 2023-02-07 12:11:28 +01:00
Mark Kaylor
b437225fc4 Merge branch 'main' of github.com:strapi/strapi into audit-logs/add-filters 2023-02-07 11:14:32 +01:00
markkaylor
b4c67d427e
Merge pull request #15706 from strapi/chore/bump-ds-dep 
Bump design system from 1.6.1 to 1.6.3
 2023-02-07 11:14:05 +01:00
Simone
862e5e8d8b
Merge branch 'main' into enhancement/axios-migration-i18n 2023-02-07 10:55:49 +01:00
Nathan Pichon
62f1c3d04a
Merge pull request #15216 from tomscytale/features/patreon-auth-provider 
Add Patreon as an Oauth2 Provider in the Users & Permissions plugin
 2023-02-07 10:49:58 +01:00
markkaylor
53a0664b40
Merge pull request #15687 from strapi/fix/json-input-validation 
[content manager] Return required error if empty for json input
 2023-02-07 10:47:45 +01:00
Simone Taeggi
8ddfc49652 replace axiosInstance in the CMEditViewCopyLocale component to replace the api call with the useFetchClient get method 2023-02-07 10:46:34 +01:00
ivanThePleasant
7edd834712 Merge branch 'main' into chore/ee-seats 2023-02-07 11:28:21 +02:00
ivanThePleasant
ebdf9c06c2 WIP add redux support to license limit hook, various minor changes 
Co-authored-by: Gustav Hansen <gu@stav.dev>
 2023-02-07 11:27:44 +02:00
Gustav Hansen
6942cf5002
Merge pull request #15695 from strapi/chore/jest-coverage-ee 
Jest: Collect coverage for ee admin folders
 2023-02-07 10:05:32 +01:00
dependabot[bot]
27ff5c0a0d
chore(deps): bump nodemailer from 6.8.0 to 6.9.1 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.8.0 to 6.9.1.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.8.0...v6.9.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-07 09:02:39 +00:00
Gustav Hansen
2c9d875fea Jest: Collect coverage for ee admin folders 2023-02-07 09:04:21 +01:00
Josh
3e1bfbbe87
Merge pull request #15725 from Boegie19/fix-sharp-version 
fix https://github.com/strapi/strapi/issues/15614
fixes https://github.com/strapi/strapi/issues/15614
 2023-02-07 08:01:04 +00:00
DMehaffy
03c0a8fbaa
Merge pull request #15696 from strapi/workflows/deits 
Update auto-label workflow to include DEITS label
 2023-02-06 21:38:42 -07:00
DMehaffy
bd2d0d1a12
Merge branch 'main' into fix-sharp-version 2023-02-06 14:00:43 -07:00
Boegie19
a1a09fc588 fix sharp version for macOS < 11 2023-02-06 21:53:08 +01:00
Marc-Roig
0b641bc05e pass options to forEachAsync 2023-02-06 19:11:58 +01:00
Marc-Roig
8add8492fa test pagination in relations 2023-02-06 19:09:05 +01:00
markkaylor
f0ff25c27a
Merge branch 'main' into chore/bump-ds-dep 2023-02-06 18:24:49 +01:00
Mark Kaylor
f97c352fa0 Update snapshots 2023-02-06 18:24:10 +01:00
Mark Kaylor
22abe8d250 Bump design system from 1.6.2 to 1.6.3 2023-02-06 18:20:35 +01:00
Pierre Noël
dd1cfed6fc
Merge pull request #15702 from strapi/fix/warning-inversedBy 
Fix `hasTable` is undefined for schema postgres users
 2023-02-06 18:12:32 +01:00
Julie Plantey
215f694a98 tests & translations 2023-02-06 17:16:52 +01:00
Julie Plantey
6b017fdaf7 dynamic layout + footer 2023-02-06 16:42:58 +01:00
Julie Plantey
4dc94c8bdc first layout 2023-02-06 16:10:04 +01:00
Christian
ff39a7d1c7
Merge pull request #15704 from strapi/data-transfer/transfer-tokens 
[DTS] Transfer Tokens
 2023-02-06 16:00:15 +01:00
Marc-Roig
7b14ee6a35 implement forEachAsync 2023-02-06 15:59:47 +01:00
Marc-Roig
71e2c66a2c clean dynamic zone components create 2023-02-06 15:46:30 +01:00
Marc-Roig
02d467f933 remove mapAsyncDialects 2023-02-06 15:39:47 +01:00
Josh
4e53160dcf
Merge pull request #15720 from strapi/fix/relations-in-required-components 2023-02-06 14:28:41 +00:00
Simone Taeggi
ab14e4ac47 update snapshots 2023-02-06 15:01:59 +01:00
Convly
075a3b7f8f Merge branch 'main' of github.com:strapi/strapi into features/data-transfer 2023-02-06 14:48:56 +01:00
Simone Taeggi
db8120b36e fix the unit test 2023-02-06 14:46:55 +01:00
Josh
5e63ffa0ec chore: update snapshots 2023-02-06 12:23:09 +00:00
Christian Capeans
5c8cd3e71c Merge branch 'data-transfer/transfer-tokens' of https://github.com/strapi/strapi into data-transfer/transfer-tokens 2023-02-06 12:28:54 +01:00
Christian Capeans
f2f9009ca4 Clean code and review changes 2023-02-06 12:28:34 +01:00
Simone Taeggi
e1622b5b9b update snapshots 2023-02-06 12:03:16 +01:00
Simone Taeggi
d5ed19db6c Merge branch 'data-transfer/transfer-tokens' of github.com:strapi/strapi into data-transfer/transfer-tokens 2023-02-06 12:01:07 +01:00
Simone Taeggi
f1dad8b19e fixes on PR and bugs 2023-02-06 12:00:50 +01:00
Gustav Hansen
79c9efe703
Merge pull request #15684 from strapi/dependabot/npm_and_yarn/docs/http-cache-semantics-4.1.1 
chore(deps): bump http-cache-semantics from 4.1.0 to 4.1.1 in /docs
 2023-02-06 11:54:32 +01:00
Gustav Hansen
84e1527da5
Merge pull request #15685 from strapi/dependabot/npm_and_yarn/http-cache-semantics-4.1.1 
chore(deps): bump http-cache-semantics from 4.1.0 to 4.1.1
 2023-02-06 11:54:12 +01:00
Josh
559c4ccd3d fix: we should always try and apply the relation paths if they exist 2023-02-06 10:46:10 +00:00
Rémi de Juvigny
41e7d2a5d0 Rename audit logs table name 2023-02-06 11:45:58 +01:00
Nathan Pichon
0bd42b52de
Merge branch 'main' into features/patreon-auth-provider 2023-02-06 11:40:26 +01:00
Convly
32e50815a1 Fix unit test 2023-02-06 11:34:12 +01:00
Marc-Roig
4f4b424197 fix mapAsyncDialects type 2023-02-06 11:06:18 +01:00
Marc-Roig
3036dcb1d7 Merge branch 'main' into fix/performance-degradation-in-deeply-nested-coimpos 2023-02-06 11:03:40 +01:00