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

5169 Commits

Author SHA1 Message Date
Julie Plantey
ee98b9a9cb
Merge pull request #14591 from strapi/relations/fix-xToOne-displaying-2-relations 
[Relations] Fix xToOne displaying duplicate
 2022-10-11 17:58:52 +02:00
markkaylor
753f230322
Merge branch 'main' into fix/custom-field-number-type 2022-10-11 17:30:41 +02:00
Julie Plantey
fbcfa30338 replaced || with ?? 2022-10-11 15:49:33 +02:00
Julie Plantey
a18a28dfc4 remove unneccessary conditional checks 2022-10-11 15:45:34 +02:00
Jamie Howard
2dc93ec160 Merge branch 'feature/relations-main-view' of github.com:strapi/strapi into feature/relations/draft-notifications-front 2022-10-11 13:48:05 +01:00
Rémi de Juvigny
4d2f9eeb3d Apply feedback 2022-10-11 14:46:09 +02:00
Pierre Noël
ed34717b50
Merge pull request #14538 from strapi/relations-main-view/refactor-find-existing-find-available 
Refactor findExisting & findAvailable relation routes
 2022-10-11 14:24:56 +02:00
Julie Plantey
6a04c65805
Merge pull request #14592 from strapi/fix/relation-items-spacing 
[Relations] Fix RelationItems spacing
 2022-10-11 13:48:12 +02:00
Jamie Howard
ef1fd5538a feat(content-manager): count draft relations on publish 
feat(content-manager): API communication for getting draft count
feat(content-manager): Reducer tests
chore: add translations
 2022-10-11 12:04:30 +01:00
Julie Plantey
c9ca54b887 Merge branch 'relations-main-view/refactor-find-existing-find-available' of https://github.com/strapi/strapi into relations/fix-relations-in-components 2022-10-11 12:45:23 +02:00
Julie Plantey
1c871520c2 revert unnecessary change in LOAD_RELATION and feedback fix on savedRelations 2022-10-11 12:05:06 +02:00
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
Julie Plantey
6881b4ad35 updated RELATION_ITEM_HEIGHT to reflect new RelationItem padding 2022-10-10 18:06:04 +02:00
Julie Plantey
35afaa675a share componentId through select 2022-10-10 16:56:35 +02:00
Mark Kaylor
e3e72a1b8a Add default value to options 2022-10-10 16:55:10 +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
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
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
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
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
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
Fernando Chavez
e13cf1cc28 Add tests for new sort menu on marketplace page 2022-10-06 19:53:18 -04: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