yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-13 03:07:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 116 Branches 488 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Irvin
0718a1c0c4
Merge branch 'features/deits' into deits/import-progress 2022-11-30 15:26:50 +01:00
Ben Irvin
6077039196
Merge branch 'features/deits' into deits/ts-strapi-eslint-config 2022-11-30 15:24:08 +01:00
Ben Irvin
7d27e4f02c
Merge pull request #15039 from strapi/deits/cli-no-booleans 
[DEITS] CLI: use --no prefix and fix max-size options
 2022-11-30 15:22:40 +01:00
Simone
574985f9f0
Merge branch 'main' into enhancement/axios-refactoring 2022-11-30 14:57:09 +01:00
Simone
4723894107
Merge branch 'main' into enhancement/date-time-picker-ds-in-strapi 2022-11-30 14:56:51 +01:00
Simone
6fb62ca739
Merge branch 'main' into chore/tracking-edit-field-name 2022-11-30 14:56:18 +01:00
Ben Irvin
eb69fb6b1f
Merge pull request #15043 from strapi/fix/standardize-commander-version 
Use commander to 8.2.0 everywhere
 2022-11-30 14:52:43 +01:00
Simone
85425719d1
Merge branch 'main' into chore/tracking-edit-field-name 2022-11-30 14:50:18 +01:00
Christian Capeans
3c3e3b6ca8 Add missing dependencies 2022-11-30 13:05:42 +01:00
Christian Capeans
b69d73aa34 Merge branch 'features/deits' into deits/export-archive 2022-11-30 13:01:27 +01:00
Simone Taeggi
644b0a9fea remove updates to the yarn lock 2022-11-30 12:09:35 +01:00
Tim Raasveld
1e2dea526d revert unrelated change 2022-11-30 12:06:43 +01:00
Ben Irvin
a8c7d46b30 use commander to 8.2.0 2022-11-30 11:58:40 +01:00
Tim Raasveld
b0cd420681 Warn if using old strapi::cors enabled option to disable CORS 2022-11-30 11:56:18 +01:00
Simone Taeggi
4391d8b56d Merge branch 'main' into enhancement/date-time-picker-ds-in-strapi 2022-11-30 11:45:30 +01:00
dependabot[bot]
e49ee71ce2
chore(deps): bump react-router-dom from 5.2.0 to 5.3.4 
Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 5.2.0 to 5.3.4.
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/v5.3.4/packages/react-router-dom)

---
updated-dependencies:
- dependency-name: react-router-dom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-30 10:45:09 +00:00
Ben Irvin
30c56dc9b3 use commander 8.2.0 everywhere 2022-11-30 11:41:20 +01:00
Simone
fb4f335314
Merge pull request #15026 from strapi/chore/ds-140 
[design-system]: update to 1.4.0
 2022-11-30 11:40:30 +01:00
Ben Irvin
c792d37bcb Merge branch 'features/deits' into deits/cli-no-booleans 2022-11-30 11:37:59 +01:00
Jean-Sébastien Herbaux
ab9faf7705
Merge pull request #15042 from strapi/deits/cli-output-enhancement 2022-11-30 11:11:22 +01:00
Christian Capeans
8037f2c808 Merge branch 'features/deits' into deits/export-archive 2022-11-30 11:00:51 +01:00
Christian Capeans
f6c53e02e0 Merge branch 'features/deits' of https://github.com/strapi/strapi into features/deits 2022-11-30 11:00:31 +01:00
Christian Capeans
e80f1148dd Merge branch 'deits/export-archive' of https://github.com/strapi/strapi into deits/export-archive 2022-11-30 10:58:07 +01:00
Jean-Sébastien Herbaux
51b2e888c0
Merge pull request #14992 from strapi/deits/export-assets 2022-11-30 10:57:43 +01:00
Christian Capeans
00a0ead9f6 Merge branch 'features/deits' into deits/export-archive 2022-11-30 10:57:35 +01:00
Convly
924d218b95 Remove useless logs & switch the table header to blue 2022-11-30 10:54:15 +01:00
Ben Irvin
631662bbf9 remove incorrect old comments 2022-11-30 10:44:35 +01:00
Ben Irvin
f7fb12273a validate max-size-jsonl 2022-11-30 10:43:04 +01:00
Ben Irvin
e0a4e91012
Merge branch 'features/deits' into deits/cli-no-booleans 2022-11-30 10:30:39 +01:00
Ben Irvin
257fc532b7 remove max-size and allow max-size-jsonl to be decimal 2022-11-30 10:30:16 +01:00
Jean-Sébastien Herbaux
9522d49e2d
Merge pull request #15040 from strapi/deits/fix-max-size-jsonl 2022-11-30 10:22:19 +01:00
Convly
10c2fcd4f0 Use max size jsonl instead of maxe size for the file destination provider 2022-11-30 10:17:16 +01:00
Simone Taeggi
612ee1673b remove unnecessary function 2022-11-30 10:12:15 +01:00
Simone Taeggi
5d50cfb19f fix tests review comments 2022-11-30 10:08:36 +01:00
Ben Irvin
a3b2e78c04 fix comments 2022-11-30 09:48:58 +01:00
Ben Irvin
3979d63dd2 remove unused code 2022-11-30 09:48:07 +01:00
Bassel
a72ed41731 Merge branch 'features/deits' into deits/restore-mechanism 2022-11-30 10:40:43 +02:00
Convly
903e2a6123 Fix unit tests 2022-11-30 09:39:58 +01:00
Ben Irvin
a750bc1509 remove exclude option 2022-11-30 09:38:58 +01:00
Ben Irvin
d099bd1e20 use --no- prefix for booleans 2022-11-30 09:28:49 +01:00
Pierre Noël
e4ceee036e set dominant attribute 2022-11-30 09:22:50 +01:00
Jean-Sébastien Herbaux
c9b83b1c07
Merge pull request #14989 from strapi/deits/fix-entities-export 2022-11-30 09:20:04 +01:00
Jean-Sébastien Herbaux
adfa4f5e2f
Don't throw if assets streams are missing 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2022-11-30 09:19:15 +01:00
Christian Capeans
80a8fea293 Merge branch 'features/deits' into deits/export-archive 2022-11-30 09:14:24 +01:00
Ben Irvin
e571e7504f
Merge branch 'features/deits' into deits/cli-tests 2022-11-30 09:12:00 +01:00
Simone
a39b999359
Merge branch 'main' into chore/ds-140 2022-11-30 09:10:23 +01:00
Ben Irvin
65fbef1d78 fix comments 2022-11-30 09:08:48 +01:00
Ben Irvin
a492a046e1
Merge branch 'features/deits' into deits/import-progress 2022-11-30 08:56:50 +01:00
Ben Irvin
1821f65366
Merge branch 'features/deits' into deits/ts-strapi-eslint-config 2022-11-30 08:56:36 +01:00
Simone Taeggi
0a68d2d9b6 add another small test 2022-11-29 22:12:07 +01:00