yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-30 20:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,587 Commits 116 Branches 487 Tags
Commit Graph

1155 Commits

Author SHA1 Message Date
Convly
b25318b945 Merge branch 'main' into features/api-token-v2 2022-08-31 10:37:47 +02:00
Gustav Hansen
378ab81aee
Merge pull request #14239 from strapi/fix/cm-localepicker 
CM: Fix i18n LocalePicker component
 2022-08-30 09:33:20 +02:00
Julie Plantey
9496693a31
Merge pull request #14195 from WalkingPizza/fix/settings-button-sizes 
Make all settings header primary actions small
 2022-08-29 16:51:46 +02:00
Gustav Hansen
c2419b5a0d chore: Update snapshot tests 2022-08-29 12:14:20 +02:00
Gustav Hansen
905300f6e1 CM: Fix i18n LocalePicker component 2022-08-29 10:35:45 +02:00
Kevin Antonio Rateni Iatauro
df30b7a6c1
Merge branch 'main' into fix/settings-button-sizes 2022-08-29 09:51:12 +02:00
WalkingPizza
a25d813b6c Update snapshots 2022-08-29 09:50:46 +02:00
Simone Taeggi
7e99205b28 Merge branch 'main' into features/api-token-v2 2022-08-24 16:02:46 +02:00
Simone Taeggi
160352044a Merge branch 'main' into features/api-token-v2 2022-08-24 16:01:33 +02:00
Alexandre Bodin
4c6e67c493 v4.3.6 2022-08-24 15:53:23 +02:00
WalkingPizza
a3c0b3b10b Make all header primary actions small 2022-08-24 14:49:01 +02:00
Alexandre Bodin
a52b053551 v4.3.5 2022-08-24 14:10:18 +02:00
Simone Taeggi
527c304366 Merge branch 'main' into features/api-token-v2 2022-08-24 11:31:08 +02:00
Julie Plantey
c4e6d21e4f
Merge pull request #13994 from yangfei4913438/yangfei/lang-code 
show language code
 2022-08-24 10:36:48 +02:00
Simone Taeggi
9114494d80 Merge branch 'main' into features/api-token-v2 2022-08-24 10:26:14 +02:00
Gustav Hansen
cd1604968c
Merge pull request #14177 from strapi/fix/locale-select-test 
chore: Fix and simplify LocaleSelect tests
 2022-08-23 20:37:31 +02:00
Gustav Hansen
4eb360c720
Merge pull request #14172 from strapi/dependabot/npm_and_yarn/react-intl-5.25.1 
Bump react-intl from 5.20.2 to 5.25.1
 2022-08-23 17:09:08 +02:00
Gustav Hansen
c39dfda5e3 chore: Fix and simplify LocaleSelect tests 2022-08-23 16:50:48 +02:00
Convly
6abea9cd85 Expose "get actions as map" & update sync actions 
Co-authored-by: Ben Irvin <innerdvations@users.noreply.github.com>
 2022-08-23 16:02:45 +02:00
Gustav Hansen
365bcf3014 Documentation: Fix eslint errors 2022-08-23 15:58:05 +02:00
Gustav Hansen
18e60778cc Documentation: Fix eslint errors 2022-08-23 15:51:04 +02:00
markkaylor
f5a62af92b
Merge pull request #13458 from meganoob1337/strapi/fix/issue-13453-documentation-fix 
fix #13453 Documentation Plugin doesn't generate Proper Type for the …
 2022-08-23 14:57:15 +02:00
