yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-14 11:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,084 Commits 117 Branches 494 Tags
Commit Graph

12 Commits

Author SHA1 Message Date
Mark Kaylor
5411a8e7c9 resolve merge conflicts 2021-08-27 15:06:52 +02:00
Alexandre Bodin
1ee2d2c483 Merge branch 'master' into releases/v4 2021-08-25 14:44:32 +02:00
Alexandre Bodin
fd255077e3 Fix merge conflicts 2021-08-23 16:45:44 +02:00
markkaylor
b1ff616fd5 add generators to cli (#10779) 
* add generators to cli

* add strapi generate comment

* remove old generators

* rename generator-cli -> generate

* list generators alphabetically

* update package description

* add check for strapi app in cwd
 2021-08-23 16:17:54 +02:00
Alexandre Bodin
f528a865cb Merge branch 'master' of github.com:strapi/strapi into releases/v4 2021-08-19 10:12:58 +02:00
Alexandre Bodin
805e7fdb4b Merge branch 'master' into releases/v4 2021-08-04 19:24:10 +02:00
Alexandre BODIN
eda51cc08a
Merge pull request #10518 from strapi/drop-node-10 
Drop support for node10
 2021-06-23 18:32:04 +02:00
Alexandre Bodin
356ee09ed2 Merge branch 'master' into releases/v4 2021-06-23 18:23:54 +02:00
Convly
13052049b0 Add support for node 16, update readme 2021-06-23 07:55:40 +02:00
Convly
1a39d934f8 Drop support for node10, set new oldest supported node version to 12.x.x 2021-06-21 10:56:57 +02:00
Alexandre Bodin
ab3760bb66 Rename import & requires, fix tests 2021-04-29 13:51:12 +02:00
Alexandre Bodin
a14504e699 Init scoped packages 2021-04-29 12:03:54 +02:00