9448 Commits

Author SHA1 Message Date
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
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
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
Alvaro Lozano
2a9979a817
Merge branch 'main' into genericinput-json-disabled 2023-03-13 11:02:55 +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
Ben Irvin
46a56a6c0e add throttle option 2023-03-09 17:47:19 +01:00
Simone Taeggi
faa5820548 change ctx.badRequest to ctx.notImplemented 2023-03-09 17:36:19 +01:00
Simone
ba2b9030a7
Merge branch 'features/data-transfer' into data-transfer/error-salt-token-missing 2023-03-09 17:35:10 +01:00
Ben Irvin
2bc2aaa96e fix tests 2023-03-09 15:02:12 +01:00
Ben Irvin
0d70c10363 Merge branch 'features/data-transfer' into data-transfer/pull-cli 2023-03-09 14:58:56 +01:00
Simone Taeggi
26d9f6c8e0 add a specific error on the BE when the Token Salt token is missing
Co-authored-by: Christian <christiancp100@gmail.com>
2023-03-09 14:44:20 +01:00
Rémi de Juvigny
a53767f9b3 Add license updates tests 2023-03-09 14:39:43 +01:00
Bassel Kanso
90883dcf7d
Merge branch 'main' into fix/transfer-timeout-error 2023-03-09 13:44:19 +02:00
Christian Capeans
c4cd8b1e15 Add token type select to frontend 2023-03-09 11:18:57 +01:00
Bassel
33cbe053cc error handling for timeout in transfer 2023-03-09 11:07:03 +02:00
smoothdvd
e9e369f8db
Update zh-Hans.json to catch up latest en.json 2023-03-09 16:47:51 +08:00
Alexandre Bodin
6f225b6979 Merge branch 'main' of github.com:strapi/strapi into chore/rbac-ce 2023-03-09 02:45:03 +01:00
Alexandre Bodin
29dadec292 Feedbacks 2023-03-09 02:43:16 +01:00
Alvaro Lozano
b5b5c5834e
Disabled property for JSONInput (GenericInput) 2023-03-08 20:27:21 +01:00
Ben Irvin
1bfa6b6f5c fix only and exclude commands and typings 2023-03-08 17:12:47 +01:00
Tobias Frank
b1e105fca5 move unique key up in hierarchy 2023-03-08 15:29:36 +01:00
Christian Capeans
40679cefca Exclude default ignored entities 2023-03-08 14:31:36 +01:00
Marc-Roig
a271258f79 Merge branch 'main' into feature/private-s3-bucket 2023-03-08 14:19:29 +01:00