yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2026-01-03 18:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,546 Commits 140 Branches 515 Tags
Commit Graph

180 Commits

Author SHA1 Message Date
cyril lopez
3d3bca2304
Merge pull request #10991 from strapi/v4/ds-migration 
[v4] Init DS migration
 2021-09-30 10:39:15 +02:00
Alexandre Bodin
c7a94ed081 Migrate middlwares to programmatic for plugin that do not need to export them 2021-09-29 10:47:10 +02:00
soupette
1a58633c53 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-27 07:52:19 +02:00
Alexandre Bodin
fd4701d33e Fix missing dep 2021-09-24 11:33:14 +02:00
Alexandre Bodin
f2f485ff17 Add strapi-admin.js 2021-09-23 11:24:15 +02:00
soupette
b7f521603e Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-07 13:55:15 +02:00
Pierre Noël
70eec366f9 make email, upload, CM and CTB plugins internal 2021-09-03 15:24:32 +02:00
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
soupette
f22d20e61b Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 16:13:02 +02:00
Alexandre Bodin
8972d78e8d v3.6.8 2021-08-24 11:00:41 +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
5202c4ed5c v3.6.7 2021-08-19 09:32:12 +02:00
HichamELBSI
b97383ff18 Migrate SSO providers view 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-08-12 17:10:04 +02:00
Alexandre Bodin
805e7fdb4b Merge branch 'master' into releases/v4 2021-08-04 19:24:10 +02:00
Alexandre Bodin
e63fb9d509 v3.6.6 2021-08-04 17:06:51 +02:00
Alexandre Bodin
89fee54582 Merge branch 'v4/backend' into v4/database 2021-07-30 09:50:40 +02:00
Alexandre Bodin
b4ecb48c44 Remove mongoose connector 2021-06-29 16:27:35 +02:00
Alexandre Bodin
bdbf90b567 wip 2021-06-24 18:28:36 +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
Alexandre Bodin
6f7e0c27e7 v3.6.5 2021-06-23 15:44:38 +02:00
Alexandre Bodin
37de70c4f9 v3.6.4 2021-06-23 15:19:11 +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
0ab3503e3c v3.6.3 2021-06-02 16:24:59 +02:00
Alexandre Bodin
43b947b2ba v3.6.2 2021-05-11 11:43:35 +02:00
Alexandre Bodin
2fd29041f8 v3.6.1 2021-04-29 14:34:38 +02:00
Alexandre Bodin
a14504e699 Init scoped packages 2021-04-29 12:03:54 +02:00
dependabot[bot]
31179280a1
Bump pg from 8.5.1 to 8.6.0 (#10113) 
Bumps [pg](https://github.com/brianc/node-postgres/tree/HEAD/packages/pg) from 8.5.1 to 8.6.0.
- [Release notes](https://github.com/brianc/node-postgres/releases)
- [Changelog](https://github.com/brianc/node-postgres/blob/master/CHANGELOG.md)
- [Commits](https://github.com/brianc/node-postgres/commits/pg@8.6.0/packages/pg)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-04-26 10:55:54 +02:00
Alexandre Bodin
4ab210eec6 v3.6.0 2021-04-21 17:00:57 +02:00
Alexandre Bodin
614ce35d37 Merge branch 'master' into features/i18n 2021-04-09 17:43:59 +02:00
dependabot[bot]
ca237cffdf
Bump lodash from 4.17.20 to 4.17.21 (#9990) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-04-08 14:06:59 +02:00
Alexandre Bodin
a66e0269da Merge branch 'master' into features/i18n 2021-03-25 15:07:41 +01:00
Alexandre Bodin
3065d72a4b v3.5.4 2021-03-25 14:34:45 +01:00
Alexandre Bodin
c57b3be1eb Merge branch 'master' into features/i18n 2021-03-12 09:45:51 +01:00
Alexandre Bodin
33552e43b8 v3.5.3 2021-03-11 14:25:37 +01:00
Alexandre Bodin
e9b4bf5616 Merge branch 'master' into features/i18n 2021-03-05 12:22:18 +01:00
Alexandre Bodin
1a472c98a7 v3.5.2 2021-03-01 11:24:44 +01:00
Pierre Noël
e436a34d46
fix knex, pg, mysql versions (#9511) 2021-02-24 21:59:18 +01:00
Convly
3cc49c4ea8 v3.5.1 2021-02-23 11:23:21 +01:00
Alexandre Bodin
469991f9f2 Merge branch 'master' into features/i18n 2021-02-18 14:36:32 +01:00
Alexandre Bodin
d02a7ba2fa v3.5.0 2021-02-18 11:28:28 +01:00
dependabot[bot]
04d1ac3de5
Bump sqlite3 from 5.0.0 to 5.0.1 (#9389) 
Bumps [sqlite3](https://github.com/mapbox/node-sqlite3) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/mapbox/node-sqlite3/releases)
- [Changelog](https://github.com/mapbox/node-sqlite3/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mapbox/node-sqlite3/compare/v5.0.0...v5.0.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-12 09:20:36 +01:00
Alexandre Bodin
544f98b8ee v3.4.6 2021-02-03 19:32:36 +01:00
Alexandre Bodin
5524d72396 Merge branch 'master' into features/i18n 2021-01-28 11:35:17 +01:00
Alexandre Bodin
4f9cc8a22c v3.4.5 2021-01-26 11:59:47 +01:00
Pierre Noël
3729f69e08 init i18n plugin 2021-01-22 17:57:15 +01:00
Alexandre Bodin
542786f263 v3.4.4 2021-01-20 17:31:59 +01:00