yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-22 00:17:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,133 Commits 109 Branches 484 Tags
Commit Graph

2499 Commits

Author SHA1 Message Date
Simone
75773d0010
Merge branch 'main' into fix/clean-test-warnings 2022-10-20 11:16:58 +02:00
Convly
65feb971b8 v4.4.5 2022-10-19 18:49:19 +02:00
Convly
02f7b3b65d v4.4.4 2022-10-19 15:19:00 +02:00
markkaylor
cff7677226
Merge branch 'main' into feature/custom-field-default-options 2022-10-19 14:27:36 +02:00
Josh
31d9751266 Merge branch 'main' into feature/relations-main-view 2022-10-19 12:46:32 +01:00
Simone
6f8d995e38
Merge branch 'main' into fix/clean-test-warnings 2022-10-19 09:58:44 +02:00
Jean-Sébastien Herbaux
5bbb429280
Merge pull request #14434 from strapi/dependabot/npm_and_yarn/graphql-tools/utils-8.12.0 
Bump @graphql-tools/utils from 8.10.0 to 8.12.0
 2022-10-19 09:35:29 +02:00
Jean-Sébastien Herbaux
4daba0c02e
Merge pull request #14141 from strapi/dependabot/npm_and_yarn/nexus-1.3.0 
Bump nexus from 1.2.0 to 1.3.0
 2022-10-19 09:35:11 +02:00
Jean-Sébastien Herbaux
ff10100827
Merge branch 'main' into dependabot/npm_and_yarn/graphql-tools/utils-8.12.0 2022-10-18 16:02:56 +02:00
Jean-Sébastien Herbaux
ad3747fcd1
Merge branch 'main' into dependabot/npm_and_yarn/nexus-1.3.0 2022-10-18 15:59:24 +02:00
Mark Kaylor
6e0bff27ae Merge branch 'fix/custom-field-number-type' of github.com:strapi/strapi into fix/custom-field-number-type 2022-10-12 14:49:56 +02:00
Mark Kaylor
bb552e1b8b Adapt i18n middleware to handle custom fields 2022-10-12 14:47:14 +02:00
Mark Kaylor
60d88b6106 Remove required true default value 2022-10-12 14:10:51 +02:00
Pierre Noël
be5e6ebc05 Merge branch 'feature/relations-main-view' into relations-main-view/refactor-find-existing-find-available 2022-10-11 12:38:04 +02:00
Julie Plantey
41b1bcf8cd Merge branch 'main' of https://github.com/strapi/strapi into feature/relations-main-view 2022-10-11 11:16:00 +02:00
Mark Kaylor
e3e72a1b8a Add default value to options 2022-10-10 16:55:10 +02:00
Pierre Noël
1200e43618 update tests using findExisting relations 2022-10-10 14:42:22 +02:00
Simone Taeggi
0d6ed4a6d8 Merge branch 'main' into fix/clean-test-warnings 2022-10-10 10:07:15 +02:00
Simone Taeggi
0ee0990b68 fix fa icon test warnings based on soupette and gustav review 2022-10-07 17:43:11 +02:00
Gustav Hansen
34ecc496e1
Merge pull request #14555 from strapi/feature/relations-main-view-i18n 
i18n: Inject i18n queryInfos for relations
 2022-10-07 16:12:43 +02:00
Honza Vrkota
117b24be5a
Merge branch 'main' into main 2022-10-07 11:24:26 +02:00
Gustav Hansen
4657c92626 i18n: Inject queryInfos into relations in the main layout 2022-10-06 14:17:22 +02:00
Pierre Noël
93d030df8b update permissions plugin role validation (done by @Marc-Roig) 2022-10-06 11:15:07 +02:00
Simone
a546e14d3f
Merge branch 'main' into fix/clean-test-warnings 2022-10-06 09:32:02 +02:00
Convly
3ddf1626e7 Revert "v4.4.3" 
This reverts commit 3d42ce32952b2d5ad51b46604a4cf20d2709469a.
 2022-10-05 16:22:44 +02:00
dependabot[bot]
f03fbc4828
Bump @graphql-tools/utils from 8.10.0 to 8.12.0 
Bumps [@graphql-tools/utils](https://github.com/ardatan/graphql-tools/tree/HEAD/packages/utils) from 8.10.0 to 8.12.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.12.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-10-05 14:17:44 +00:00
Convly
3d42ce3295 v4.4.3 2022-10-05 16:15:29 +02:00
Convly
f99314ead7 v4.4.3 2022-10-05 16:04:25 +02:00
Convly
f33e7c97ab v4.4.2 2022-10-05 15:32:01 +02:00
Simone
1f7094026c
Merge branch 'main' into fix/clean-test-warnings 2022-10-04 14:50:10 +02:00
Simone Taeggi
ffbf8a9a4a fix Providers icons test warnings 2022-10-04 12:38:27 +02:00
Pierre Noël
ff1e021aa1 fix i18n findExistingRelations tests 2022-10-04 10:54:18 +02:00
Josh
26d6bb17ce chore: remove rogue log 2022-10-04 09:51:02 +01:00
Josh
cbad2f0acf fix(test): manually increase timeout to avoid document being closed early 2022-10-04 08:45:36 +01:00
ivanThePleasant
de25284aac Merge branch 'main' into chore/user-level-data 2022-10-04 10:08:53 +03:00
Honza Vrkota
2fa024336b
Add czech translate color-picker plugin 
Add cs.json with czech translation of color-picker plugin
 2022-09-30 15:17:50 +02:00
Convly
47a5516a60 Update UP e2e test following API token V2 release 2022-09-30 14:17:52 +02:00
Pierre Noël
eb8d79e0c8 restructure updateRelations - connect 2022-09-30 10:54:40 +02:00
Convly
fa503ef438 v4.4.1 2022-09-29 23:50:44 +02:00
derrickmehaffy
a230f29587 Fix wrong filter param used with the entityService 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2022-09-29 14:02:26 -07:00
ivanThePleasant
01bb760793 Clean up unnecessary code 2022-09-29 14:15:07 +03:00
ivanThePleasant
5a4362faf7 Refactor changes to use request context 2022-09-29 11:24:11 +03:00
ivanThePleasant
c0588231a6 Merge branch 'main' into chore/user-level-data 2022-09-29 11:23:17 +03:00
Convly
d9febfb963 v4.4.0 2022-09-28 14:25:44 +02:00
Rémi de Juvigny
6e659b4554
Merge branch 'main' into features/custom-fields 2022-09-28 11:00:59 +02:00
Pierre Noël
8d36a07fc4 Merge branch 'main' into feature/relations-main-view 2022-09-22 17:46:04 +02:00
Alexandre Bodin
d1c529b584 Merge branch 'main' into features/custom-fields 2022-09-22 10:37:11 +02:00
Alexandre Bodin
2bc5bdeabd Merge branch 'main' into features/api-token-v2 2022-09-22 10:36:58 +02:00
Julie Plantey
2e44e15bc7
Merge pull request #14371 from chris-turner-datacom/add-te-reo-maori-locale 
Add Te Reo Māori locale
 2022-09-22 09:29:42 +02:00
Simone Taeggi
7eeef399d7 update failing snapshots 2022-09-21 17:40:56 +02:00