yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-13 17:15:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,106 Commits 103 Branches 503 Tags
Commit Graph

193 Commits

Author SHA1 Message Date
Ben Irvin
3a9b663762
Merge branch 'main' into enh/allow-mysql2 2023-03-28 16:01:59 +02:00
Ben Irvin
892aeeee71
Update packages/generators/app/lib/utils/db-client-dependencies.js 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2023-03-27 08:55:33 +02:00
Ben Irvin
41c7792b54 add mysql2 as a db client option 2023-03-22 12:11:15 +01:00
Arthur
92fc52e2fa
chore: use default port for postgres fallback 
the default postgres default port is 5432
 2023-03-17 20:52:13 -07: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
8f6058aacd Merge branch 'main' of github.com:strapi/strapi into features/data-transfer 2023-02-24 14:47:47 +01:00
Convly
fd10b9b587 Fix the relative path for sqlite database in the default database configuration 2023-02-22 17:08:08 +01:00
Convly
478127d7c7 Merge branch 'main' of github.com:strapi/strapi into features/data-transfer 2023-02-20 16:58:46 +01: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
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
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
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
ivanThePleasant
5620b25138 Merge branch 'main' into chore/user-level-data 2022-10-25 15:21:38 +03:00
Gustav Hansen
044ca89bdf chore: Update favicon new 2022 version 2022-10-18 13:59:01 +02:00
Matteo Pietro Dazzi
226f4265ea fix: dist folder in gitignore files 2022-10-14 17:19:19 +02:00
Dieter Stinglhamber
cb215e1282 fix the db usernam env variable 2022-10-07 14:59:34 +02:00
ivanThePleasant
de25284aac Merge branch 'main' into chore/user-level-data 2022-10-04 10:08:53 +03:00
Convly
706b8a5d56 Revert to STRAPI_HOSTING 2022-09-30 11:40:05 +02:00
Convly
340b17d6da Update wording 2022-09-29 18:12:05 +02:00
Convly
55fbe1ad10 Remove console.log 2022-09-29 17:41:54 +02:00
Convly
a1c7185252 Add hostedOnStrapiCloud property to the telemetry events 2022-09-29 17:35:18 +02:00
ivanThePleasant
b51b0f4616 Merge branch 'main' into chore/user-level-data 2022-09-21 10:24:18 +03:00
Alexandre BODIN
59b83c5953
Merge pull request #14320 from strapi/chore/eslint 
chore/eslint
 2022-09-08 14:45:12 +02:00
Dieter Stinglhamber
10aaea4d39 add connection pool settings 2022-09-08 08:49:21 +02:00
Alexandre Bodin
6654ad3528 Add node 18 2022-09-08 08:44:27 +02:00
Dieter Stinglhamber
2ae198e690 add schema and connection timeout 2022-09-08 08:14:11 +02:00
ivanThePleasant
3759c2885e Change analytics url endpoint, refactor all senders to the new api format 2022-09-06 09:07:11 +03:00
Alexandre Bodin
04f218346d Fix esint in generators folder 2022-09-05 15:19:02 +02:00
ivanThePleasant
b5c98ae0cd Refactor event calls to follow old format, encapsulate hashing in the sender, refactor the format of event payload to better correspond to the new api 2022-09-02 14:43:51 +03:00
ivanThePleasant
cbfde4a11c Merge branch 'main' into chore/user-level-data 2022-09-02 12:22:12 +03:00
Dieter Stinglhamber
c068ec5aef fix sqlite client 2022-09-01 09:17:23 +02:00
Dieter Stinglhamber
28db135322 remove DATABASE_URL for SQLite 2022-09-01 07:53:05 +02:00
Dieter Stinglhamber
5b5fe16dd7 update db template 2022-08-31 14:20:27 +02:00
fdel-car
1bfb12eceb Rename platform to osPlatform 2022-08-26 18:35:19 +02:00
Dieter Stinglhamber
db25b274e0 generate db config with all clients 2022-08-26 15:54:01 +02:00
ivanThePleasant
a1ea7439ea Merge branch 'main' into chore/user-level-data 2022-08-25 15:21:39 +03:00
fdel-car
50f6939f93 Update metadata casing and structure 2022-08-24 11:17:38 +02:00
Gustav Hansen
78af3ebe62
Merge pull request #13872 from strapi/feature/amplitude-arch 
Add tracking property for os.arch() to Amplitude / Sentry (project creation)
 2022-08-24 09:46:39 +02:00
Gustav Hansen
8e14a14938 Sentry: Add os.arch() as event tag 2022-08-22 12:08:24 +02:00
Gustav Hansen
de4df3874a Amplitude: Add tracking property for os.arch() 2022-08-22 09:14:02 +02:00
Ben Irvin
1e3144b002 Merge branch 'main' into fix/typescript-special-char-path 2022-08-18 11:09:38 +02:00
Ben Irvin
06596f5e4d leave the original values alone 2022-08-17 11:09:27 +02:00
Ben Irvin
53852582cd fix included files 2022-08-12 18:06:11 +02:00
Ben Irvin
ae41b5669c update paths 2022-08-12 17:50:37 +02:00
Ben Irvin
69ae32594e fix logic 2022-08-12 14:24:24 +02:00