yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 18:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,134 Commits 116 Branches 488 Tags
Commit Graph

24134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
7039c0d228 v4.3.2 v4.3.2 2022-08-01 17:18:09 +02:00
Julie Plantey
a163acea82
Merge pull request #13918 from strapi/folder-breadcrumbs/cm 
[Breadcrumbs] CM / ML Modal
 2022-08-01 17:13:11 +02:00
Pierre Noël
1eab2fb08c v4.3.1 v4.3.1 2022-08-01 16:44:44 +02:00
Alexandre Bodin
8ab2db1497 Fix missing private package 2022-08-01 16:41:30 +02:00
Marc-Roig
09fdd984c1 test upload image 2022-08-01 15:53:03 +02:00
Julie Plantey
9fa0adeb8e feedback fixes 2022-08-01 15:41:56 +02:00
Gustav Hansen
88caa92f87
Merge pull request #13847 from strapi/dependabot/npm_and_yarn/ora-5.4.1 
Bump ora from 5.4.0 to 5.4.1
 2022-08-01 15:31:01 +02:00
Gustav Hansen
d9a7e21abe chore: Update snapshot tests 2022-08-01 15:28:01 +02:00
Gustav Hansen
17e8700365 chore: Update @strapi/design-system to 1.2.1 2022-08-01 15:04:27 +02:00
Gustav Hansen
ae71c7a7c4 chore: Update @strapi/design-system to 1.2.1-beta.0 2022-08-01 14:54:13 +02:00
Alexandre BODIN
b186d63152
Merge pull request #13780 from strapi/dependabot/npm_and_yarn/knex-1.0.7 
Bump knex from 1.0.4 to 1.0.7
 2022-08-01 13:55:59 +02:00
Andrei
2143c2d3d0
Merge branch 'strapi:master' into strapi/fix/issue-13453-documentation-fix 2022-08-01 13:46:26 +02:00
Andrei Wilkens
f4519a89a1 renamed addSchema to addComponentSchema and fixed a template string 2022-08-01 13:44:21 +02:00
Ben Irvin
a8d6c215d2 cleanup 2022-08-01 13:40:43 +02:00
Ben Irvin
20fe90de93 test subject objects 2022-08-01 13:31:27 +02:00
Ben Irvin
56c22e33f3 fix tests 2022-08-01 13:12:10 +02:00
Ben Irvin
295133bb33 finish condition tests 2022-08-01 12:28:04 +02:00
Marc-Roig
f0b67b9ec5 add function for uploading image 2022-08-01 12:14:13 +02:00
Julie Plantey
c824230092 added test for getBreadcrumbDataCM 2022-08-01 12:05:18 +02:00
Ben Irvin
58156444e3 expect ability.rules 2022-08-01 11:46:13 +02:00
Jean-Sébastien Herbaux
ce6c3f911e
Merge pull request #13855 from strapi/fix/dz-populate-same-field-name 
Better handle populating of dynamic-zones
 2022-08-01 11:31:04 +02:00
Bassel Kanso
b218ec3997 count columns based on distinct ID 2022-08-01 12:15:05 +03:00
Jean-Sébastien Herbaux
9866d64954
Merge pull request #13747 from strapi/dependabot/npm_and_yarn/apollo-server-koa-3.10.0 
Bump apollo-server-koa from 3.1.2 to 3.10.0
 2022-08-01 10:58:08 +02:00
Convly
9aff190dc3 Merge branch 'api-token-v2/engine-abstraction' into api-token-v2/up-engine-impl 2022-08-01 10:51:22 +02:00
Convly
77d8499f65 Skip engine test while it's being refactored 2022-08-01 10:49:33 +02:00
Convly
b033e023ba Fix front tests 2022-08-01 10:48:34 +02:00
Convly
31ef51e245 Update wording 2022-08-01 10:48:01 +02:00
Convly
faf531ef7b Fix front tests 2022-08-01 10:37:52 +02:00
Ben Irvin
59b34420d7 cleanup 2022-08-01 10:22:32 +02:00
Ben Irvin
b3133075e9 fix before* hooks test 2022-08-01 09:44:42 +02:00
Convly
72c721e8e2 Remove old engine test 2022-08-01 09:31:11 +02:00
Ben Irvin
51f8210a73 re-enable condition tests 2022-08-01 09:06:23 +02:00
Ben Irvin
7d4a106f99 fix registerFunction 2022-07-31 17:56:35 +02:00
Julie Plantey
bdc0454cd7 breadcrumbs in ML modal - CM 2022-07-31 17:43:42 +02:00
Ben Irvin
673d471b30 start testing with mocks 2022-07-31 17:27:57 +02:00
Ben Irvin
1aec4fa0b7 allow createRegisterFunction to be wrapped 2022-07-31 17:15:36 +02:00
Julie Plantey
110317b6b1 updated snapshots 2022-07-31 16:51:09 +02:00
Julie Plantey
2774384c89 breadcrumbs in upload page 2022-07-31 16:39:47 +02:00
Julie Plantey
e1dc2b8634 list.asset.load translation refacto 2022-07-31 14:56:09 +02:00
Julie Plantey
e0792e28f5 ds beta update 2022-07-31 14:50:35 +02:00
Marc
47a4486943 do not override width and height 2022-07-30 10:14:37 +02:00
ihmpavel
c8b2ee26e4
Merge branch 'strapi:master' into unify-template-variables-spacing 2022-07-30 09:33:14 +02:00
ihmpavel
fc6b01d9cd
chore: Add forgotten spaces 2022-07-30 09:16:19 +02:00
Simone Taeggi
26100eea01 evaluate the webpack.config.ts file and compile the file when we build the typescript project example 2022-07-29 16:58:21 +02:00
Gustav Hansen
b511597ea2
Merge pull request #13902 from strapi/fix/ml-assetdialog-canread 
AssetDialog: Properly take canRead permissions into account
 2022-07-29 16:40:49 +02:00
Gustav Hansen
21b95f9954
Merge pull request #13886 from strapi/feature/replace-virtualized-window 
ComponentIconPicker: Replace react-virtualized with react-window
 2022-07-29 14:34:48 +02:00
Gustav Hansen
ab3972bbc7
Merge pull request #13899 from strapi/fix/ml-bulk-action 
ML: Hide bulk actions if not assets or folders exist
 2022-07-29 14:34:22 +02:00
Mark Kaylor
c14894b27f Refactor subheader 2022-07-29 14:31:36 +02:00
Gustav Hansen
7a8a3fd257 AssetDialog: Properly take canRead permissions into account 2022-07-29 14:28:59 +02:00
markkaylor
81ac2b02ba
Merge pull request #13869 from strapi/custom-fields/add-modal-header 
Custom fields/add modal header
 2022-07-29 14:27:01 +02:00