yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-08 09:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,133 Commits 119 Branches 482 Tags
Commit Graph

1450 Commits

Author SHA1 Message Date
Ben Irvin
7f5b10ee76
Merge branch 'main' into chore/replace-node-14-with-20 2023-06-27 13:45:23 +02:00
Convly
6f7c815c2b v4.11.2 2023-06-21 15:57:32 +02:00
Marc-Roig
6cdb5a7737
v4.11.1 2023-06-12 17:10:44 +02:00
Alexandre Bodin
0de06a008d v4.11.0 2023-06-07 17:16:22 +02:00
Convly
106cfafca4 Merge branch 'main' into releases/4.11.0 2023-06-07 11:31:42 +02:00
Josh
38fb966605
chore: upgrade ds to 1.8.0 (#16931) 2023-06-06 15:13:17 +01:00
Gustav Hansen
61ec28f647 Chore: Update @strapi/design-system and @strapi/icons to 1.7.10 2023-06-02 15:32:34 +02:00
Gustav Hansen
41885fdd3d Merge branch 'main' into chore/react18 2023-06-01 12:50:17 +02:00
Convly
da080df32b v4.10.7 2023-05-31 17:46:38 +02:00
Josh
bd89ec5d53 chore: add experimental DS version 2023-05-30 13:04:53 +02:00
DMehaffy
08ff46ddc4
Merge branch 'main' into chore/replace-node-14-with-20 2023-05-26 11:48:10 -07:00
Gustav Hansen
bd217c1970 Chore: Update @strapi/design-system and @strapi/icons to 1.7.9 2023-05-26 14:58:19 +02:00
Gustav Hansen
052bdaab64 Chore: Update @strapi/design-system and @strapi/icons to 1.7.8 2023-05-26 12:48:48 +02:00
Ben Irvin
cb2531ef6b
Merge branch 'main' into chore/replace-node-14-with-20 2023-05-25 10:16:29 +02:00
Convly
7dbae9d05d v4.10.6 2023-05-24 16:54:28 +02:00
Paul Tiedtke
301e0706b8 chore: upgrade libs to react 18 and fix tests 
chore: update snapshots

chore: fix fe tests

chore: update snapshot

Revert "revert react18 (#16793)"

This reverts commit 141d3675ab2c9a8c16eff26406bebef50ecce4c5.
 2023-05-22 15:33:31 +01:00
Josh
141d3675ab
revert react18 (#16793) 2023-05-22 12:23:24 +01:00
Josh
cb68382384
chore: update DS to 1.7.7 (#16770) 2023-05-22 10:08:09 +01:00
Josh
bdd0c462a1
chore: update to react18 (#16701) 
Co-authored-by: Paul Tiedtke <PaulTiedtke@web.de>
 2023-05-18 09:41:59 +01:00
Sébastien Vanvelthem
bc1aafcb17 refactor(example): remove @vscode/sqlite from deps 2023-05-11 19:55:15 +02:00
Convly
d9277d616b v4.10.5 2023-05-11 18:28:54 +02:00
Josh
9e8ccf93b6 chore: update DS to 1.7.5 2023-05-11 11:02:18 +01:00
Convly
62efe7c12a Merge branch 'releases/4.10.4' 2023-05-10 14:58:38 +02:00
Convly
3f55bac2e7 v4.10.4 2023-05-10 14:46:30 +02:00
Josh
c1682bf644 chore: bump ds to 1.7.4 2023-05-10 09:17:12 +01:00
Ben Irvin
c9f6a66dfb set minimum node to 16 2023-05-09 18:40:30 +02:00
Ben Irvin
87c8aea2c2 resolve merge conflicts with main 2023-05-09 18:31:42 +02:00
dependabot[bot]
47878c928e
chore(deps): bump mysql2 from 3.2.0 to 3.3.0 
Bumps [mysql2](https://github.com/sidorares/node-mysql2) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/sidorares/node-mysql2/releases)
- [Changelog](https://github.com/sidorares/node-mysql2/blob/master/Changelog.md)
- [Commits](https://github.com/sidorares/node-mysql2/compare/v3.2.0...v3.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-07 22:57:46 +00:00
Josh
ef9ed92c45 chore: update ds@1.7.3 2023-05-04 11:45:05 +01:00
Convly
939beff915 Merge branch 'releases/4.10.2' 2023-05-03 15:18:53 +02:00
Convly
a02b19866a v4.10.2 2023-05-03 15:04:25 +02:00
Josh
85b3eeb64f chore: update to DS 1.7.2 
chore: add snapshots

chore: update to 1.7.0

chore: fix tests

chore: fix hp & upload tests

chore: fix admin tests

chore: fix user-permissions FE test

chore: update snapshots and helper-plugin

fix: multi-select

chore: bump to 1.7.1

chore: bump to 1.7.2

chore: update snapshots

fix: broken test

chore: update snapshots
 2023-05-02 10:23:23 +01:00
dependabot[bot]
6ed2132d3a
Bump react-intl from 6.3.2 to 6.4.1 
Bumps [react-intl](https://github.com/formatjs/formatjs) from 6.3.2 to 6.4.1.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/react-intl@6.3.2...react-intl@6.4.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-30 23:56:52 +00:00
Ben Irvin
09d6856616 fix version typo 2023-04-28 18:07:14 +02:00
Ben Irvin
1a99a47e23 warn instead of blocking node 14 2023-04-28 17:13:15 +02:00
Ben Irvin
186d4dab57 change supported versions to node 16, 18, and 20 2023-04-28 11:18:55 +02:00
dependabot[bot]
43c26be870
Bump better-sqlite3 from 8.0.1 to 8.3.0 (#16513) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-28 08:42:04 +02:00
Alexandre Bodin
23b531cef5 v4.10.1 2023-04-26 15:45:41 +02:00
Alexandre Bodin
9b5519778f v4.10.0 2023-04-26 14:32:28 +02:00
Nathan Pichon
a51313304d
Merge pull request #15899 from strapi/feature/review-workflow 
New Feature: Review Workflows
 2023-04-24 20:53:14 +02:00
markkaylor
f1c2201b6e
Merge pull request #16265 from strapi/fix/plugin-documentation-bugs 
Fix/plugin documentation bugs
 2023-04-24 19:50:10 +02:00
Mark Kaylor
19ce046512 Apply overrides for specified versions 2023-04-24 15:25:17 +02:00
Mark Kaylor
0798cf75f3 Revert plugins config diff 2023-04-24 15:25:17 +02:00
Mark Kaylor
179f3eb65d Reduce use of lodash and respect fp immutability 2023-04-24 15:25:17 +02:00
Mark Kaylor
ff971821fb Test overrides and fix upload schema 2023-04-24 15:25:17 +02:00
Mark Kaylor
119ddd4d98 Test the current override system 2023-04-24 15:25:17 +02:00
Marc-Roig
2154952a3b chore: activate RW in getstarted category and address schemas 2023-04-24 11:58:56 +02:00
Nathan Pichon
98797cb4f5
Merge branch 'main' into feat/allow-proxy-requests-for-license-server 2023-04-19 17:48:21 +02:00
Convly
95d581b31b Merge branch 'main' into feature/review-workflow 2023-04-19 15:02:34 +02:00
Convly
91e0be2708 v4.9.2 2023-04-19 14:54:40 +02:00