yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-03 14:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,075 Commits 109 Branches 487 Tags
Commit Graph

6261 Commits

Author SHA1 Message Date
Pierre Noël
d4436892bf Update singletype route 
Co-authored-by: Jamie Howard <48524071+jhoward1994@users.noreply.github.com>
 2022-10-10 14:28:54 +02:00
Pierre Noël
0415f5d677 add getNumberOfDraftRelations route 2022-10-10 14:28:54 +02:00
Pierre Noël
541f4b6a40
Merge pull request #14574 from strapi/relations-main-view/fix-order 
Use transformLoadParamsToQuery instead of transformParamsToQuery to f…
 2022-10-10 14:28:18 +02:00
Simone Taeggi
90610a2a7b update snapshots 2022-10-10 14:26:36 +02:00
Simone Taeggi
fe4c600a0b Merge branch 'main' into fix/clean-test-warnings 2022-10-10 14:24:50 +02:00
Simone Taeggi
2c868c8277 fix last warning 2022-10-10 14:24:22 +02:00
Julie Plantey
a37d7ce855 remove unnecessary act and time out 2022-10-10 11:21:48 +02:00
Rémi de Juvigny
359eeabc5b Test filters popover 2022-10-10 11:16:28 +02:00
Julie Plantey
909de9d55a fixed url assets used in LogoInput tests 2022-10-10 11:11:04 +02:00
Simone Taeggi
0d6ed4a6d8 Merge branch 'main' into fix/clean-test-warnings 2022-10-10 10:07:15 +02:00
Rémi de Juvigny
8f8e5cb332 Refactor existing tests 2022-10-10 10:06:17 +02:00
Mark Kaylor
f19847b8a9 Remove regex from test 2022-10-10 09:56:09 +02:00
Josh
9cef84c486
Merge pull request #14571 from strapi/feature/relations-main-view-relation-cache 2022-10-10 08:55:02 +01:00
Julie Plantey
e00bf6fec8 fix xToOne relations - refacto CONNECT_RELATION 2022-10-10 09:44:51 +02:00
Daniele Aurilio
b8cea20fd7
Merge branch 'main' into fix/discord_link 2022-10-08 19:44:25 +02:00
DanieleAurilio
46f5595f33 Merge branch 'fix/discord_link' of https://github.com/DanieleAurilio/strapi into fix/discord_link 2022-10-08 18:41:13 +02:00
DanieleAurilio
bd016ead39 Fix test 2022-10-08 18:40:35 +02:00
Fernando Chavez
b780a10248 Fixs on translatino on sorting on marketplace and tests 2022-10-07 16:24:34 -04:00
Pierre Noël
256e7164d5 fix tests 2022-10-07 21:37:14 +02:00
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
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
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
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
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
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