Skip to content

Commit

Permalink
Merge branch 'v5/main' into v5/history
Browse files Browse the repository at this point in the history
  • Loading branch information
remidej committed Jan 24, 2024
2 parents 18b28ce + 434c4b3 commit df45601
Show file tree
Hide file tree
Showing 157 changed files with 3,993 additions and 2,985 deletions.
42 changes: 42 additions & 0 deletions api-tests/core/admin/admin-permission.test.api.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,48 @@ describe('Role CRUD End to End', () => {
"plugin": "content-manager",
"subCategory": "single types",
},
{
"action": "plugin::content-releases.create",
"displayName": "Create",
"plugin": "content-releases",
"subCategory": "general",
},
{
"action": "plugin::content-releases.create-action",
"displayName": "Add an entry to a release",
"plugin": "content-releases",
"subCategory": "general",
},
{
"action": "plugin::content-releases.delete",
"displayName": "Delete",
"plugin": "content-releases",
"subCategory": "general",
},
{
"action": "plugin::content-releases.delete-action",
"displayName": "Remove an entry from a release",
"plugin": "content-releases",
"subCategory": "general",
},
{
"action": "plugin::content-releases.publish",
"displayName": "Publish",
"plugin": "content-releases",
"subCategory": "general",
},
{
"action": "plugin::content-releases.read",
"displayName": "Read",
"plugin": "content-releases",
"subCategory": "general",
},
{
"action": "plugin::content-releases.update",
"displayName": "Edit",
"plugin": "content-releases",
"subCategory": "general",
},
{
"action": "plugin::content-type-builder.read",
"displayName": "Read",
Expand Down
6 changes: 3 additions & 3 deletions cli-tests/app-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"@strapi/plugin-users-permissions": "latest",
"@strapi/strapi": "latest",
"better-sqlite3": "9.0.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-router-dom": "5.3.4",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.0.0",
"styled-components": "5.3.3"
},
"engines": {
Expand Down
14 changes: 13 additions & 1 deletion docs/docs/api/startup-logger.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,18 @@ Will display the correct start-up message according to the specified boolean.

:::note

Can be disabled by setting `STRAPI_HIDE_STARTUP_MESSAGE` to `true`.
Can be disabled by setting the server config value:

```javascript
// in config/server.js
{
logger: {
startup: {
enabled: false;
}
},
// ...the rest of your server config
}
```

:::
21 changes: 0 additions & 21 deletions docs/docs/docs/01-core/admin/04-commands/00-overview.md

This file was deleted.

189 changes: 0 additions & 189 deletions docs/docs/docs/01-core/admin/04-commands/01-build.md

This file was deleted.

90 changes: 0 additions & 90 deletions docs/docs/docs/01-core/admin/04-commands/02-develop.md

This file was deleted.

5 changes: 0 additions & 5 deletions docs/docs/docs/01-core/admin/04-commands/_category_.json

This file was deleted.

Loading

0 comments on commit df45601

Please sign in to comment.