yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-05 07:16:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,846 Commits 111 Branches 487 Tags
Commit Graph

6461 Commits

Author SHA1 Message Date
Marc-Roig
f5e40910a5
Merge branch 'main' into releases/4.11.5 2023-07-12 15:44:01 +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
Jamie Howard
b4cd8ea6bf fix(ee): use named export for user settings page 2023-07-12 09:51:46 +01:00
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
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
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
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
Gustav Hansen
6181f2b4b7 Chore: Drop babel ee_else_ce plugin and babel-loader 2023-07-11 10:19:23 +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
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
Gustav Hansen
f1c4c09e50
Merge pull request #17237 from noobCode-69/setting-permission 
Fix settings menu permissions in CE
 2023-07-10 13:51:49 +02:00
Gustav Hansen
865cb2f6c5
Merge pull request #17252 from strapi/feature/review-workflow-multiple-limits 
Fix: Fix license limits for workflow settings pages
 2023-07-10 12:38:32 +02:00
Josh
8e89a3f46b
Merge pull request #17217 from strapi/fix/only-check-ssolocked-if-enabled 2023-07-10 10:41:01 +01:00
Gustav Hansen
752baaac71
Merge pull request #17246 from strapi/fix/rw-worflow-attributes-test-act 
Fix: Improve test setup for workflow attributes
 2023-07-10 10:45:22 +02:00
Gustav Hansen
29cfb4508f Fix: Fix license limits for workflow settings pages 2023-07-10 10:43:41 +02:00
so_hell
67f900e6c1 fixed: fixed: The settings menu displays items that the user does not have p… #17237 2023-07-10 14:10:44 +05:30
Gustav Hansen
b965b428a4 Chore: Implement multiple workflow tracking events 2023-07-10 10:13:13 +02:00
Gustav Hansen
df449d8e10
Merge pull request #17244 from strapi/feature/review-workflow-multiple-qa-07-23 
Chore: Review Workflows (multiple workflows) QA
 2023-07-10 10:12:25 +02:00
Gustav Hansen
0ccfca6ea5 Fix: Improve test setup for workflow attributes 2023-07-10 09:44:58 +02:00
Gustav Hansen
2ae54f5f72 Fix: Add back on page load license limit modal in list-view 2023-07-10 08:23:47 +02:00
Gustav Hansen
92854494a4 Fix: Improve license conditionals in create-view 2023-07-10 08:23:16 +02:00
Gustav Hansen
b5abd3a8c9 Chore: Sort content-types by name in workflow attributes 2023-07-10 08:22:21 +02:00
dependabot[bot]
595b3a7588
chore(deps): bump react-redux from 8.0.5 to 8.1.1 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 8.0.5 to 8.1.1.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v8.0.5...v8.1.1)

---
updated-dependencies:
- dependency-name: react-redux
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-09 23:38:32 +00:00
so_hell
da44cf71d0 fixed: The settings menu displays items that the user does not have permission to #17179 2023-07-08 22:10:59 +05:30
Gustav Hansen
59eb25f989 Fix: Update stage keys for the CM list-view 2023-07-07 16:34:40 +02:00