yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-28 11:30:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,846 Commits 112 Branches 486 Tags
Commit Graph

845 Commits

Author SHA1 Message Date
Alexandre Bodin
7bfa5eb0b7 Merge branch 'main' into chore/ts-strapi 2023-09-20 17:54:15 +02:00
Alexandre Bodin
c11abe8823 v4.13.7 2023-09-20 16:48:49 +02:00
Ben Irvin
821832048a allow some config options to be optional 2023-09-20 11:44:56 +02:00
Alexandre Bodin
d178ebcd1d Revert change breaking linter 2023-09-19 14:38:33 +02:00
Alexandre Bodin
7cb9467bcc Fix minor linting issues 2023-09-19 13:39:40 +02:00
Alexandre Bodin
831e5b02fa Add back peer dep for e2e to work 2023-09-18 21:12:02 +02:00
Alexandre Bodin
73c9ec1450 Rename @strapi/typings to @strapi/types 2023-09-18 15:57:06 +02:00
Alexandre Bodin
eba63f7bca Fix chalk imports and improve types 2023-09-18 15:45:46 +02:00
Alexandre Bodin
5b202024e7 Play around with mock issues on CI 2023-09-15 20:32:39 +02:00
Alexandre Bodin
85d51b9741 Try to fix bug only in CI 2023-09-15 19:03:17 +02:00
Alexandre Bodin
bac1fb9210 Fix tests & make router config optional 2023-09-15 18:37:02 +02:00
Alexandre Bodin
efc1c40f22 Apply review comments 2023-09-15 11:09:37 +02:00
Alexandre Bodin
aa2ceb4ec3 Use resolutions to for koa types version 2023-09-15 11:01:12 +02:00
Alexandre Bodin
ccec6c9fc3 Merge branch 'main' into chore/ts-strapi 2023-09-15 10:53:49 +02:00
Ben Irvin
e9ff720a77
Merge pull request #18029 from strapi/fix/16836-dts-postgres-schema 2023-09-15 10:04:22 +02:00
Alexandre Bodin
d44586fa07 v4.13.6 2023-09-13 17:35:18 +02:00
Mark Kaylor
ffe87e8131 Merge tag 'v4.13.5' into releases/4.13.6 
v4.13.5
 2023-09-13 17:05:03 +02:00
Alexandre Bodin
955393fc3e v4.13.5 2023-09-12 16:40:40 +02:00
Ben Irvin
66ac88ef36 update comment 2023-09-12 11:57:40 +02:00
Alexandre Bodin
6dd6474e0d Merge branch 'main' into chore/ts-strapi 2023-09-12 10:45:03 +02:00
Ben Irvin
277627708c Another addschema 2023-09-12 10:09:41 +02:00
Ben Irvin
9c49c4445f use schema names in custom queries 2023-09-12 10:04:06 +02:00
Alexandre Bodin
0cc6505a60 Merge branch 'releases/4.13.4' 2023-09-11 19:18:25 +02:00
Alexandre Bodin
0bd5f29edd v4.13.4 2023-09-11 19:08:12 +02:00
Alexandre Bodin
ad9def07c2 fix data-transfer build cmd 2023-09-11 11:02:00 +02:00
Alexandre Bodin
6af5657b3f Use @strapi/typings 2023-09-07 21:55:12 +02:00
Alexandre Bodin
49e0c08fca Init typings pkg and move dts import to it 2023-09-07 19:15:50 +02:00
Alexandre Bodin
ddaa9e6775 Migrate latest to ts 2023-09-07 01:12:44 +02:00
Alexandre Bodin
c779954631 Merge branch 'main' into chore/ts-strapi 2023-09-06 23:41:27 +02:00
Convly
73975e0c4a Merge branch 'main' of github.com:strapi/strapi into releases/4.13.3 2023-09-06 15:16:24 +02:00
Convly
377efaba51 v4.13.3 2023-09-06 15:02:03 +02:00
Convly
42e9b4e200 Fix peer dependency 2023-09-06 15:01:40 +02:00
Alexandre Bodin
646a1f0b83 Fix tests 2023-09-06 12:53:59 +02:00
Alexandre Bodin
92d2d1f5b2 Fixing tests 2023-09-06 12:16:29 +02:00
Alexandre Bodin
7abb7aa1cc Resolve circular dependency 2023-09-06 11:37:49 +02:00
Alexandre Bodin
d4bbbcf4d0 Adjusting typings 2023-09-05 23:05:52 +02:00
dependabot[bot]
f0145d6a84
chore(deps): bump typescript from 5.1.3 to 5.2.2 
Dependabot couldn't find the original pull request head commit, 3665f011c6fd6ed297725e27f920242fba07c668.
 2023-09-05 14:21:09 +00:00
Alexandre Bodin
f031820696 fix EE imports 2023-09-05 00:18:13 +02:00
Ben Irvin
7c01fb05be
Merge pull request #17831 from felthy/main 2023-09-04 18:58:18 +02:00
Marc Roig
e56967184d
v4.13.2 (#17927) 2023-09-04 18:44:41 +02:00
Alexandre Bodin
a9afeb90c5 v4.13.1 2023-08-30 18:14:57 +02:00
Alexandre Bodin
f018a3d19d wip 2023-08-30 14:00:43 +02:00
Alexandre Bodin
a2ec2fce00 Merge branch 'main' into chore/ts-strapi 2023-08-30 09:59:10 +02:00
Ben Irvin
41844c2867
[Feature] Entity Service types (#17799) 
Co-authored-by:  christiancp100 <christian.capeans.perez@strapi.io>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
Co-authored-by: Ben Irvin <ben@innerdvations.com>
Co-authored-by: Ben Irvin <innerdvations@users.noreply.github.com>
Co-authored-by: Christian <christiancp100@gmail.com>
Co-authored-by: Bassel Kanso <basselkanso82@gmail.com>
Co-authored-by: Marco Autiero <marcoautiero@gmail.com>
Co-authored-by: Convly <jean-sebastien.herbaux@epitech.eu>
Co-authored-by: christiancp100 <christian.capeans.perez@strapi.io>
Co-authored-by: Christian Capeans <christiancp100@gmail.com>
Co-authored-by: Bassel <basselkanso82@gmail.com>
 2023-08-30 09:56:38 +02:00
Christian
5aabc0c326
Merge pull request #17845 from strapi/fix/exclude-only-acts-also-on-restore 2023-08-30 09:51:50 +02:00
Alexandre Bodin
d700468267 wip 2023-08-30 09:14:11 +02:00
Christian Capeans
e48303000b Remove check for excluding non-local providers 2023-08-29 11:05:02 +02:00
Christian
ce51df0e18
Merge pull request #17730 from strapi/fix/exclude-only-acts-also-on-restore 2023-08-28 19:01:32 +02:00
Christian Capeans
1a54d70801 Rename thisStrapi to strapi 2023-08-28 16:51:22 +02:00
Pete Feltham
377434099c
Fix strapi import failure caused by commas inserted into asset metadata at 1024 byte intervals 2023-08-28 18:56:23 +10:00