yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 08:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,075 Commits 113 Branches 488 Tags
Commit Graph

25075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julie Plantey
9f28e4d9aa Merge branch 'feature/relations-main-view' of https://github.com/strapi/strapi into relations/fix-xToOne-displaying-2-relations 2022-10-11 12:00:58 +02:00
Julie Plantey
98d4230333 Merge branch 'feature/relations-main-view' of https://github.com/strapi/strapi into fix/relation-items-spacing 2022-10-11 11:26:59 +02:00
Julie Plantey
d13d53578a added idsToInclude to handleSearch 2022-10-11 11:24:09 +02:00
Julie Plantey
41b1bcf8cd Merge branch 'main' of https://github.com/strapi/strapi into feature/relations-main-view 2022-10-11 11:16:00 +02:00
Josh
9db5cb255b
Merge branch 'feature/relations-main-view' into relations/fix-xToOne-displaying-2-relations 2022-10-11 08:17:13 +01:00
Simone Taeggi
6366426c03 fix warning ContextInfo value 2022-10-10 18:13:41 +02:00
Julie Plantey
6881b4ad35 updated RELATION_ITEM_HEIGHT to reflect new RelationItem padding 2022-10-10 18:06:04 +02:00
Pierre Noël
a3e175e643
Merge pull request #14547 from strapi/relations-main-view/draft-number 
add getNumberOfDraftRelations route
 2022-10-10 17:18:29 +02:00
Julie Plantey
35afaa675a share componentId through select 2022-10-10 16:56:35 +02:00
Julie Plantey
d90073a8e1 fix and add tests 2022-10-10 16:54:24 +02:00
Julie Plantey
c1555b2c3c refactor getting componentId 2022-10-10 16:54:23 +02:00
Julie Plantey
ab34c02c79 refactor get and search relations requests 2022-10-10 16:54:21 +02:00
Julie Plantey
3ed307b4c3 update reducer tests + move creation of connect/disconnect arrays 2022-10-10 14:51:44 +02:00
Pierre Noël
241393eaa3 implement new findAvailable route 2022-10-10 14:42:23 +02:00
Pierre Noël
1200e43618 update tests using findExisting relations 2022-10-10 14:42:22 +02:00
Pierre Noël
3aa26deb1f implement new findExisting route 2022-10-10 14:42:19 +02:00
Pierre Noël
bd82249ab6 fix xToOne relations + finish e2e tests 2022-10-10 14:28:57 +02:00
Pierre Noël
8f73a1d761 use data format + init e2e tests 2022-10-10 14:28:56 +02:00
Pierre Noël
29d567198c JSDoc getDeepPopulateDraftCount 2022-10-10 14:28:56 +02:00
Pierre Noël
a5ae89fa2d JSDoc for sumDraftCounts 
Co-authored-by: Jamie Howard <48524071+jhoward1994@users.noreply.github.com>
 2022-10-10 14:28:55 +02:00
Pierre Noël
212d80f4fa Update singletype controller 
Co-authored-by: Jamie Howard <48524071+jhoward1994@users.noreply.github.com>
 2022-10-10 14:28:55 +02:00
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
2042d6beb0
Merge pull request #14584 from strapi/fix/LogoInput-tests 
[Fix] LogoInput tests
 2022-10-10 12:23:13 +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
Julie Plantey
0cbfda8bb4
Merge pull request #14513 from DanieleAurilio/fix/discord_link 
Fix discord link on admin panel homepage
 2022-10-10 09:21:27 +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
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