yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,147 Commits 127 Branches 497 Tags
Commit Graph

14919 Commits

Author SHA1 Message Date
Pierre Noël
1c1b08b8ac remove useless code 2022-02-15 15:03:48 +01:00
Pierre Noël
8ccd3406b6 detect valid JSON string to not parse twice 2022-02-15 15:03:47 +01:00
Pierre Noël
8c2251bb79 stop parsing JSON 2022-02-15 15:03:47 +01:00
Alexandre BODIN
1f5728f9b7
Merge pull request #12532 from konstantinmuenster/patch-1 
Update sharp in upload plugin
 2022-02-15 13:45:25 +01:00
Alexandre BODIN
5e4c1eb274
Merge pull request #12519 from strapi/fix-cm-injection-zone 
Put CM links injection zone on top of the other links
 2022-02-15 13:44:51 +01:00
Gustav Hansen
55f07ec804
Merge pull request #12428 from strapi/content-92/remove-assets-upload 
UploadDialog: allow removing assets before uploading
 2022-02-15 13:37:36 +01:00
soupette
bbbb981dbb Fix snapshots 
Signed-off-by: soupette <cyril@strapi.io>
 2022-02-15 12:42:09 +01:00
Gustav Hansen
48e60db5c3 chore: Remove bad merge leftover 2022-02-15 12:29:52 +01:00
Gustav Hansen
bece301d57
Merge pull request #12266 from iicdii/feature/enable-to-drop-image 
Enable to drop image to upload dialog in edit view
 2022-02-15 12:26:24 +01:00
Konstantin Münster
497039e135
Update sharp in upload plugin 2022-02-15 11:06:04 +01:00
soupette
7f0d73eee3 Fix conflicts with yarn.lock 
Signed-off-by: soupette <cyril@strapi.io>
 2022-02-15 09:50:31 +01:00
Gustav Hansen
dfdba4fc9d
Merge pull request #12504 from godzzo/godzzo/issue12498 
Fixing Drag ordering bug with Nested Component.
 2022-02-15 09:01:08 +01:00
Dieter Sting
bc48274555
Merge pull request #12042 from sunnysonx/fix/generator 
Fix: Corrected file paths when generating CTs, APIs, Controllers, Middlewares, Policies, Services inside Plugins
 2022-02-15 08:22:38 +01:00
Jean-Sébastien Herbaux
5da5c3a8f7
Merge pull request #12467 from strapi/enhancement/gql-artifacts-generation 
Add configuration options to generate graphql schema + types
 2022-02-14 16:48:09 +01:00
Convly
97254f8d42 Use strapi.config.get instead of process.env 2022-02-14 14:02:06 +01:00
Convly
974b33b336 Add dedicated configuration option for shouldGenerateArtifacts: generateArtifacts 2022-02-14 13:45:13 +01:00
Alexandre BODIN
4ebeda2256
Merge pull request #12037 from tuxuuman/optimizing-and-refactoring 
optimization and refactoring the verify function
 2022-02-14 12:18:44 +01:00
soupette
3a2c4b905b Put CM links injection zone on top of the other links 
Signed-off-by: soupette <cyril@strapi.io>
 2022-02-14 11:06:41 +01:00
Convly
ae7731ce31 Add configuration options to generate graphql schema + types 2022-02-14 11:01:24 +01:00
Gustav Hansen
150a7b94cc AssetCard: Update snapshot tests 2022-02-14 08:53:07 +01:00
godzzo
e1e4e89686 Fixing Drag ordering with Nested Component. 
Fixes #12498
 2022-02-13 15:24:51 +01:00
sunnyson
989cfe3ec5
remove unused import 
Co-authored-by: Dieter Sting <3165079+Elhebert@users.noreply.github.com>
 2022-02-11 22:31:26 +02:00
Alexandre BODIN
205c945292
Merge pull request #12410 from smoothdvd/patch-1 
remove extra '/' in baseURL
 2022-02-11 14:58:35 +01:00
