yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-31 04:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,583 Commits 116 Branches 487 Tags
Commit Graph

523 Commits

Author SHA1 Message Date
Ben Irvin
29ce2b90cb
Merge branch 'main' into v4/generator-migration 2023-03-07 15:48:31 +01:00
dogusdeniz
93a08dea2c
Merge branch 'main' into v4/generator-migration 2023-03-06 13:33:15 +03:00
dependabot[bot]
875a2cb7ba
chore(deps): bump chalk from 4.1.1 to 4.1.2 
Bumps [chalk](https://github.com/chalk/chalk) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/chalk/chalk/releases)
- [Commits](https://github.com/chalk/chalk/compare/v4.1.1...v4.1.2)

---
updated-dependencies:
- dependency-name: chalk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-03 10:09:15 +00:00
dependabot[bot]
a4bd8b57b2
chore(deps): bump tar and @types/tar 
Bumps [tar](https://github.com/npm/node-tar) and [@types/tar](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/tar). These dependencies needed to be updated together.

Updates `tar` from 6.1.12 to 6.1.13
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v6.1.12...v6.1.13)

Updates `@types/tar` from 6.1.3 to 6.1.4
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/tar)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: "@types/tar"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-02 10:58:42 +00:00
Alexandre Bodin
435362adab Merge branch 'releases/4.7.1-hotfix' 2023-03-02 10:25:29 +01:00
Alexandre Bodin
0307fb4bf7 v4.7.1 2023-03-02 10:24:10 +01:00
DMehaffy
999c16f24e
Fix db generated config - pg port 
PG port was wrong when generating the database.js config it was using 3306 instead of 5432 as the default
 2023-02-27 20:07:01 -07:00
Convly
948dbb3121 v4.7.0 2023-02-27 20:33:14 +01:00
Convly
8f6058aacd Merge branch 'main' of github.com:strapi/strapi into features/data-transfer 2023-02-24 14:47:47 +01:00
Convly
bae505f44c v4.6.2 2023-02-22 19:06:25 +01:00
Convly
fd10b9b587 Fix the relative path for sqlite database in the default database configuration 2023-02-22 17:08:08 +01:00
dogusdeniz
dc923245ad
Merge branch 'main' into v4/generator-migration 2023-02-22 01:21:33 +03:00
Convly
478127d7c7 Merge branch 'main' of github.com:strapi/strapi into features/data-transfer 2023-02-20 16:58:46 +01:00
Gustav Hansen
dd1d8f3997
Merge pull request #15859 from strapi/dependabot/npm_and_yarn/node-fetch-2.6.9 
chore(deps): bump node-fetch from 2.6.7 to 2.6.9
 2023-02-20 12:50:53 +01:00
dependabot[bot]
0647bca2a0
chore(deps): bump node-fetch from 2.6.7 to 2.6.9 
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.7 to 2.6.9.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.7...v2.6.9)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-20 10:37:00 +00:00
Sora Morimoto
f86227b8f4 Fix a tiny syntax error in config/database.ts of the template 
Signed-off-by: Sora Morimoto <sora@morimoto.io>
 2023-02-18 04:13:48 +09:00
Josh
29761db19b chore: pr amemds 
chore: fix scripts

chore: fix dev to be develop

Update examples/getstarted/src/index.js

Update examples/getstarted/src/index.js

Co-Authored-By: markkaylor <mark.kaylor@strapi.io>
 2023-02-17 10:17:38 +01:00
Josh
db4036bc4d chore: remove axios-instance and fix types for StrapiApp 2023-02-16 13:51:54 +01:00
Josh
b026f35fde
Update packages/generators/generators/lib/templates/ts/plugin-package.json.hbs 
Co-authored-by: markkaylor <mark.kaylor@strapi.io>
 2023-02-15 08:49:55 +00:00
Josh
1e70d9d414
Update packages/generators/generators/lib/files/ts/plugin/tsconfig.json 
Co-authored-by: markkaylor <mark.kaylor@strapi.io>
 2023-02-15 08:49:49 +00:00
Josh
6339bb32ca chore: make peer deps because of how strapi works 2023-02-14 08:07:05 +00:00
Josh
412e1f3120 fix: supply custom.d.ts so people developing plugins in TS dont get errors about our packages 2023-02-13 09:49:13 +00:00
Josh
8fda2ea384 fix: amend package.json templates to include all the deps 2023-02-13 09:48:40 +00:00
Ben Irvin
2af5f5631f
Merge branch 'main' into v4/generator-migration 2023-02-13 10:12:47 +01:00
Christian
ee34f12056
Merge pull request #15732 from strapi/features/db-config-env-var 
Generate db config with all clients
 2023-02-13 10:09:53 +01:00
