yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,719 Commits 129 Branches 498 Tags
Commit Graph

31719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Roig
938f60c3f8
Merge branch 'main' into dependabot/npm_and_yarn/aws-sdk-2.1413.0 2023-07-11 11:44:26 +02:00
Josh
b25d1fdaa7
Merge pull request #17265 from strapi/chore/ds-182 2023-07-11 10:43:33 +01: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
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
Gustav Hansen
4920236359
Merge pull request #17203 from strapi/enhancement/components-use-enterprise 
Chore: Refactor ee_else_ce component imports to new useEnterprise hook
 2023-07-11 10:19:00 +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
Bassel
2eb22bd061 use same delete method for all upload providers 2023-07-10 17:48:12 +03:00
Bassel
4ca425aa3f log warning incase metadata doesn't exist in export file 2023-07-10 17:37:05 +03:00
Bassel
b1057ce3ec improve stringify 2023-07-10 16:42:25 +03: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
Josh
d8c46dd17e
Merge pull request #17253 from strapi/fix/browse-step-query 2023-07-10 12:35:38 +01: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
Josh
96d8ebb0c8 fix: CM media-input browsing 2023-07-10 10:26:01 +01:00
Gustav Hansen
3fc7897bae
Merge pull request #17247 from strapi/dependabot/npm_and_yarn/eslint-27e296ecf0 
chore(deps-dev): bump the eslint group with 2 updates
 2023-07-10 11:14:19 +02:00
Christian Capeans
763645b07b log error 2023-07-10 11:11:13 +02:00
Bassel
6073283d54 Merge branch 'main' into feat/data-transfer-assets 2023-07-10 12:06:58 +03:00
Bassel
0ac623bf43 Merge branch 'feat/data-transfer-assets' of https://github.com/strapi/strapi into feat/data-transfer-assets 2023-07-10 12:04:41 +03: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
Christian Capeans
8087ae2101 Add error log 2023-07-10 10:22:03 +02:00
dependabot[bot]
73462765d8
chore(deps): bump aws-sdk from 2.1409.0 to 2.1413.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1409.0 to 2.1413.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1409.0...v2.1413.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-10 08:19:42 +00:00
dependabot[bot]
de90fbcd78
chore(deps): bump knex from 2.4.0 to 2.5.0 
Bumps [knex](https://github.com/knex/knex) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/knex/knex/releases)
- [Changelog](https://github.com/knex/knex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/knex/knex/compare/2.4.0...2.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-10 08:18:48 +00:00
dependabot[bot]
d892d85f0c
chore(deps-dev): bump the eslint group with 2 updates 
Bumps the eslint group with 2 updates: [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) and [eslint](https://github.com/eslint/eslint).


Updates `@typescript-eslint/parser` from 5.59.1 to 5.61.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.61.0/packages/parser)

Updates `eslint` from 8.42.0 to 8.44.0
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.42.0...v8.44.0)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-10 08:15:52 +00:00
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
b115b44fa3
Merge pull request #17243 from strapi/chore/improve-dependabot-groups 
Chore: Improve and extend dependabot groups
 2023-07-10 10:11:34 +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
Gustav Hansen
7c66ef5f04
Merge pull request #17235 from strapi/dependabot/npm_and_yarn/stylelint-15.10.1 
chore(deps-dev): bump stylelint from 13.13.1 to 15.10.1
 2023-07-10 08:20:33 +02:00
Gustav Hansen
6870766904
Merge pull request #17242 from strapi/dependabot/npm_and_yarn/react-redux-8.1.1 
chore(deps): bump react-redux from 8.0.5 to 8.1.1
 2023-07-10 08:19:33 +02:00
Gustav Hansen
8203d29525 Chore: Improve and extend dependabot groups 2023-07-10 08:04:48 +02:00
Gustav Hansen
77d973a40a
Merge pull request #17241 from strapi/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-5.61.0 
chore(deps-dev): bump @typescript-eslint/eslint-plugin from 5.59.1 to 5.61.0
 2023-07-10 07:53:39 +02:00