杨飞
096595a1ea fix lint 2022-08-23 17:53:15 +08:00
yangfei
2a87f47901 fix 2022-08-23 17:23:19 +08:00
杨飞
d6a341a4bb show language code 2022-08-23 17:23:19 +08:00
dependabot[bot]
ac52015273
Bump react-intl from 5.20.2 to 5.25.1 
Bumps [react-intl](https://github.com/formatjs/formatjs) from 5.20.2 to 5.25.1.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/react-intl@5.20.2...react-intl@5.25.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-23 09:10:41 +00:00
Ben Irvin
48107d1000 Merge branch 'main' into api-token-v2/fix-syncActions 2022-08-22 17:32:48 +02:00
Ben Irvin
7a1de40bb6 register actions in contentapi bootstrap 2022-08-22 17:31:15 +02:00
Bassel Kanso
61923e62ae modify test 2022-08-19 14:56:31 +03:00
Bassel Kanso
96f23ec774 Merge branch 'main' into features/api-token-v2 2022-08-19 12:36:25 +03:00
dependabot[bot]
55ab41d694
Bump @sentry/node from 6.19.6 to 6.19.7 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 6.19.6 to 6.19.7.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/6.19.6...6.19.7)

---
updated-dependencies:
- dependency-name: "@sentry/node"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-19 09:08:22 +00:00
Bassel Kanso
baad6fd93f Merge branch 'main' into features/api-token-v2 2022-08-18 12:18:09 +03:00
Alexandre BODIN
482c00e90b
Merge pull request #14095 from seyti67/master 
Completed the (fr) French locale for the i18n plugin
 2022-08-18 11:11:48 +02:00
dependabot[bot]
3aa4ac20ea
Bump @graphql-tools/utils from 8.9.0 to 8.10.0 
Bumps [@graphql-tools/utils](https://github.com/ardatan/graphql-tools/tree/HEAD/packages/utils) from 8.9.0 to 8.10.0.
- [Release notes](https://github.com/ardatan/graphql-tools/releases)
- [Changelog](https://github.com/ardatan/graphql-tools/blob/master/packages/utils/CHANGELOG.md)
- [Commits](https://github.com/ardatan/graphql-tools/commits/@graphql-tools/utils@8.10.0/packages/utils)

---
updated-dependencies:
- dependency-name: "@graphql-tools/utils"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-18 07:34:44 +00:00
markkaylor
a8ff3aef2f
Merge pull request #13901 from ihmpavel/unify-template-variables-spacing 
chore: Unify template spacing
 2022-08-16 09:20:37 +02:00
seyti67
7d36fe7627 Completed the (fr) French locale for the i18n plugin 2022-08-12 20:38:48 +02:00
Alexandre BODIN
b5cfd21bf5
Merge pull request #14050 from strapi/chore/deps-fix 
chore: dependency updates
 2022-08-11 16:23:26 +02:00
Alexandre BODIN
2a9050d0d7
Merge pull request #14017 from strapi/chore/use-eslint-config 
Chore/use eslint config
 2022-08-11 16:19:29 +02:00
Alexandre Bodin
e2b3aa1fb2 Add rest-test-renderer 2022-08-11 14:34:20 +02:00
Alexandre Bodin
cd79fabd33 Depedency cleanup 2022-08-11 14:16:03 +02:00
Alexandre BODIN
c0f0ae5049
Merge pull request #14068 from dipiash/fix/doc-typing 
Update content-api.yaml
 2022-08-11 10:44:52 +02:00
Alexandre Bodin
92955d19f9 Frontend updates 2022-08-11 10:20:49 +02:00
Alexandre Bodin
cf49ddbbfc Prettier and backend fix 2022-08-11 10:20:49 +02:00
Alexandre Bodin
0ae14c06cb 1st fix pass 2022-08-11 10:20:48 +02:00
Alexandre Bodin
28a2a00db8 v4.3.4 2022-08-11 10:17:34 +02:00
Alexandre Bodin
dd357e63e6 Put missing code back 2022-08-11 10:04:46 +02:00
Dmitriy
bdb7c3adef
Update content-api.yaml 
Fixed typo in documentation
 2022-08-10 22:58:41 +03:00
Alexandre Bodin
4d60bfdeee v4.3.3 2022-08-10 14:08:54 +02:00
ihmpavel
1cf23e141f
chore: Update after CR 2022-08-09 12:03:51 +02:00
Julie Plantey
5517de967c
Merge pull request #13875 from JWesorick/jwesorick/add-locales 
Add more locales. smn, smn_FI, se, se_FI, se_NO, se_SE, gd, gd_GB, ug…
 2022-08-08 14:32:26 +02:00