yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-26 22:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,962 Commits 138 Branches 514 Tags
Commit Graph

22962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julie Plantey
4d3e59fc39 embed Typography variant color to RelationInput 2022-08-11 10:21:39 +02:00
Julie Plantey
915e68bd25 feedback fix 2nd round 2022-08-09 17:08:45 +02:00
Julie Plantey
51fef616a6 fixed RelationInput story naming 2022-08-09 15:40:48 +02:00
Julie Plantey
34a48a15c0 feedback fixes 2022-08-09 15:30:02 +02:00
Julie Plantey
48f609b4fc RelationItem & ShadowList 2022-08-08 15:33:01 +02:00
Gustav Hansen
78c8651e1e Merge branch 'master' into feature/relations-main-view 2022-08-08 12:46:31 +02:00
Alexandre BODIN
4a13abba2d
Merge pull request #13991 from strapi/dependabot/npm_and_yarn/ci-info-3.3.2 
Bump ci-info from 3.1.1 to 3.3.2
 2022-08-08 12:09:33 +02:00
Alexandre BODIN
99603ffb8c
Merge pull request #14006 from strapi/dependabot/npm_and_yarn/docs/terser-5.14.2 
Bump terser from 5.14.1 to 5.14.2 in /docs
 2022-08-08 12:07:57 +02:00
Alexandre BODIN
e5d6a94bd1
Merge pull request #13967 from strapi/dependabot/npm_and_yarn/mailgun.js-5.2.2 
Bump mailgun.js from 5.0.2 to 5.2.2
 2022-08-08 12:04:57 +02:00
