yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-23 09:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,133 Commits 111 Branches 484 Tags
Commit Graph

14487 Commits

Author SHA1 Message Date
Gustav Hansen
2fce3442f8
Merge pull request #18364 from strapi/chore/useEnterprise-ts 
chore: convert useEnterprise to TS
 2023-10-11 14:31:43 +02:00
Rémi de Juvigny
ca44c65b40
[Blocks] Fix converting list items (#18323) 
* Fix converting list items

* Improve comment

* Fix typo

* madhuri feedback

* Replace setSelection by select

* Use new select helper in test

---------

Co-authored-by: Simone <startae14@gmail.com>
 2023-10-11 14:26:19 +02:00
Gustav Hansen
3a008ccc64 chore: convert useEnterprise to TS 2023-10-11 13:56:03 +02:00
Gustav Hansen
8c39791a2b chore: convert useAdminUsers to TS 2023-10-11 13:29:16 +02:00
Josh
85d322c3e9
test(frontend): fix act warnings _everywhere_ (#18381) 
* test(content-manager): fix wysiwyg by silencing the warnings

* test(admin): add a harness – finally

* chore: remove prop-types as dep of helper-plugin

* test(content-manager): fix console errors in EditSettingsView

* test(content-manager): fix ListViewSettings

* test: fix useAdminRolePermissions

* chore: convert more tests

* test: more fe tests

* test: more fe tests

* test(ctb): fix tests

* chore: throw error in env

* chore: fix act finals

* chore: remove resetHandlers and use once

* chore: throw all the time for warnings and errors
 2023-10-11 12:26:02 +01:00
Alexandre Bodin
af6ddbba9b Merge branch 'main' into tests/drop16 2023-10-11 13:09:45 +02:00
Ben Irvin
390b52004e remove log that shouldn't be there 2023-10-11 12:42:49 +02:00
Josh
b571158eef
fix(helper-plugin): notifications should not have a default for "success" (#18372) 
Co-authored-by: Boegie19 <34578426+Boegie19@users.noreply.github.com>
 2023-10-11 10:26:47 +01:00
Alexandre Bodin
4fab0c711d Update engines 2023-10-11 11:15:35 +02:00
Simone
6caa8cf950
[Blocks editor] Images inserted and removed as first element breaks the app (#18347) 
* move the removal of the node from the selectOption to insertImages

* add condition to avoid toggleBlock for images
 2023-10-11 11:07:05 +02:00
Rémi de Juvigny
9112d18abb
[Blocks] Disable link button when multiple blocks are selected (#18384) 
* Disable links button when multiple blocks are selected

* Improve test

* Simone comment fixes

Co-authored-by: Simone <startae14@gmail.com>

---------

Co-authored-by: Simone <startae14@gmail.com>
 2023-10-11 10:13:43 +02:00
Rémi de Juvigny
943b7edb5b
[Blocks] Multiple UI fixes to match the designs (#18387) 
* Remove underline on links

* Fix popover link text size

* Remove headings component

* Fix blockquote styles
 2023-10-11 09:57:17 +02:00
Jean-Sébastien Herbaux
128de9df14
Merge pull request #18212 from strapi/fix/types/relation-target-constraint 2023-10-11 09:25:06 +02:00
Alexandre BODIN
ef93b178ac
Merge pull request #18077 from strapi/chore/ts-database 2023-10-11 09:08:16 +02:00
Boegie19
f9f70e25b5
feat(admin): allows users to disable NPS in strapi config. (#18287) 2023-10-10 17:11:40 +02:00
Alexandre Bodin
d79da4e428 Fix lockfile 2023-10-10 16:20:37 +02:00
Marc-Roig
1294a2db77
Merge branch 'chore/ts-database' into v5/document_id 2023-10-10 16:03:51 +02:00
Marc Roig
85473470c0
Merge branch 'main' into chore/ts-database 2023-10-10 16:02:53 +02:00
Marc Roig
017f329378
Merge pull request #18316 from strapi/chore/ts_declaration_map 2023-10-10 15:46:38 +02:00
Alexandre Bodin
dc85728c0f Merge branch 'main' into chore/ts-database 2023-10-10 13:57:09 +02:00
Madhuri Sandbhor
facec501f5
updated modifiers style (#18373) 2023-10-10 13:56:54 +02:00
Rémi de Juvigny
da790035c6
test(content-manager): remove side effects and warnings in Blocks editor tests (#18374) 
* Use Tranforms.select with act for all selections

* Recreate editor on every test

* Don't test BlocksToolbar in isolation

* Set initialValue in setup function

* Apply consistent code formatting
 2023-10-10 12:28:16 +01:00
Gustav Hansen
9043b6c94e
Merge pull request #18366 from strapi/chore/usePermissionsDataManager-ts 
chore: convert usePermissionsDataManager to TS and move it to settings
 2023-10-10 12:48:49 +02:00
Gustav Hansen
252e56c7b5 chore: convert usePermissionsDataManager to TS and move it to settings 2023-10-10 12:20:26 +02:00
Josh
24b4aa0739
chore: pack-up database (#18331) 
* chore: pack-up database

* fix(database): add knex direct imports as external
 2023-10-10 10:43:52 +01:00
Marc Roig
f7384cd63e
Merge branch 'main' into chore/ts_declaration_map 2023-10-10 11:00:17 +02:00
Gustav Hansen
fb3a0b8248
chore(admin): convert useAdminRoles to TS (#18336) 
Co-authored-by: Josh Ellis <josh.ellis@strapi.io>
 2023-10-09 16:41:12 +01:00
Marc-Roig
2bedd3f2c8
merge 2023-10-09 15:30:22 +02:00
Convly
af452413c1 Merge branch 'main' of github.com:strapi/strapi into chore/deps-strapi-ts-zen 2023-10-09 15:25:43 +02:00
Convly
71a35c52c4 Update ts-zen dependency to target @strapi/ts-zen 2023-10-09 15:25:00 +02:00
Simone
04bd36c399
remove screen debug (#18365) 2023-10-09 15:11:12 +02:00
Josh
64e637e0a2
chore: pack-up admin-test-utils (#18357) 2023-10-09 11:13:15 +01:00
Alexandre Bodin
338a75fd16 Export isKnexQuery but tag is as internal 2023-10-09 10:54:13 +02:00
Simone
46a65f4992
[Blocks editor] Images too big in large viewports (#18335) 
* change image max-heigth and respect ratio

* add comment to specify where is the max height coming from

* add a background color to the image wrapper

* change the max height and fix typo
 2023-10-09 10:50:40 +02:00
Alexandre Bodin
8af5ca0f70 Merge branch 'main' into chore/ts-database 2023-10-09 10:48:26 +02:00
Rémi de Juvigny
1fca4b448c
[Blocks] Fix content not updating when switching locales (#18266) 
* Fix i18n bug with useResetKey hook

* Add comments about other approaches
 2023-10-09 09:58:05 +02:00
dependabot[bot]
4d7a800f98
chore(deps-dev): bump @types/node from 18.11.9 to 18.18.4 
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.11.9 to 18.18.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-08 23:19:59 +00:00
Rémi de Juvigny
b42bb21c87
Merge pull request #18201 from strapi/feature/rich-text-editor 
feat(rich-text-editor): release beta
 2023-10-06 17:36:41 +02:00
Gustav Hansen
13cb9b88a5 chore(admin): cleanup and convert useReleaseNotification to TS 2023-10-06 15:52:02 +02:00
Rémi de Juvigny
aa136be2a7
Merge branch 'main' into feature/rich-text-editor 2023-10-06 15:33:37 +02:00
Ben Irvin
0608d433f0
Merge pull request #17537 from strapi/fix/https-dts-error 2023-10-06 14:35:28 +02:00
Madhuri Sandbhor
e76bef0e65
[Blocks Editor] Link popover save button disabled state (#18332) 
* link save button disabled attribute added

* updated Link text field placeholder

* removed empty url check from submit

* minor changes
 2023-10-06 14:29:15 +02:00
Gustav Hansen
f30e95ef68
Merge pull request #18318 from strapi/chore/useLicenseLimitsNotification-ts 
chore(admin): convert useLicenseLimitNotification to TS
 2023-10-06 14:11:25 +02:00
Ben Irvin
a74a14a0da
Merge pull request #18235 from strapi/fix/dts-ws-timeout 2023-10-06 13:47:23 +02:00
Marc Roig
53f70451f2
Merge branch 'main' into chore/ts_declaration_map 2023-10-06 13:25:05 +02:00
Josh
66d7c1ce9b
chore: convert helper-plugin to pack-up (#18329) 2023-10-06 12:21:26 +01:00
Simone
628d1d69a0
check if the block field value is an array if it is not null (#18334) 2023-10-06 12:28:53 +02:00
Ben Irvin
474d7640d3
Update packages/core/data-transfer/src/strapi/remote/handlers/utils.ts 2023-10-06 12:10:54 +02:00
Rémi de Juvigny
8ebb00ad03
Fix code blocks shrinking (#18322) 2023-10-06 11:28:40 +02:00
Rémi de Juvigny
2937bb9237
[Blocks] Fix links colors (#18325) 
* Fix links not using design system color

* Inherit text color in modifiers
 2023-10-06 11:18:24 +02:00