yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 03:17:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,813 Commits 121 Branches 507 Tags
Commit Graph

26813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Irvin
b68b53370a Merge branch 'features/deits' into deits/cli-exclude-only 2023-01-16 18:58:39 +01:00
Ben Irvin
4f1eabf286 Merge branch 'main' into features/deits 2023-01-16 18:53:43 +01:00
Ben Irvin
ed6ac61c32 improve help 2023-01-16 18:52:11 +01:00
Ben Irvin
d8e3d89040 add exclude and only stage skipping 2023-01-16 18:44:14 +01:00
Ben Irvin
936425fe4e remove log 2023-01-16 18:18:13 +01:00
Ben Irvin
52fa1bb0bb add exclude and only with parseable list 2023-01-16 18:12:24 +01:00
Marc
0c99882048
Merge pull request #15325 from strapi/fix/components-ordering-mysql 2023-01-16 15:15:24 +01:00
Bassel
6572478897 Merge branch 'main' into features/deits 2023-01-16 15:08:09 +02:00
Josh
0c897257f6
Merge pull request #15440 from strapi/dependabot/npm_and_yarn/core-js-3.27.1 2023-01-16 12:41:58 +00:00
Marc
62255e7512
Merge branch 'main' into fix/components-ordering-mysql 2023-01-16 13:05:58 +01:00
Marc-Roig
49843ed722 update entity 1 component order properly 2023-01-16 13:05:13 +01:00
Josh
f2069063a2
Merge pull request #15458 from strapi/fix/block-unallowed-types-in-media-input 2023-01-16 11:57:52 +00:00
Josh
5ca6ae551f
Merge branch 'main' into dependabot/npm_and_yarn/core-js-3.27.1 2023-01-16 11:00:28 +00:00
Gustav Hansen
03f3033e5f
Merge pull request #15428 from strapi/chore/ds-1.4.2 
[chore] Bump DS to 1.4.2
 2023-01-16 11:45:01 +01:00
Gustav Hansen
eaae087758
Merge pull request #15419 from strapi/dependabot/npm_and_yarn/fingerprintjs/fingerprintjs-3.3.6 
chore(deps): bump @fingerprintjs/fingerprintjs from 3.3.3 to 3.3.6
 2023-01-16 11:44:29 +01:00
Gustav Hansen
1898626884
Merge pull request #15421 from strapi/chore/axios-1-2-2 
Chore: Update axios to 1.2.2
 2023-01-16 11:43:42 +01:00
Josh
7de920548e chore: use getTrad so react-intl works 2023-01-16 10:43:20 +00:00
Josh
89e6107ffe
Merge pull request #15451 from FabienGreard/main 
Fix https://github.com/strapi/strapi/issues/15275
 2023-01-16 09:53:17 +00:00
Josh
7e5bb3b333 fix: filter dropped files before trying to upload 2023-01-16 09:47:15 +00:00
Josh
88ba54592b
Merge pull request #15369 from strapi/chore/add-browserlist 2023-01-16 09:29:10 +00:00
Julie Plantey
d8d6bb5b3c Merge branch 'main' of https://github.com/strapi/strapi into chore/ds-1.4.2 2023-01-16 10:18:18 +01:00
Josh
032a4a37c0
Merge branch 'main' into main 2023-01-16 09:08:08 +00:00
Josh
133fb98587
Merge branch 'main' into chore/add-browserlist 2023-01-16 09:07:44 +00:00
Simone
33a05a973e
Merge pull request #15436 from strapi/fix/solve-snapshots-tests-failing-node-18 
Fix/solve snapshots tests failing node 18
 2023-01-16 10:07:09 +01:00
Josh
9fef47af32 chore: update snapshots 2023-01-16 08:53:35 +00:00
Simone Taeggi
32892c2a3e add a comment to highlight why we mocked react-intl 2023-01-16 09:46:43 +01:00
Ben Irvin
8d8a97aed8 pass only and exclude options to engine 2023-01-16 09:30:52 +01:00
FabienGreard
da11558253 fix(VideoAssetCard): dissalow pointer-events on videoPreview 2023-01-14 15:25:59 +01:00
Simone Taeggi
731ec0de89 Merge branch 'main' into fix/solve-snapshots-tests-failing-node-18 2023-01-13 18:51:35 +01:00
Simone Taeggi
356c13e397 mock useIntl methods to solve issue with the unicode space character in the snapshot tests 2023-01-13 18:50:50 +01:00
Simone Taeggi
d1cb57f422 mock useintl 2023-01-13 17:18:33 +01:00
Convly
c2ef0df8ee Merge branch 'main' into features/deits 2023-01-13 16:46:18 +01:00
Josh
91f39fe978
Merge branch 'main' into chore/add-browserlist 2023-01-13 14:22:00 +00:00
Marc-Roig
319c7473f3 test components order is preserved 2023-01-13 15:20:46 +01:00
Simone Taeggi
5bc130df4d fix node 18.13 problem with unicode space 2023-01-13 15:11:12 +01:00
markkaylor
5e1fda7e13
Merge pull request #15442 from strapi/fix/ds-link-doc 
Fix incorrect location for command
 2023-01-13 14:25:16 +01:00
Josh
07c9b3b54f fix: add browserslist-to-esbuild to devDeps for helper-plugin 2023-01-13 11:19:12 +00:00
markkaylor
89f7fe4999
Fix incorrect location for command 2023-01-13 11:33:51 +01:00
Marc-Roig
dd98293a55 better filtering in inverse order column 2023-01-13 10:53:30 +01:00
Ben Irvin
a4d0b0d6a3
Merge pull request #15423 from strapi/deits/cli-force-yes 2023-01-13 10:25:56 +01:00
Ben Irvin
ecec7a3481
Merge pull request #15406 from strapi/deits/transfer-protocols 2023-01-13 10:25:36 +01:00
Ben Irvin
154e7be7cc
Merge branch 'features/deits' into deits/transfer-protocols 2023-01-13 10:19:49 +01:00
Simone Taeggi
5ae7cf19e9 revert jest-styled-components-version 2023-01-13 10:18:29 +01:00
markkaylor
bec0be562b
Merge pull request #15439 from strapi/chore/ds-docs 
[docs] Add linking the design system docs
 2023-01-13 10:15:38 +01:00
Ben Irvin
0c7d4057c4
Merge pull request #15437 from strapi/deits/env-disable-transfer 2023-01-13 10:15:17 +01:00
Ben Irvin
738ab7e4e3
Update packages/core/admin/server/register.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-01-13 10:06:35 +01:00
dependabot[bot]
6c9af765ec
chore(deps-dev): bump core-js from 3.26.1 to 3.27.1 
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.26.1 to 3.27.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.27.1/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-13 09:03:04 +00:00
Mark Kaylor
220c3c1aba Add linking the design system docs 2023-01-13 09:56:57 +01:00
Ben Irvin
c2bd576407 configure env variables to disable/enable remote transfer route 2023-01-13 09:41:05 +01:00
Simone Taeggi
8c8e0391b2 update snapshots 2023-01-13 09:40:28 +01:00