yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-18 13:02:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,626 Commits 123 Branches 495 Tags
Commit Graph

30626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simone Taeggi
73b185abde refactor the code to use useAPIErrorHandler instead of the lodash get method 2023-03-15 14:30:38 +01:00
Gustav Hansen
ca8ddb0ea2
Merge pull request #16085 from strapi/fix/ctb-text-button-icon-size-nav 
ContentTypeBuilderNav: Fix plus icon size
 2023-03-15 14:14:09 +01:00
Gustav Hansen
b53f260ecf useAPIErrorHandler: Handle AxiosError 2023-03-15 14:05:11 +01:00
Gustav Hansen
1a8c0e38f4 Chrore: Update snapshot tests 2023-03-15 12:45:26 +01:00
Marc-Roig
2f6afb9695 Merge branch 'main' into feature/private-s3-bucket 2023-03-15 12:42:31 +01:00
Gustav Hansen
eec289d0ce ContentTypeBuilderNav: Fix plus icon size 2023-03-15 12:09:40 +01:00
Jamie Howard
d3c6a7c927 feature(database): account for persisted tables in schema diffing 2023-03-15 11:02:44 +00:00
Josh
2788e4e0e0
Merge pull request #16061 from strapi/fix/relation-preperation 2023-03-15 10:19:48 +00:00
Christian Capeans
41a5c79994 Add missing snapshot 2023-03-15 10:26:42 +01:00
Gustav Hansen
995533e028
Merge pull request #16076 from smoothdvd/patch-3 
Update zh-Hans translation to match latest en.json
 2023-03-15 10:19:18 +01:00
Gustav Hansen
184141adcc
Merge pull request #16079 from strapi/dependabot/npm_and_yarn/docs/sideway/formula-3.0.1 
chore(deps): bump @sideway/formula from 3.0.0 to 3.0.1 in /docs
 2023-03-15 10:18:59 +01:00
Marc-Roig
21b43ba679 fix: fix: Different field types with the same name break CM EditView 
Co-Authored-By: Gustav Hansen <gustav.hansen@strapi.io>
Co-Authored-By: Marc <20578351+Marc-Roig@users.noreply.github.com>
 2023-03-15 09:11:16 +00:00
Marc
9687ee6aab
Merge pull request #16081 from strapi/fix/docs 2023-03-15 09:23:52 +01:00
Marc-Roig
cbdb9d9163 add links for database docs 2023-03-15 09:21:40 +01:00
Gustav Hansen
bec06dc868
Merge pull request #16078 from strapi/dependabot/npm_and_yarn/docs/webpack-5.76.1 
chore(deps): bump webpack from 5.74.0 to 5.76.1 in /docs
 2023-03-15 08:52:47 +01:00