Gustav Hansen
4136ecf254 CM: Automatically format row layouts after changing the field size 
Co-authored-by: Cyril Lopez <cyril@strapi.io>
 2022-02-11 13:36:18 +01:00
Gustav Hansen
408f29ec60 chore: lint code 2022-02-11 13:36:18 +01:00
Gustav Hansen
790e384105 CM: Add missing prop-types 2022-02-11 13:36:18 +01:00
Gustav Hansen
9bf057b9fb CM: Make fields resizable 2022-02-11 13:36:18 +01:00
Gustav Hansen
c434b61e1c CM: Add tests for field helper functions 2022-02-11 13:36:18 +01:00
Gustav Hansen
edb2f0f95e CM: Create helper functions to get/ set fieldSizes 2022-02-11 13:36:18 +01:00
Gustav Hansen
57eedcdc98 AssetCard: update card actions to use the latest design-system 2022-02-11 13:29:50 +01:00
Gustav Hansen
44511e6232 AssetCard: Update snapshot test 2022-02-11 13:19:05 +01:00
Gustav Hansen
0e97b4cb90 AssetCard: move extension prop into commonProps 2022-02-11 13:15:41 +01:00
Gustav Hansen
7ec1e978b1 AssetCard: simplify common props 2022-02-11 13:15:41 +01:00
Gustav Hansen
7cba515655 UploadDialog: User proper design-system spacing 2022-02-11 13:15:41 +01:00
Gustav Hansen
5a6bc81f3d UploadDialog: allow removing assets before uploading 2022-02-11 13:15:41 +01:00
Gustav Hansen
3c9ab240de
Merge pull request #12473 from strapi/feature/ds-alpha-75 
chore: Bump design-system version
 2022-02-11 13:14:34 +01:00
smoothdvd
65c03caede
Update packages/plugins/users-permissions/server/bootstrap/index.js 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2022-02-11 18:51:01 +08:00
Gustav Hansen
e8cf8aabb7
Merge pull request #12463 from strapi/hotfix/ctb-curve-alignment 
CTB: Fix alignment of curve icons in production mode
 2022-02-11 11:35:34 +01:00
tuxuuman
d3a0b225a6
Update packages/plugins/users-permissions/server/strategies/users-permissions.js 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2022-02-11 15:32:14 +05:00
Alexandre BODIN
02c93fe832
Merge pull request #12465 from strapi/plugin-documentation/fix-custom-settings 
Fix custom settings override
 2022-02-11 10:53:29 +01:00
Alexandre BODIN
96938b4779
Merge pull request #12468 from strapi/chore/upgrade-fp 
Enhancement: Upgrade fp version to 3.2.2
 2022-02-11 10:51:53 +01:00
Gustav Hansen
270fb6b288 chore: Update snapshot tests 2022-02-11 10:49:54 +01:00
Maxime Castres
347bede831 Fix: Upgrade fp version to 3.3.2 2022-02-11 10:08:49 +01:00
sunnyson
43c58cb692
Update packages/generators/generators/lib/plops/api.js 
Co-authored-by: Dieter Sting <3165079+Elhebert@users.noreply.github.com>
 2022-02-10 21:55:29 +02:00
Gustav Hansen
507f7c4094 CTB: Fix alignment of curve icons in production mode 2022-02-10 18:18:29 +01:00
Gustav Hansen
73853a16da chore: Update snapshot tests 2022-02-10 18:04:42 +01:00
Gustav Hansen
8e6204251d chore: Bump design-system version 2022-02-10 18:03:28 +01:00
Maxime Castres
8659741ab8 Enhancement: Upgrade fp version to 3.2.2 2022-02-10 17:09:06 +01:00
Mark Kaylor
46f09b3a45 fix custom settings override 2022-02-10 15:55:29 +01:00
Gustav Hansen
8475dee2b5 chore: Update snapshot tests 2022-02-10 15:44:44 +01:00