yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-03 06:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,846 Commits 109 Branches 487 Tags
Commit Graph

12157 Commits

Author SHA1 Message Date
Marc-Roig
f5e40910a5
Merge branch 'main' into releases/4.11.5 2023-07-12 15:44:01 +02:00
Alexandre Bodin
8243bf69ea Return routes once only 2023-07-12 15:09:59 +02:00
Marc-Roig
7bdef3d278
v4.11.5 2023-07-12 14:47:27 +02:00
Jamie Howard
99011ef33a fix: PR feedback 2023-07-12 12:53:32 +01:00
Jamie Howard
eeb5bbd769 fix: PR feedback 2023-07-12 12:33:48 +01:00
Jamie Howard
606b29a5bc test(ee): ReviewWorkflowsAssignee 2023-07-12 12:09:55 +01:00
Bassel
4441147220 fix type issue 2023-07-12 12:57:16 +03:00
Bassel
30e8a4e8bd adding transacting to import raw query 2023-07-12 12:49:38 +03:00
Jamie Howard
b4cd8ea6bf fix(ee): use named export for user settings page 2023-07-12 09:51:46 +01:00
Convly
7b939aa869 Merge branch 'main' of github.com:strapi/strapi into enhancement/perfs-wildcard-populate-sanitization 2023-07-12 10:45:11 +02:00
so_hell
fe2b24bcc1 fixed: Media Library - Can`t delete empty folder #17263 2023-07-12 12:31:53 +05:30
Jamie Howard
87ec8aac1b fix(ee): display assignee in list view using useEnterprise pattern 2023-07-11 17:02:26 +01:00
Jamie Howard
c10d384bc7 fix(ee) 2023-07-11 16:53:47 +01:00
Gustav Hansen
e55b8f7d59 Fix: Make stage color theme color retrieval more defensive 2023-07-11 17:48:46 +02:00
Jamie Howard
6fcaea76a6 Merge remote-tracking branch 'origin/main' into fix/review-workflow/assignee-merge 2023-07-11 15:41:28 +01:00
Jamie Howard
dd51304dc5 test(ee): unit test for assignee update 2023-07-11 15:29:35 +01:00
Jamie Howard
33decf1f3c fix(ee): get the assignee fromId 2023-07-11 15:29:28 +01:00
Jamie Howard
70d0073c58 feature(ee): send didEditAssignee telemetry event 2023-07-11 15:29:19 +01:00
Josh
0c20c6cea2
Merge pull request #17271 from nitinmadelyn/ui-improvement 2023-07-11 13:37:17 +01:00
Nitin
be42294191 add translation for aria-label 2023-07-11 17:17:49 +05:30
Marc-Roig
43f56d426e
fix: two separate queries to update order and inverse order 2023-07-11 13:22:16 +02:00
Gustav Hansen
2291816276 Merge branch 'main' into feature/review-workflow-multiple 2023-07-11 12:47:44 +02:00
Josh
7ff0df5e7b test: refactor CellContent/RelationMultiple tests 2023-07-11 11:28:33 +01:00
Josh
23ddb0922d chore: update snapshots 2023-07-11 11:28:33 +01:00
Josh
2f8a7dd2d5 test: refactor EditViewSettings tests 2023-07-11 11:28:33 +01:00
Josh
68c566d3f4 test: refactor list view tests 2023-07-11 11:28:33 +01:00
Josh
bde4159921 chore: fix medialibrary test 2023-07-11 11:28:21 +01:00
Josh
017ca778a1 refactor: simple menu v1 2023-07-11 11:28:21 +01:00
Gustav Hansen
815e1fa642
Merge pull request #17206 from strapi/enhancement/remove-ee-else-ce 
Chore: Drop babel ee_else_ce plugin and babel from @strapi/admin
 2023-07-11 12:21:51 +02:00
Marc Roig
4daabde012
Merge pull request #17248 from strapi/dependabot/npm_and_yarn/knex-2.5.0 2023-07-11 11:45:12 +02:00
Gustav Hansen
63a0abac01 Chore: Drop babel dependencies from @strapi/admin 2023-07-11 11:24:55 +02:00
Josh
fef7cd24df chore: update ds to 1.8.2 2023-07-11 10:20:09 +01:00
Jamie Howard
7f0c2cd734 feature(ee): sendDidEditWorkflow, sendDidCreateWorkflow 2023-07-11 10:11:43 +01:00
Jamie Howard
c4b8acbfd8 feature(ee): add new events to metrics 2023-07-11 10:10:53 +01:00
Gustav Hansen
075e3b2797 Chore: Drop babel-plugin-styled-components dependency 2023-07-11 10:54:31 +02:00
Christian
d7e37899b7
Merge branch 'main' into feat/data-transfer-assets 2023-07-11 10:53:08 +02:00
Christian Capeans
c4c810d8aa Fix failing test 
Co-authored-by: Bassel Kanso <basselkanso82@gmail.com>
 2023-07-11 10:52:14 +02:00
Gustav Hansen
6181f2b4b7 Chore: Drop babel ee_else_ce plugin and babel-loader 2023-07-11 10:19:23 +02:00
Marc-Roig
f6246c145d
fix: relations are not returned in the correct order 
When removing or adding a relation in an entity, other entities from the same Content Type were seeing that same relation reordered.

Cause: We were updating the order of the other entities when we should only be updating the inverse order.
 2023-07-11 10:17:06 +02:00
Gustav Hansen
7bf1ac9006
Merge pull request #17245 from strapi/feature/review-workflow-multiple-tracking 
Chore: Implement multiple workflow tracking events
 2023-07-11 09:03:46 +02:00
Bassel
9e4a8821e4 stream files entities 2023-07-10 19:23:46 +03:00
Gustav Hansen
4be5b5e21b Chore: Refactor usage of useLicenseLimitNotification hook 2023-07-10 16:41:43 +01:00
Gustav Hansen
02aac33f47 Chore: Cleanup tests 2023-07-10 16:41:43 +01:00
Gustav Hansen
1be9debbc3 Chore: Use useEnterprise to load EE Login component 2023-07-10 16:41:43 +01:00
Gustav Hansen
d5c6ac94f4 Chore: Refactor user createAction for useEnterprise 2023-07-10 16:41:43 +01:00
Gustav Hansen
f15e7a50e3 Chore: Refactor MagicLink to new useEnterprise hook 2023-07-10 16:41:43 +01:00
Gustav Hansen
740c2c02f3 Chore: Refactor AdminSeatInfo to new useEnterprise hook 2023-07-10 16:41:43 +01:00
Gustav Hansen
37c3888727 Chore: Refactor webhooks edit view to use useEnterprise 2023-07-10 16:41:15 +01:00
Gustav Hansen
7223be9bec Chore: Refactor CM edit view information box to use useEnterprise 2023-07-10 16:41:15 +01:00
Josh
47c5ea3c12
Merge pull request #17062 from nitinmadelyn/ui-improvement 2023-07-10 16:27:44 +01:00