yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-03 22:39:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,925 Commits 109 Branches 487 Tags
Commit Graph

10009 Commits

Author SHA1 Message Date
Jamie Howard
d3c6a7c927 feature(database): account for persisted tables in schema diffing 2023-03-15 11:02:44 +00:00
Christian Capeans
41a5c79994 Add missing snapshot 2023-03-15 10:26:42 +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
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
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
Convly
d85c05d246 Update types for data-transfer handlers 2023-03-14 11:27:40 +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
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
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
markkaylor
f78ba41c59
Merge pull request #15778 from strapi/fix/non-required-json-input 2023-03-13 14:23:08 +01:00
Ben Irvin
e90278c226
Merge pull request #16008 from strapi/data-transfer/pull-cli 2023-03-13 14:21:34 +01:00
Ben Irvin
71f01ab868
Merge pull request #15981 from strapi/enh/gracefully-abort-transfers-on-signal 2023-03-13 14:18:59 +01:00
Alexandre Bodin
4f462fb536 Remove unused assets 2023-03-13 14:17:34 +01:00
Ben Irvin
c14f8451ef fix exit message 2023-03-13 14:15:40 +01:00
Ben Irvin
411ed450e7 Merge branch 'features/data-transfer' into enh/gracefully-abort-transfers-on-signal 2023-03-13 14:15:07 +01:00
Gustav Hansen
30e33d09c3 CM Information: Add label, improve spacings 2023-03-13 13:48:03 +01:00
Gustav Hansen
46fb4c5f5a ReactSelect: Fix selected option text color 2023-03-13 13:47:41 +01:00
Gustav Hansen
da2f67cb08 CTB: Set default review-workflow value from admin API as input value 2023-03-13 13:19:40 +01:00
Alvaro Lozano
2a9979a817
Merge branch 'main' into genericinput-json-disabled 2023-03-13 11:02:55 +01:00
Gustav Hansen
b57e36eee5
Merge pull request #15649 from strapi/feature/review-workflow-ctb 
CTB: Add checkbox to toggle review workflows for a content-type
 2023-03-13 10:17:17 +01:00
Simone Taeggi
6f4e80b416 Merge branch 'features/data-transfer' into data-transfer/error-salt-token-missing 2023-03-13 09:03:34 +01:00
markkaylor
7533a8dcc7
Merge branch 'main' into fix/non-required-json-input 2023-03-13 08:56:46 +01:00
Simone
87ca2cc72b
Merge branch 'main' into data-transfer/limit-token-name-length 2023-03-10 14:57:46 +01:00
Christian
de282d558e
Merge branch 'main' into add-env-oneof 2023-03-10 14:20:34 +01:00
Ben Irvin
5e148d3bda
Update packages/core/strapi/lib/commands/transfer/transfer.js 2023-03-10 14:20:32 +01:00
Simone Taeggi
c05e1fae0f add notification error when the token salt is missing 2023-03-10 12:11:48 +01:00
Ben Irvin
580ead4b4e
Update packages/core/strapi/lib/commands/utils/commander.js 2023-03-10 11:53:55 +01:00
Rémi de Juvigny
7c197ba0d1 Merge remote-tracking branch 'origin/main' into feature/audit-logs-config 2023-03-09 18:44:30 +01:00
Simone Taeggi
8008bb6dd5 show error when there is no salt token 2023-03-09 17:55:30 +01:00
Jamie Howard
32d019ecbe feature(ee): add db entries to persist ee feature tables 2023-03-09 16:50:51 +00:00
Ben Irvin
281fbe8528 fix text 2023-03-09 17:50:33 +01:00