yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-11 18:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,539 Commits 115 Branches 488 Tags
Commit Graph

30539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh
407be7cbbd
Merge pull request #16481 from strapi/chore/refactor-hp-to-features 2023-04-26 09:56:28 +01:00
Gustav Hansen
10983f3ba7
Merge pull request #16499 from strapi/feature/review-workflow-1-settings-color 
Settings: Implement color select for stages
 2023-04-26 10:54:37 +02:00
Boegie19
bda72b7a0f fix test again 2023-04-26 10:49:13 +02:00
Boegie19
6b793c0d90 fix test 2023-04-26 10:25:48 +02:00
Gustav Hansen
2c6624f64f Chore: Update reducer tests 2023-04-26 10:15:47 +02:00
Boegie19
a24fc43526 linting fixes 2023-04-26 10:11:54 +02:00
Josh
4134c0e33b refactor: colocate code in helper-plugin features for clearer view 
refactor: move Notification logic into helper-plugin

refactor: wip

fix: typo

chore: fix tests

chore: ensure contexts are still exported

Update packages/core/helper-plugin/src/features/OverlayBlocker.js

Update packages/core/helper-plugin/src/features/AutoReloadOverlayBlocker.js

Co-Authored-By: Gustav Hansen <gustav.hansen@strapi.io>
 2023-04-26 09:06:18 +01:00
Marc
24d036e0f2
Merge pull request #16497 from strapi/fix/rw-flaky-test 2023-04-26 10:02:09 +02:00
Simone Taeggi
9153d6cb47 change format error labels 2023-04-26 09:46:33 +02:00
Simone Taeggi
4cc66139dc remove check singular name equals collection name 2023-04-26 09:39:31 +02:00
Simone Taeggi
ff9fe9bca1 Merge branch 'main' into feature/collection-names-and-ids-uniqueness 2023-04-26 09:36:34 +02:00
Ben Irvin
fd93d805cd disable lint warnings on yup error messages 2023-04-26 09:32:20 +02:00
Ben Irvin
118d78e67d fix map 2023-04-26 09:28:29 +02:00
Marc-Roig
f2e53a4613 feat: add uid and action options in wrapResult 2023-04-26 09:28:22 +02:00
Marc-Roig
79b5cacdbf fix: await findWithRelationCounts 2023-04-26 09:21:38 +02:00
Marc-Roig
a25ec71eb3 fix: wrap findWithRelationCountPage 2023-04-26 09:21:05 +02:00
Alexandre BODIN
12d3068013
Migrate generators to ts (#16392) 2023-04-26 09:07:40 +02:00
gitstart
9e2b06649c fix: field named conditions breaking role checkboxes 
Co-authored-by: raph941 <45232708+raph941@users.noreply.github.com>
 2023-04-26 03:07:02 +00:00
Boegie19
aacd8e6a50 one last fix 2023-04-26 01:49:06 +02:00
Boegie19
468bf7e017 some more fixes 2023-04-26 01:48:49 +02:00
Boegie19
51df0ef83f fix return null 2023-04-26 01:46:35 +02:00
Boegie19
a5cd74a234 add findMany back for output[0] 2023-04-26 01:44:37 +02:00
Boegie19
c25a4dc6cc used wrappedParams in wrapParms 2023-04-26 01:31:48 +02:00
Boegie19
4b1e60bad8 removed findMany since it is unneeded 2023-04-26 01:29:32 +02:00
Gustav Hansen
19855acfa4 Settings: Fix Field <> ReactSelect connection 2023-04-25 18:05:15 +02:00
Gustav Hansen
ef3d7ff09a Settings: Implement color select for stages 2023-04-25 17:40:48 +02:00
Marc
94e2624b61
Merge pull request #16479 from strapi/feat/back-limit-number-of-created-stages 2023-04-25 16:43:01 +02:00
Marc
e0ce4352c9
Update api-tests/core/admin/ee/review-workflows.test.api.js 
Co-authored-by: Jamie Howard <48524071+jhoward1994@users.noreply.github.com>
 2023-04-25 16:21:13 +02:00
Marc-Roig
0c84b254f7 feat: wrapResult before emitting events 2023-04-25 14:25:22 +02:00
Boegie19
0fb0bad219 fix? 2023-04-25 14:24:46 +02:00
Marc-Roig
66b2c5ae74 feat: just keep wrapResult 2023-04-25 14:23:10 +02:00
Boegie19
78c5c76b8e hopfully fixed test 2023-04-25 14:08:03 +02:00
Boegie19
20cf36269b fix output test 2023-04-25 13:51:19 +02:00
Boegie19
ec4cb1bfa5 fix maby? 2023-04-25 13:46:27 +02:00
Boegie19
6ce1665271 removed function 2023-04-25 13:25:58 +02:00
Boegie19
ba9f15cad1 Merge branch 'i18n-entity-service-wrapParams' of https://github.com/Boegie19/strapi into i18n-entity-service-wrapParams 2023-04-25 13:06:38 +02:00
Boegie19
ec2328d11e init wrapParams output test 2023-04-25 13:06:30 +02:00
Boegie19
8e00ced3d2 final fix 2023-04-25 11:26:43 +02:00
Boegie19
cf18d05861 fixed findOne 2023-04-25 11:06:54 +02:00
Marc-Roig
c55bc192b2 fix: flaky test 2023-04-25 10:22:35 +02:00
DMehaffy
4b4d64bbb6
Merge pull request #16491 from strapi/fix/licenseExtension 
Change license extension to prevent it loading the wrong file
 2023-04-24 12:39:59 -07:00
Boegie19
129197609e fix db.query.findOne 2023-04-24 21:14:41 +02:00
DMehaffy
36e41a508a
Merge branch 'main' into i18n-entity-service-wrapParams 2023-04-24 11:53:22 -07:00
Nathan Pichon
a51313304d
Merge pull request #15899 from strapi/feature/review-workflow 
New Feature: Review Workflows
 2023-04-24 20:53:14 +02:00
Boegie19
527d956895 fixed mistake 2023-04-24 20:45:48 +02:00
derrickmehaffy
c1135d6cd7 Change license extension to prevent it loading the wrong file 2023-04-24 11:32:21 -07:00
Boegie19
42bf6410ee fix even more tests 2023-04-24 20:28:09 +02:00
Boegie19
fbe8bad4f0 fixed entity-service decorator tests 2023-04-24 19:57:43 +02:00
markkaylor
f1c2201b6e
Merge pull request #16265 from strapi/fix/plugin-documentation-bugs 
Fix/plugin documentation bugs
 2023-04-24 19:50:10 +02:00
DMehaffy
0d32d3517c
Merge branch 'main' into chore/docs-api-ref 2023-04-24 10:09:28 -07:00