dogusdeniz
ab9ba1a43d
Update packages/generators/generators/lib/plops/utils/get-formatted-date.js 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-02-09 17:25:15 +03:00
dogusdeniz
adda5275fc
Update packages/generators/generators/lib/plops/migration.js 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-02-09 14:41:41 +03:00
dogusdeniz
b41b591b0d
Update packages/generators/generators/lib/templates/js/migration.js.hbs 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-02-09 14:39:47 +03:00
dogusdeniz
dcb3233315
Update packages/generators/generators/lib/templates/ts/migration.ts.hbs 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-02-09 14:39:35 +03:00
dogusdeniz
835e46b49e
Update packages/generators/generators/lib/templates/ts/migration.ts.hbs 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-02-09 14:39:23 +03:00
dogusdeniz
a8753ef660
Merge branch 'main' into v4/generator-migration 2023-02-09 09:55:19 +03:00
Convly
1dd825035c Merge branch 'main' of github.com:strapi/strapi into features/data-transfer 2023-02-08 17:22:20 +01:00
Convly
17a7845e3d v4.6.1 2023-02-08 17:00:11 +01:00
Christian Capeans
3a45faaf6e Merge branch 'main' into features/db-config-env-var 2023-02-07 16:38:40 +01:00
Bassel
a364ee79e4 fix generation of transfer token salt 2023-02-03 16:14:34 +02:00
Bassel
ad9060b296 adding api tests for transfer token crud 2023-02-03 13:46:11 +02:00
Christian Capeans
fe1bb44299 Create transfer tokens 
Co-authored-by: Bassel Kanso <basselkanso82@gmail.com>
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
Co-authored-by: Simone <simone.taeggi@strapi.io>
Co-authored-by: Ben Irvin <innerdvations@users.noreply.github.com>
 2023-02-02 13:15:41 +01:00
Marc-Roig
2d94d30cb0 Merge branch 'main' into fix/webhook-with-count-relations 2023-02-01 09:34:57 +01:00
dogusdeniz
8794482d66
Update packages/generators/generators/lib/templates/js/migration.js.hbs 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-01-31 19:15:25 +03:00
dogusdeniz
6e33f2f0cc
Update packages/generators/generators/lib/plops/utils/get-formatted-date.js 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-01-31 19:13:50 +03:00
Ben Irvin
81c65878bd
Merge branch 'main' into v4/generator-migration 2023-01-31 16:18:13 +01:00
Rémi de Juvigny
14a1972d07
Merge pull request #15589 from strapi/dependabot/npm_and_yarn/inquirer-8.2.5 
chore(deps): bump inquirer from 8.2.4 to 8.2.5
 2023-01-31 10:00:26 +01:00
dogusdeniz
370b3c7f6f
Merge branch 'main' into v4/generator-migration 2023-01-27 00:08:48 +03:00
Marc
a9ea6986a7
Merge branch 'main' into fix/webhook-with-count-relations 2023-01-26 17:27:25 +01:00
Pierre Noël
28bc7b2c4b Bump database client versions 2023-01-26 10:51:56 +01:00
dependabot[bot]
a2cf39a484
chore(deps): bump inquirer from 8.2.4 to 8.2.5 
Bumps [inquirer](https://github.com/SBoudrias/Inquirer.js) from 8.2.4 to 8.2.5.
- [Release notes](https://github.com/SBoudrias/Inquirer.js/releases)
- [Commits](https://github.com/SBoudrias/Inquirer.js/compare/inquirer@8.2.4...inquirer@8.2.5)

---
updated-dependencies:
- dependency-name: inquirer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-26 09:40:59 +00:00
Convly
a9e55435c4 v4.6.0 2023-01-25 21:17:20 +01:00
dogusdeniz
a08e99ad41
fix : CRLF issue fixed 2023-01-25 13:22:02 +03:00
Marc-Roig
15a723cca7 remove deprecation messages 2023-01-23 10:49:31 +01:00
Marc-Roig
6d05a64089 add webhooks populate relations configuration variable 2023-01-19 14:53:37 +01:00