yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-16 04:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,053 Commits 117 Branches 489 Tags
Commit Graph

6989 Commits

Author SHA1 Message Date
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
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
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
ivanThePleasant
05ac05ed5a Add new function to utils that is responsible for hashing the admin user 2022-08-01 11:21:57 +03: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
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
ihmpavel
14d215c602
chore: Unify template spacing 2022-07-29 13:45:20 +02:00
Mark Kaylor
9c8cf0ebfc Test custom field data manager provider actions 2022-07-29 12:40:52 +02:00
Gustav Hansen
d67128ed9f ML: Hide bulk actions if not assets or folders exist 2022-07-29 12:34:25 +02:00
Ben Irvin
46ea867a27 fix conditions test 2022-07-29 12:22:22 +02:00
Gustav Hansen
4631f9f87b
Merge branch 'master' into feature/replace-virtualized-window 2022-07-29 12:11:04 +02:00
Gustav Hansen
05c400c391 ComponentIconPicker: Replace react-virtualized with react-window 2022-07-29 12:06:28 +02:00
Convly
4ebc128ffb Make users-permissions auth strategy use the content API permission engine 2022-07-29 10:17:06 +02:00
Ben Irvin
526d2e9025 fix tests 2022-07-29 09:42:26 +02:00
Ben Irvin
04c9514ab7 test validate hook timing 2022-07-29 09:27:18 +02:00
Ben Irvin
525e535fdf test format.permission 2022-07-29 09:19:06 +02:00
Fernando Chavez
b39d010881 Move SubHeader component and rename it to FormModalSubHeader 2022-07-28 18:21:08 -04:00
Ben Irvin
de5c1a7f57 add todo tests 2022-07-28 19:40:43 +02:00
Ben Irvin
17036e964c test hooks 2022-07-28 19:15:40 +02:00
Ben Irvin
a59821a242 Merge branch 'api-token-v2/engine-abstraction' into api-token-v2/engine-abstraction-tests 2022-07-28 18:38:14 +02:00