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

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pierre Noël
da70af1294 remove offset & limit when counting in populate 2022-10-07 20:21:15 +02:00
Alve Svarén
c137521cd3
Merge branch 'main' into master 2022-10-07 19:07:19 +02:00
Pierre Noël
98e8bc61e0 use transformLoadParamsToQuery instead of transformParamsToQuery to fix ordering being ignored in loadPages() 2022-10-07 18:49:15 +02:00
Pierre Noël
88ff30d6b0
Merge pull request #14564 from strapi/relations-main-view/database-transaction 
Add transaction in DB entity manager
 2022-10-07 18:46:59 +02:00
Julie Plantey
d4e1b4ac88
Merge pull request #14508 from HonzaVrkota/main 
Add czech translate color-picker plugin
 2022-10-07 18:40:20 +02:00
Simone Taeggi
d663c6505d Merge branch 'main' into fix/clean-test-warnings 2022-10-07 17:44:59 +02:00
Simone Taeggi
0ee0990b68 fix fa icon test warnings based on soupette and gustav review 2022-10-07 17:43:11 +02:00
Jamie Howard
72e0ba46ee Merge branch 'feature/relations-main-view' of github.com:strapi/strapi into fix/relations/rel-error-handling 2022-10-07 16:22:53 +01:00
Mark Kaylor
6d8140ae75 Fix number and add defaults 2022-10-07 16:17:50 +02:00
Gustav Hansen
34ecc496e1
Merge pull request #14555 from strapi/feature/relations-main-view-i18n 
i18n: Inject i18n queryInfos for relations
 2022-10-07 16:12:43 +02:00
Gustav Hansen
34a7af2ab6 useRelation: Disable query cache for relations 2022-10-07 15:50:54 +02:00
Pierre Noël
95f3abfa6b remove TODO comments 2022-10-07 15:42:48 +02:00
Dieter Stinglhamber
cb215e1282 fix the db usernam env variable 2022-10-07 14:59:34 +02:00
Gustav Hansen
b960d143e9
Merge pull request #14562 from strapi/feature/relations-main-view-misc-1337 
Relations: Hover state and prop-type fixes
 2022-10-07 14:11:54 +02:00
Gustav Hansen
ef910432b7
Merge pull request #14561 from strapi/feature/fileID 
Add file ID to Asset Edit View in Upload plugin
 2022-10-07 13:21:18 +02:00
Gustav Hansen
ce21b947c1 RelationInput: Update snapshot tests 2022-10-07 12:57:21 +02:00
Gustav Hansen
e56bae5a2f RelationInput: Add missing label to disconnect button 2022-10-07 12:53:11 +02:00
Gustav Hansen
541b1695fe
Merge pull request #14527 from strapi/relations/fix-order-normalizeRelations 
[Relations - Front] Reverse order of relations
 2022-10-07 11:55:25 +02:00
Honza Vrkota
117b24be5a
Merge branch 'main' into main 2022-10-07 11:24:26 +02:00
derrickmehaffy
0b56ebf5d8 Apply PR feedback and update snapshot tests 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2022-10-07 10:55:04 +02:00
Simone Taeggi
7f05ecb6c1 Merge branch 'main' into fix/clean-test-warnings 2022-10-07 09:36:22 +02:00
Fernando Chavez
e13cf1cc28 Add tests for new sort menu on marketplace page 2022-10-06 19:53:18 -04:00
derrickmehaffy
c050b987a2 Add GH Actions for support team automation 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2022-10-06 14:26:11 -07:00
Pierre Noël
6e67d82f5f add transaction in DB entity manager 2022-10-06 18:03:10 +02:00
Rémi de Juvigny
5dfaf2a3f8 Save marketplace tab in url 2022-10-06 17:42:10 +02:00
Gustav Hansen
be495b4b36
Merge pull request #14560 from strapi/relations/relation-item-padding 
[Relations] Fix RelationItem padding
 2022-10-06 17:37:43 +02:00
Rémi de Juvigny
a5a486a6da Call useQueryParams once 2022-10-06 17:36:26 +02:00
Rémi de Juvigny
01e338f5e6 Handle npmPackageType in filter component 2022-10-06 16:24:26 +02:00
Rémi de Juvigny
6c3c8c9a0c Try moving filters inside tab panels 2022-10-06 16:17:06 +02:00
Julie Plantey
370caa5d11 fix relation item padding top and bottom 2022-10-06 16:03:49 +02:00
Rémi de Juvigny
75ae5977e0 Add abstraction for marketplace filters 2022-10-06 15:42:53 +02:00
derrickmehaffy
b18b636962 Add File ID to edit asset dialog 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2022-10-06 06:42:47 -07:00
Julie Plantey
6ec4502450 fix tests name for normalizeSearchResults 2022-10-06 15:42:00 +02:00
Gustav Hansen
685b3e11b0 RelationInput: Fix Tooltip prop-type if IDs are rendered 2022-10-06 15:02:12 +02:00
Gustav Hansen
3f2c6fb440 RelationInputDataManager: Resolve todo and fix labelLoadMore prop-type 2022-10-06 15:01:46 +02:00
Gustav Hansen
5b46793f36 RelationInput: Add hover/ focus state to remove icon 2022-10-06 15:00:35 +02:00
Fernando Chavez
b82cd7d05a Add sort menu to the marketplace page 2022-10-06 08:51:50 -04:00
Rémi de Juvigny
45af88102b Add marketplace category selector 2022-10-06 14:44:54 +02:00
Gustav Hansen
4657c92626 i18n: Inject queryInfos into relations in the main layout 2022-10-06 14:17:22 +02:00
Julie Plantey
76c0ffb791
Merge pull request #14556 from strapi/relations/fix-idsToInclude-false 
[Relations] Fix idsToInclude false
 2022-10-06 13:37:31 +02:00
Julie Plantey
0af020e8a8 fix sending idsToInclude=false as search param 2022-10-06 13:24:42 +02:00
Julie Plantey
a457efe802 fix sending idsToInclude=false as search param 2022-10-06 12:48:00 +02:00
Julie Plantey
f6afb6f4f4 add test for normalizeSearchResults 2022-10-06 12:33:59 +02:00
Julie Plantey
92b206bcb0 Merge branch 'feature/relations-main-view' of https://github.com/strapi/strapi into relations/fix-order-normalizeRelations 2022-10-06 12:27:32 +02:00
Pierre Noël
583ae4fac6
Merge pull request #14503 from strapi/relations-main-view/fix-user-ct-role-update 
Fix role assign on user collection type
 2022-10-06 12:13:15 +02:00
Julie Plantey
cb97055e7f
Merge pull request #14406 from strapi/feature/relations-main-view-ids-to-include 
RelationInputDataManager: Send idsToInclude param when searching
 2022-10-06 11:57:59 +02:00
Pierre Noël
93d030df8b update permissions plugin role validation (done by @Marc-Roig) 2022-10-06 11:15:07 +02:00
Gustav Hansen
221c80a9d4 useRelation: Uncomment unit tests 2022-10-06 10:48:50 +02:00
Gustav Hansen
51f3b540ad useRelation: Wrap search fetch in try catch 2022-10-06 10:48:12 +02:00
Jean-Sébastien Herbaux
b307308313
Merge pull request #14552 from CleberRossi/bugfix/fix-cors-default-headers-14357 
Updating koa/cors to 3.4.2 in order to fix cors filter origin problem #14357
 2022-10-06 09:38:29 +02:00