yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 18:33:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,004 Commits 121 Branches 507 Tags
Commit Graph

30004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustav Hansen
aa749f4022
Merge pull request #16675 from strapi/fix/list-view-sort 
Fix: Fix toOne sorting in CM list-view
 2023-05-11 11:11:48 +02:00
Rémi de Juvigny
bb5c73781f
Merge pull request #16644 from konstantinmuenster/patch-3 
Extend CustomFieldServerOptions types
 2023-05-10 15:47:22 +02:00
Gustav Hansen
370587f4fb Fix: Fix toOne sorting in CM list-view 2023-05-10 15:08:01 +02:00
Convly
62efe7c12a Merge branch 'releases/4.10.4' 2023-05-10 14:58:38 +02:00
Convly
22d2644740 Update yarn.lock 2023-05-10 14:53:18 +02:00
Convly
3f55bac2e7 v4.10.4 v4.10.4 2023-05-10 14:46:30 +02:00
Gustav Hansen
6227e1a4b7
Merge pull request #16581 from belgattitude/ci-improve-install-time 
CI: speed up CI time by improving yarn install and caches (iteration 1 / >30%)
 2023-05-10 14:14:38 +02:00
Josh
72f73d3c82
Merge pull request #16670 from strapi/chore/ds-174 2023-05-10 09:52:19 +01:00
Jean-Sébastien Herbaux
6530915e3d
Merge pull request #16292 from candidosales/candidosales/fix/remove-expect-ct 2023-05-10 10:51:13 +02:00
Josh
c1682bf644 chore: bump ds to 1.7.4 2023-05-10 09:17:12 +01:00
markkaylor
9be62e06be
Merge pull request #16668 from strapi/fix/open-documentation 
Fix broken open documentation link
 2023-05-10 10:10:35 +02:00
Rémi de Juvigny
b586ca303d
Merge branch 'main' into patch-3 2023-05-10 10:03:36 +02:00
Candido Sales Gomes
6f047791ec updated the yarn.lock 2023-05-09 18:13:23 -04:00
Mark Kaylor
751b2524ac Fix broken open documentation link 2023-05-09 18:26:24 +02:00
Gustav Hansen
2f83a09fbd
Merge pull request #16618 from hide-me/patch-3 
Updated Russian translation for plugin:users-permissions
 2023-05-09 16:31:27 +02:00
Paul
b1f370b446
Update ru.json 2023-05-09 16:04:46 +03:00
Paul
f9a34982af
Update ru.json 2023-05-09 16:01:54 +03:00
Gustav Hansen
dab69b8ffc
Merge pull request #16646 from strapi/chore/dynamic-table-chore 
Chore: Remove unnecessary styled overwrites
 2023-05-09 10:24:50 +02:00
Gustav Hansen
5eaf5d4b66
Merge pull request #16655 from strapi/dependabot/npm_and_yarn/webpack-dev-server-4.15.0 
chore(deps): bump webpack-dev-server from 4.13.1 to 4.15.0
 2023-05-09 09:54:40 +02:00
Gustav Hansen
2103647a8d
Merge pull request #16653 from strapi/dependabot/npm_and_yarn/msw-1.2.1 
chore(deps-dev): bump msw from 1.0.0 to 1.2.1
 2023-05-09 09:54:11 +02:00
Gustav Hansen
2736abdc12
Merge pull request #16613 from strapi/fix/color-stage-border 
Fix: Add border to stage color badges
 2023-05-09 09:38:26 +02:00
dependabot[bot]
cc647e1a60
chore(deps): bump webpack-dev-server from 4.13.1 to 4.15.0 
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.13.1 to 4.15.0.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.13.1...v4.15.0)

---
updated-dependencies:
- dependency-name: webpack-dev-server
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-09 06:31:50 +00:00
Gustav Hansen
00d4e23f22
Merge pull request #16650 from strapi/dependabot/npm_and_yarn/strapi/icons-1.7.3 
chore(deps): bump @strapi/icons from 1.6.5 to 1.7.3
 2023-05-09 08:30:11 +02:00
Gustav Hansen
bf72341340
Merge pull request #16651 from strapi/dependabot/npm_and_yarn/fingerprintjs/fingerprintjs-3.4.1 
chore(deps): bump @fingerprintjs/fingerprintjs from 3.3.6 to 3.4.1
 2023-05-09 08:29:20 +02:00
Gustav Hansen
2f62e899f9
Merge pull request #16654 from strapi/dependabot/npm_and_yarn/webpack-cli-5.1.0 
chore(deps): bump webpack-cli from 5.0.1 to 5.1.0
 2023-05-09 08:28:54 +02:00
dependabot[bot]
6bbbf5fac2
chore(deps): bump webpack-cli from 5.0.1 to 5.1.0 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 5.0.1 to 5.1.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@5.0.1...webpack-cli@5.1.0)

