yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-02 10:04:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,542 Commits 141 Branches 511 Tags
Commit Graph

23542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Kaylor
c2062e4096 Update node version 2022-09-13 14:08:59 -04:00
Mark Kaylor
062f92cc99 Merge branch 'features/custom-fields' of github.com:strapi/strapi into custom-fields/rm-plugin 2022-09-13 10:56:43 -04:00
Mark Kaylor
21fd40e243 Merge branch 'main' of github.com:strapi/strapi into features/custom-fields 2022-09-13 10:30:19 -04:00
Mark Kaylor
23d9adbfef Convert type in register function 2022-09-13 10:04:39 -04:00
Mark Kaylor
ed2b0588c6 Fix name and version 2022-09-13 08:47:00 -04:00
Mark Kaylor
a67ff09585 Merge branch 'features/custom-fields' of github.com:strapi/strapi into custom-fields/rm-plugin 2022-09-13 08:20:49 -04:00
markkaylor
1ebd4afdff
Merge pull request #14391 from strapi/custom-fields/fix-type-conversion 
[Custom fields] Fix type conversion
 2022-09-13 08:17:04 -04:00
Marc
e961086382
Merge pull request #14373 from konstantinmuenster/patch-2 2022-09-13 04:34:40 +02:00
Mark Kaylor
dadd495077 Update snapshot 2022-09-12 14:53:37 -04:00
Mark Kaylor
c4197573cd Lint fix 2022-09-12 14:53:13 -04:00
Mark Kaylor
d686d4975b Use standard CSS comments to avoid lint error 2022-09-12 14:43:39 -04:00
Mark Kaylor
8f0e20d226 Rename plugin custom-fields => color-picker 2022-09-12 14:16:35 -04:00
Mark Kaylor
923d87fdbf Move customField to content-type and component valid types 2022-09-12 11:22:10 -04:00
Mark Kaylor
08e40eecf9 Remove type conversion util 2022-09-12 10:44:15 -04:00
Mark Kaylor
1f8b261bc7 Update snapshots 2022-09-12 10:36:42 -04:00
Mark Kaylor
39c04410c1 Convert customField type before sending to server 2022-09-12 10:36:13 -04:00
Marc
9dc51aa95a
Merge branch 'main' into patch-2 2022-09-12 14:59:47 +02:00
Julie Plantey
3b53153723
Merge pull request #14290 from WalkingPizza/fix/13648 
Trim admin's first name when validating
 2022-09-12 10:31:32 +02:00
Konstantin Münster
1ed929d8c0
update sharp in upload package 2022-09-10 15:02:11 +02:00
Julie Plantey
760b396b7d
Merge pull request #14292 from Zharkan/fix-fr-translations 
fix: some french translations are not correct
 2022-09-09 15:20:49 +02:00
Alexandre BODIN
ee00599cd7
Merge pull request #14362 from strapi/chore/node-18-readmes 
Update readme with node 18 support
 2022-09-08 16:45:14 +02:00
Alexandre Bodin
d0404ffa7a Update readme with node 18 support 2022-09-08 16:38:57 +02:00
Alexandre BODIN
59b83c5953
Merge pull request #14320 from strapi/chore/eslint 
chore/eslint
 2022-09-08 14:45:12 +02:00
Alexandre BODIN
90fb8d9aea
Merge pull request #14350 from strapi/chore/node-18 
Add node 18
 2022-09-08 14:38:04 +02:00
Alexandre Bodin
6654ad3528 Add node 18 2022-09-08 08:44:27 +02:00
Rémi de Juvigny
778f30cb6c Remove mycustomfields plugin 2022-09-07 18:34:29 +02:00
Alexandre Bodin
c44f21d5ba v4.3.8 v4.3.8 2022-09-07 16:47:41 +02:00
Alexandre BODIN
786684f36c
Merge pull request #14342 from strapi/fix/sqlite-pk-migration 
Create id column as nullable to avoid conflict with default null values
 2022-09-07 16:46:43 +02:00
Alexandre Bodin
886fcc015d Create id column as nullable to avoid conflict with default null values 2022-09-07 15:59:07 +02:00
Alexandre Bodin
73f523b983 v4.3.7 v4.3.7 2022-09-07 14:24:30 +02:00
Alexandre BODIN
c84fe78a13
Merge pull request #14332 from strapi/chore/increments-updates 
Improve pk management in schema builder
 2022-09-07 11:11:15 +02:00
Rémi de Juvigny
b381606c1a WIP remove mycustomfields plugin 2022-09-07 10:56:25 +02:00
Alexandre Bodin
019e13d8e9 Improve pk management in schema builder 2022-09-07 09:11:50 +02:00
Gustav Hansen
75380e4e2b
Merge pull request #14326 from strapi/fix/select-loading-message-prop-types 
SelectMany/ SelectOne: Fix loadingMessage prop-types
 2022-09-06 22:21:49 +02:00
Alexandre Bodin
961d535ea9 Fix for in working with undefined 2022-09-06 20:32:15 +02:00
Gustav Hansen
b36327cae7 SelectMany/ SelectOne: Fix loadingMessage prop-types 2022-09-06 14:48:54 +02:00
Alexandre BODIN
ec040e6075
Merge pull request #14267 from WalkingPizza/fix/14193 
Allow USE RETURNING in SQLite
 2022-09-06 14:28:07 +02:00
Kevin Antonio Rateni Iatauro
0dc64e1c09
Merge branch 'main' into fix/13648 2022-09-06 13:26:12 +02:00
Zharkan
6fb223b1e6
fix typo 2022-09-06 11:36:34 +02:00
Alexandre Bodin
70b6966458 Fix eslint database 2022-09-05 19:44:58 +02:00
Alexandre Bodin
22589cf0e1 Fix eslint core strapi 2022-09-05 17:53:28 +02:00
Pierre Noël
e06062ce6e
Merge pull request #14296 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1208.0 
Bump aws-sdk from 2.1188.0 to 2.1208.0
 2022-09-05 16:25:47 +02:00
Alexandre Bodin
7b9866a770 Fix eslint utils 2022-09-05 16:23:18 +02:00
Alexandre Bodin
eab835e301 Fix eslint content-manager 2022-09-05 16:20:47 +02:00
Alexandre Bodin
e3d92185f1 Fix eslint content-type-builder 2022-09-05 16:20:10 +02:00
Alexandre Bodin
4e989321e3 Fix eslint core/admin 2022-09-05 16:15:21 +02:00
Pierre Noël
578d8b4682
Merge branch 'main' into dependabot/npm_and_yarn/aws-sdk-2.1208.0 2022-09-05 15:20:42 +02:00
Alexandre Bodin
04f218346d Fix esint in generators folder 2022-09-05 15:19:02 +02:00
Alexandre Bodin
e57f02d2d9 Fix eslint in plugins folder 2022-09-05 15:18:24 +02:00
Alexandre Bodin
c563955d46 Lighten no-param-reassign 2022-09-05 15:07:36 +02:00