dependabot[bot]
730d616d30
Bump terser from 5.14.1 to 5.14.2 in /docs 
Bumps [terser](https://github.com/terser/terser) from 5.14.1 to 5.14.2.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/compare/v5.14.1...v5.14.2)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-08 08:50:49 +00:00
Alexandre BODIN
416396c00e
Merge pull request #13710 from strapi/chore/init-docu 
Init tech docs
 2022-08-08 10:50:11 +02:00
Marc
0d4bdea37b
Merge pull request #13949 from strapi/fix/app-crashes-on-upload-faulty-image 
Fix: app crashes on upload corrupt image
 2022-08-08 09:26:40 +02:00
Alexandre BODIN
6c68176efc
Merge pull request #12890 from WalkingPizza/feature/user-permissions-change-password 
Allow users to change own password
 2022-08-05 21:57:48 +02:00
Pierre Noël
5f9c19770f
Merge pull request #13979 from strapi/relations-main-view/configuration-migrate-editRelations 
Relations main view/configuration migrate edit relations
 2022-08-05 20:13:38 +02:00
Jean-Sébastien Herbaux
9dd14b39b7
Merge pull request #13941 from strapi/chore/graphql-use-graphql-scalars 
Move from deprecated packages to graphql-scalars to handle scalar types
 2022-08-05 17:28:52 +02:00
Pierre Noël
3bb7a08fa1 fix e2e tests 2022-08-05 16:59:52 +02:00
Pierre Noël
176acfef4c remove editRelations from configuration routes 2022-08-05 16:59:52 +02:00
Pierre Noël
db1bf34f2a migrate editRelations to edit during configurationSync 2022-08-05 16:59:52 +02:00
Convly
5bf7c58872 Merge branch 'master' into chore/graphql-use-graphql-scalars 2022-08-05 16:33:23 +02:00
Gustav Hansen
68fa694345
Merge pull request #13982 from strapi/feature/relations-main-view-cm-cleanup-editrelations 
CM: Remove editrelations from useFetchContentTypeLayout
 2022-08-05 15:04:11 +02:00
Gustav Hansen
09757686b0
Merge pull request #13993 from strapi/fix/cellcontent-decimals 
CellContent: Relax number formatting
 2022-08-05 14:17:45 +02:00
Julie Plantey
c0398521e0
Merge pull request #13917 from strapi/features/folder-breadcrumbs 
[Features] Breadcrumbs Folders navigation
 2022-08-05 12:55:53 +02:00
Gustav Hansen
828fa87b8c
Merge pull request #13990 from strapi/dependabot/npm_and_yarn/storybook/addon-actions-6.5.10 
Bump @storybook/addon-actions from 6.4.10 to 6.5.10
 2022-08-05 12:44:49 +02:00
Gustav Hansen
ce7174120d CellContent: Relax number formatting 2022-08-05 11:56:16 +02:00
dependabot[bot]
235ae954ae
Bump ci-info from 3.1.1 to 3.3.2 
Bumps [ci-info](https://github.com/watson/ci-info) from 3.1.1 to 3.3.2.
- [Release notes](https://github.com/watson/ci-info/releases)
- [Changelog](https://github.com/watson/ci-info/blob/master/CHANGELOG.md)
- [Commits](https://github.com/watson/ci-info/compare/v3.1.1...v3.3.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-05 09:06:40 +00:00
dependabot[bot]
0aedf74b87
Bump @storybook/addon-actions from 6.4.10 to 6.5.10 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 6.4.10 to 6.5.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.10/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.10/addons/actions)

---
updated-dependencies:
- dependency-name: "@storybook/addon-actions"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-05 09:05:45 +00:00
Convly
da8d954b8e Merge branch 'master' of github.com:strapi/strapi into chore/graphql-use-graphql-scalars 2022-08-05 10:10:14 +02:00
Gustav Hansen
70f9be00fc
Merge pull request #13985 from strapi/fix/remove-apollo-federation 
GraphQL: Remove unused @apollo/federation dependency
 2022-08-04 20:07:05 +02:00
Julie Plantey
7d31f2282c Merge branch 'master' of https://github.com/strapi/strapi into features/folder-breadcrumbs 2022-08-04 18:34:14 +02:00
Gustav Hansen
25d178d9a8
Merge pull request #13968 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1188.0 
Bump aws-sdk from 2.1186.0 to 2.1188.0
 2022-08-04 17:48:36 +02:00
Gustav Hansen
5856b4f0b9 GraphQL: Remove unused @apollo/federation dependency 2022-08-04 17:44:51 +02:00
Gustav Hansen
d73b847c5c
Merge pull request #13978 from strapi/fix/ml-permissions-view 
ML: Improve canRead and canCreate permission messages
 2022-08-04 17:41:42 +02:00
Marc-Roig
d266c41c01 remove faulty image tests 2022-08-04 17:35:44 +02:00
Marc-Roig
03c8ba6bba fix optimization file 2022-08-04 17:16:43 +02:00
Gustav Hansen
a1581bef2f CM: Remove editrelations from useFetchContentTypeLayout 2022-08-04 16:50:07 +02:00
Gustav Hansen
eb7dbd39d7
Merge pull request #13976 from strapi/fix/upload-proxy-error-gracefully 
Upload: Handle file upload errors gracefully
 2022-08-04 16:38:17 +02:00
Julie Plantey
ffde4d4b58 hide breadcrumbs if in root of ML + added tests 2022-08-04 16:25:50 +02:00
Marc-Roig
aa588b4629 update corrupt image test 2022-08-04 16:07:12 +02:00
Gustav Hansen
838dcc5a01 EmptyOrNoPermissions: simplify getContent() 2022-08-04 15:36:15 +02:00
Gustav Hansen
3c6a58aaea ML: Remove default NoPermissions component 2022-08-04 15:17:56 +02:00
Julie Plantey
324b1628f6 fixed translations 2022-08-04 15:15:55 +02:00
Julie Plantey
c59cced54b Merge branch 'master' of https://github.com/strapi/strapi into features/folder-breadcrumbs 2022-08-04 14:58:59 +02:00
Gustav Hansen
11d021507c ML: Improve canRead and canCreate permission messages 2022-08-04 14:00:23 +02:00
Marc-Roig
d8c218a089 change writableDiscardStream name 2022-08-04 13:05:25 +02:00
Marc-Roig
39102d185e change writableDiscardStream name 2022-08-04 12:58:47 +02:00
Marc-Roig
d61104de72 check if image is faulty in enhanceFile 2022-08-04 12:56:58 +02:00
Gustav Hansen
71f290f4c1 Upload: Handle file upload errors gracefully 2022-08-04 12:06:17 +02:00
Gustav Hansen
432a26cf5f
Merge pull request #13955 from strapi/dependabot/npm_and_yarn/eslint-plugin-jsx-a11y-6.6.1 
Bump eslint-plugin-jsx-a11y from 6.6.0 to 6.6.1
 2022-08-04 11:52:05 +02:00
Pierre Noël
a70314bf67 Merge branch 'master' into feature/relations-main-view 2022-08-04 10:40:26 +02:00
Marc-Roig
096dba7983 expect Application Error in test 2022-08-04 09:37:38 +02:00