yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-14 11:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,133 Commits 116 Branches 489 Tags
Commit Graph

36133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
8243bf69ea Return routes once only 2023-07-12 15:09:59 +02:00
Marc-Roig
7bdef3d278
v4.11.5 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
Gustav Hansen
53a0f7d15b
Merge pull request #17282 from strapi/fix/settings-users-page 
fix(ee): use named export for user settings page
 2023-07-12 11:51:39 +02: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
Marc-Roig
2d63671daa
fix: relations test relation disconnect breaking other relations 2023-07-12 09:43:27 +02:00
Gustav Hansen
27ed22ba71
Merge pull request #17278 from strapi/feature/review-workflow-multiple-contrib-doc-backend 
docs(review-workflows): update contrib doc with multiple workflows info
 2023-07-12 09:36:11 +02:00
Gustav Hansen
5f5c6ec185
Merge pull request #17276 from strapi/feature/review-workflow-multiple-initial-colors 
Fix: Make stage theme color retrieval more defensive
 2023-07-12 09:34:51 +02:00
Gustav Hansen
1b4a92014f
Merge pull request #17273 from strapi/feature/review-workflow-multiple-contributor-docs-fe 
Docs: Update contributor docs for multiple workflows
 2023-07-12 09:34:12 +02:00
Gustav Hansen
fff8e4c05f Docs: Update contributor docs for multiple workflows 2023-07-12 09:31:44 +02:00
so_hell
fe2b24bcc1 fixed: Media Library - Can`t delete empty folder #17263 2023-07-12 12:31:53 +05:30
nathan-pichon
c76e8fef56
docs(review-workflows): update services 2023-07-11 18:33:50 +02:00
nathan-pichon
6b621918a1
docs: adding multiple workflow routes and services to contrib documentation 2023-07-11 18:29:27 +02: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
40b3acfe6f
Merge pull request #17266 from strapi/dependabot/npm_and_yarn/docs/semver-5.7.2 
chore(deps): bump semver from 5.7.1 to 5.7.2 in /docs
 2023-07-11 15:58:23 +02:00
Gustav Hansen
d3ee892892
Merge pull request #17267 from strapi/dependabot/npm_and_yarn/eslint-78491b664a 
chore(deps-dev): bump the eslint group with 2 updates
 2023-07-11 15:52:11 +02:00
Marc Roig
41c44ff974
Merge pull request #17250 from strapi/dependabot/npm_and_yarn/pg-8.11.1 2023-07-11 15:48:51 +02:00
Marc Roig
530e8f378c
Merge pull request #17249 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1413.0 2023-07-11 15:48:27 +02:00
Marc-Roig
ee2cd841c9
tests: updating entity relations does not break other relations 2023-07-11 15:37:54 +02: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
Alexandre Bodin
34c2a41843 Do not try to add API endpoint for content type plugins using i18N 2023-07-11 13:46:54 +02:00
Marc-Roig
43f56d426e
fix: two separate queries to update order and inverse order 2023-07-11 13:22:16 +02:00
Josh
43ded7ee9c
Merge pull request #17214 from strapi/refactor/remove-simple-menu-v1 2023-07-11 12:03:50 +01:00
Gustav Hansen
2291816276 Merge branch 'main' into feature/review-workflow-multiple 2023-07-11 12:47:44 +02:00
Josh
2a991605a2 chore: add comment to jest-preset.front 2023-07-11 11:28:43 +01: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
dependabot[bot]
14b8190bf3
chore(deps-dev): bump the eslint group with 2 updates 
Bumps the eslint group with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser).


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

Updates `@typescript-eslint/parser` from 5.61.0 to 5.62.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.62.0/packages/parser)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-11 10:25:23 +00: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
dependabot[bot]
2497677a01
chore(deps): bump semver from 5.7.1 to 5.7.2 in /docs 
Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-11 09:47:50 +00:00
dependabot[bot]
5f340d7660
chore(deps): bump pg from 8.8.0 to 8.11.1 
Bumps [pg](https://github.com/brianc/node-postgres/tree/HEAD/packages/pg) from 8.8.0 to 8.11.1.
- [Changelog](https://github.com/brianc/node-postgres/blob/master/CHANGELOG.md)
- [Commits](https://github.com/brianc/node-postgres/commits/pg@8.11.1/packages/pg)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-11 09:46:58 +00: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
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