dependabot[bot]
d1873048fe
chore(deps): bump webpack from 5.74.0 to 5.76.1 in /docs 
Bumps [webpack](https://github.com/webpack/webpack) from 5.74.0 to 5.76.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.74.0...v5.76.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-15 07:45:49 +00:00
dependabot[bot]
f2267108ab
chore(deps): bump @sideway/formula from 3.0.0 to 3.0.1 in /docs 
Bumps [@sideway/formula](https://github.com/sideway/formula) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sideway/formula/releases)
- [Commits](https://github.com/sideway/formula/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: "@sideway/formula"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-15 07:45:33 +00:00
Gustav Hansen
ff6eb04eb5
Merge pull request #16077 from strapi/dependabot/npm_and_yarn/webpack-5.76.0 
chore(deps): bump webpack from 5.75.0 to 5.76.0
 2023-03-15 08:44:56 +01:00
dependabot[bot]
8ee7af8294
chore(deps): bump webpack from 5.75.0 to 5.76.0 
Bumps [webpack](https://github.com/webpack/webpack) from 5.75.0 to 5.76.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.75.0...v5.76.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-15 04:17:35 +00:00
smoothdvd
37a855e45e
Update zh-Hans translation to match latest en.json 2023-03-15 11:30:43 +08:00
Alexandre BODIN
947069e57f
Merge pull request #16010 from strapi/chore/rbac-ce 2023-03-14 18:28:58 +01:00
Convly
d8614487de Handle ws connexion status code & fix token validation 2023-03-14 12:43:15 +01:00
Bassel Kanso
8f2476c881
Merge pull request #16037 from strapi/fix/transfer-timeout-error 
Error handling for timeout in transfer
 2023-03-14 13:40:40 +02:00
Alexandre Bodin
c4a48a15d7 Change chunk name 2023-03-14 12:00:13 +01:00
Arthur Brière
25f8acde92
Merge branch 'main' into feature/add-ast-locale 2023-03-14 11:42:39 +01:00
Arthur Brière
b6f720a9dc tests: update snapshots 2023-03-14 11:38:16 +01:00
Convly
d85c05d246 Update types for data-transfer handlers 2023-03-14 11:27:40 +01:00
Christian
855a40e1a9
Merge pull request #15966 from iamandrewluca/add-env-oneof 
Add oneOf env helper for union values
 2023-03-14 11:23:50 +01:00
Bassel Kanso
92893e749b
Update packages/core/data-transfer/src/strapi/providers/remote-destination/index.ts 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-03-14 12:10:25 +02:00
Bassel
5927db55fe catch and handle error 2023-03-14 11:52:04 +02:00
Bassel Kanso
65afa72d30
Merge branch 'main' into fix/transfer-timeout-error 2023-03-14 11:44:46 +02:00
Christian
7ef6400e9d
Merge branch 'main' into add-env-oneof 2023-03-14 10:32:39 +01:00
Convly
75c34a56f7 Fix remote export 2023-03-14 10:24:24 +01:00
Jamie Howard
13c9b65544
Merge pull request #16021 from strapi/review-workflow/migration-on-disable 2023-03-14 09:23:26 +00:00
Convly
68d1864357 Update typing for the transfer flow interface 2023-03-14 10:22:49 +01:00
Convly
a167d9b3a2 Remove old controller code for data transfer 2023-03-14 10:22:03 +01:00
Convly
717796283e Remove push controller 2023-03-14 10:20:43 +01:00
Simone
e992189990
Merge branch 'features/data-transfer' into data-transfer/error-salt-token-missing 2023-03-14 09:29:21 +01:00
Christian Capeans
284cc7512f Merge branch 'data-transfer/pull' of https://github.com/strapi/strapi into data-transfer/pull 2023-03-14 09:13:08 +01:00
Christian Capeans
c44df82be3 Fix small issues 2023-03-14 09:11:44 +01:00
Ben Irvin
302ac81ba6
Merge branch 'features/data-transfer' into data-transfer/pull 2023-03-14 09:02:02 +01:00
Gustav Hansen
df3ee9117f
Merge pull request #16036 from smoothdvd/patch-2 
Update zh-Hans.json to catch up latest en.json
 2023-03-14 08:57:46 +01:00
Marc
905d251614
Merge pull request #16060 from strapi/fix/private-option-on-media-attr 2023-03-13 18:25:31 +01:00
Alexandre BODIN
2eb85b17c7
Merge branch 'main' into chore/rbac-ce 2023-03-13 18:13:11 +01:00
Convly
5120ae454d Fix build 2023-03-13 17:06:57 +01:00
Gustav Hansen
5229384b9f
Merge pull request #16057 from strapi/feature/review-workflow-ctb-assign 
CTB: Set default review-workflow value from admin API as input value
 2023-03-13 16:21:21 +01:00
Jamie Howard
6a08636ee6 chore(ee): PR feedback 2023-03-13 15:10:25 +00:00
Gustav Hansen
0afaba3c14
Merge pull request #16058 from strapi/feature/review-workflow-cm-select-papercuts 
CM Information: Add rw stage label and improve alignment
 2023-03-13 15:59:47 +01:00
Marc-Roig
f370b4c597 return private attribute on media types 2023-03-13 15:45:21 +01:00
markkaylor
959cf6c2f5
Merge pull request #16033 from alvarolozano/genericinput-json-disabled 2023-03-13 14:24:22 +01:00