---
updated-dependencies:
- dependency-name: webpack-cli
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-08 13:22:51 +00:00
dependabot[bot]
f58fcc2208
chore(deps-dev): bump msw from 1.0.0 to 1.2.1 
Bumps [msw](https://github.com/mswjs/msw) from 1.0.0 to 1.2.1.
- [Release notes](https://github.com/mswjs/msw/releases)
- [Changelog](https://github.com/mswjs/msw/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mswjs/msw/compare/v1.0.0...v1.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-08 13:22:21 +00:00
dependabot[bot]
0a0c2d2b50
chore(deps): bump @fingerprintjs/fingerprintjs from 3.3.6 to 3.4.1 
Bumps [@fingerprintjs/fingerprintjs](https://github.com/fingerprintjs/fingerprintjs) from 3.3.6 to 3.4.1.
- [Release notes](https://github.com/fingerprintjs/fingerprintjs/releases)
- [Commits](https://github.com/fingerprintjs/fingerprintjs/compare/v3.3.6...v3.4.1)

---
updated-dependencies:
- dependency-name: "@fingerprintjs/fingerprintjs"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-08 13:21:14 +00:00
dependabot[bot]
d68daa2061
chore(deps): bump @strapi/icons from 1.6.5 to 1.7.3 
Bumps @strapi/icons from 1.6.5 to 1.7.3.

---
updated-dependencies:
- dependency-name: "@strapi/icons"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-08 13:20:43 +00:00
Gustav Hansen
c21ac55dba
Merge pull request #16647 from strapi/chore/increase-dependabot-limit 
Chore: Increase dependabot open-pr limit to 10
 2023-05-08 15:18:54 +02:00
Gustav Hansen
8badb6b9ea
Merge pull request #16640 from amanmalh/fix/logo-stretch 
fix: change alignment from stretch to center
 2023-05-08 14:45:25 +02:00
Marc
02b5a8cc70
Merge pull request #16641 from strapi/dependabot/npm_and_yarn/mysql2-3.3.0 2023-05-08 14:29:13 +02:00
Gustav Hansen
9c6c9ad560 Chore: Update snapshot tests 2023-05-08 13:10:30 +02:00
Gustav Hansen
2e5eaa015a
Merge pull request #16517 from Boegie19/fix-jest-testMatch 
fix testMatch /ignore
 2023-05-08 13:01:54 +02:00
Gustav Hansen
d6a65d7d42
Merge pull request #16615 from hide-me/patch-2 
Created Russian translation for plugin:i18n
 2023-05-08 12:47:49 +02:00
Gustav Hansen
45ec031f9d
Merge pull request #16612 from hide-me/patch-1 
Update Russian translation for core:admin
 2023-05-08 12:45:46 +02:00
Gustav Hansen
f7200674bb Chore: Increase dependabot open-pr limit to 10 2023-05-08 12:36:24 +02:00
Gustav Hansen
5e000ddde1
Merge pull request #16541 from strapi/dependabot/npm_and_yarn/resolve-1.22.2 
Bump resolve from 1.20.0 to 1.22.2
 2023-05-08 12:28:46 +02:00
Gustav Hansen
a8ab02a16a
Merge pull request #16643 from strapi/dependabot/npm_and_yarn/lint-staged-13.2.2 
chore(deps-dev): bump lint-staged from 13.0.3 to 13.2.2
 2023-05-08 12:26:16 +02:00
Gustav Hansen
028a044e6f
Merge pull request #16642 from strapi/dependabot/npm_and_yarn/webpack-5.82.0 
chore(deps): bump webpack from 5.76.0 to 5.82.0
 2023-05-08 12:25:25 +02:00
Gustav Hansen
b2e08defbb Chore: Remove styled overwrites 2023-05-08 12:18:14 +02:00
Gustav Hansen
81c9189bd7 Chore: Remove unnecessary styled overwrite 2023-05-08 12:08:19 +02:00
Josh
b59f3d57e5
Merge pull request #16635 from strapi/chore/stop-mocking-use-tracking 2023-05-08 10:27:52 +01:00
Gustav Hansen
56413f25c6 Chore: Update tests 2023-05-08 11:26:01 +02:00
Gustav Hansen
a69bc50ddb Fix: do not crash if no color can be displayed 2023-05-08 11:26:01 +02:00
Gustav Hansen
94ce1a8e4d Fix: Limit border of stage color badges to neutral0 (white) 2023-05-08 11:26:01 +02:00
Gustav Hansen
2145a3c1f5 Fix: Add border to stage color badges 2023-05-08 11:26:01 +02:00
Konstantin Münster
2c4dce9273
Update CustomFieldServerOptions 
inputSize properties aren't optional
 2023-05-08 10:34:22 +02:00
Konstantin Münster
71e00b0180
Extend CustomFieldServerOptions 
add new inputSize configuration
 2023-05-08 10:22:50 +02:00
Josh
444d3200c7
Merge pull request #16549 from dome4/main 2023-05-08 08:31:18 +01:00