yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 18:33:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,453 Commits 121 Branches 507 Tags
Commit Graph

33453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Irvin
c38881e08d
chore: update typescript to 5.3.2 (#18938) 2023-12-04 11:47:05 +01:00
Alexandre Bodin
83daf0117c Merge branch 'develop' into v5/main 2023-12-01 10:29:48 +01:00
dependabot[bot]
63eaab0923
chore(deps): bump @adobe/css-tools from 4.3.1 to 4.3.2 (#18961) 2023-12-01 07:23:04 +00:00
Josh
3301d58a39
chore(deps): update DS to 1.13.2 (#18959) 
* chore(deps): update DS to 1.13.2

* chore: update snapshots
 2023-11-30 16:37:04 +00:00
Alexandre Bodin
e0de993d4a Merge branch 'develop' into v5/main 2023-11-30 16:42:36 +01:00
Alexandre Bodin
6b35da10af Merge branch 'main' into develop 2023-11-30 16:32:56 +01:00
Josh
d5f620ac3b
Merge pull request #18947 from strapi/releases/4.15.5 
Releases/4.15.5
 2023-11-30 15:19:08 +00:00
Mark Kaylor
f486f51567 fix: update frontend snapshots after downgrade 2023-11-30 15:56:13 +01:00
Mark Kaylor
675d60f265 fix: downgrade @strapi/icons to match main 1.13.0 2023-11-30 14:16:07 +01:00
Josh
dfec2ca3fc
chore(i18n): convert middlewares to TS (#18957) 2023-11-30 11:58:42 +00:00
Mark Kaylor
b6dda1f6ae chore: update frontend snapshots 2023-11-30 12:07:39 +01:00
Mark Kaylor
97e854e902 Merge branch 'main' of github.com:strapi/strapi into releases/4.15.5 2023-11-30 11:08:02 +01:00
Mark Kaylor
dc96169c3f v4.15.5 v4.15.5 2023-11-29 16:42:28 +01:00
Rémi de Juvigny
2611986c0d
fix(blocks): handle enter key on image (#18901) 
* fix(blocks): handle enter key on image

* reuse mock schema image

* show image block focus

* remove created paragraph

* remove unused utils

* fix delete image when it's the only block

* fix images taller than needed
 2023-11-29 16:23:21 +01:00
Rémi de Juvigny
a8393a3381
feat(blocks): add markdown snippets (#18922) 
* wip

* handle snippets

* handle multiple snippets

* add snippet for image block

* add + snippet for list

* mark feedback

* add code block snippet
 2023-11-29 14:14:47 +01:00
Rémi de Juvigny
adbd820884
feat(blocks): make it easier to exit code blocks (#18894) 
* handle double enter on code blocks

* rename code translations

* allow forced line breaks

* mark feedback

* don't add paragraph when converting to code block
 2023-11-29 11:19:25 +01:00
Alexandre BODIN
76a7b8a5b5
Merge pull request #18745 from belgattitude/yarn-dedupe-deps 2023-11-28 15:56:20 +01:00
Alexandre Bodin
74605c3f6c update lockfile 2023-11-28 15:37:02 +01:00
Sébastien Vanvelthem
520c59aa2c chore(lock): deduplicate dependencies 
Co-Authored-By: Sébastien Vanvelthem <belgattitude@users.noreply.github.com>
 2023-11-28 15:36:30 +01:00
Marc Roig
d4d47227a6
feat: Initialize Document Service (#18558) 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-11-28 12:01:27 +01:00
Josh
b7d336700e
chore(cm): convert crudReducer to TS (#18879) 
Update packages/core/admin/admin/src/content-manager/components/CollectionTypeFormWrapper/index.jsx
 2023-11-28 09:01:48 +00:00
Gustav Hansen
c9130a2ea3
chore(admin): convert token components to TS (#18907) 2023-11-27 21:08:40 +00:00
Alexandre BODIN
9e5de363e3
Merge pull request #18916 from strapi/docs/aws-v3-update 2023-11-27 17:38:06 +01:00
Christian
e8beb0977f
Merge branch 'releases/4.15.5' into docs/aws-v3-update 2023-11-27 17:15:05 +01:00
Christian
ee776447bc
Update packages/providers/upload-aws-s3/README.md 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-11-27 16:57:58 +01:00
Christian
33193ce8b2
Update packages/providers/upload-aws-s3/README.md 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-11-27 16:57:46 +01:00
Christian
2781bf02bd
Update packages/providers/upload-aws-s3/README.md 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-11-27 16:57:26 +01:00
Christian Capeans
52e9a48a8f chore: add documentation for old s3 urls 2023-11-27 16:25:40 +01:00
markkaylor
4d35516709
Merge pull request #18580 from ciriousjoker/fix-localization-response 2023-11-27 12:07:29 +01:00
Rémi de Juvigny
87b413c0c2
chore(blocks): handle block conversion logic in the blocks store (#18840) 
* chore: manage block conversion logic in blocks store

* fix heading conversion when inside list

* make handleConvert optional

* add comments to conversions file

* extract getAttributesToClear

* extract baseHandleConvert
 2023-11-27 09:57:35 +01:00
Gustav Hansen
b1a2b217c4
Merge pull request #18885 from strapi/chore/transfer-tokens-ts-2 
chore(admin): convert transfer tokens to TS
 2023-11-24 16:46:02 +01:00
Ben Irvin
498ecc1a26
feat: strapi.log default level 'info' (#18904) 2023-11-24 14:35:15 +01:00
Gustav Hansen
daf387268b chore(admin): convert transfer tokens to TS 
Co-authored-by: Josh Ellis <josh.ellis@strapi.io>
 2023-11-24 13:18:11 +01:00
Alexandre BODIN
8bc036bc50
Merge pull request #18897 from strapi/v5/remove-ee-imports 2023-11-24 12:12:48 +01:00
Alexandre Bodin
9628e9d90f chore: remove ee direct imports 2023-11-24 09:33:00 +01:00
Rémi de Juvigny
8811cfafd2
fix(blocks): add modifiers to test provider (#18898) 2023-11-23 18:14:54 +01:00
Rémi de Juvigny
e19c0efd68
chore(blocks): pass modifiers via useBlocksEditorContext (#18802) 
* move toolbar up one directory

* rename BlocksInput to BlocksContent

* rename BlocksEditor to BlocksInput

* rename parent dir to BlocksInput

* extract BlocksEditor component out of BlocksInput

* pass editor via useBlocksEditorContext hook

* rename Toolbar file to BlocksToolbar

* update test names

* assemble blocks store in context

* add basic unit tests for each block type

* test individual block logic

* simplify wrapper code

* delete useBlocksStore

* rename dir to Blocks

* fix build error

* use type guard for Link element

* pass modifiers via useBlocksEditorContext

* remove useBlocksStore
 2023-11-23 17:10:59 +01:00
Alexandre Bodin
9f51230057 fix(content-type-builder): typings 2023-11-23 17:08:55 +01:00
Jamie Howard
52321fa7ad
(content-manager): types for field sizes service (#18888) 2023-11-23 12:45:10 +00:00
Alexandre Bodin
27aa897cbb Merge branch 'develop' into v5/main 2023-11-23 11:52:10 +01:00
Josh
eb7b88426d
fix(pack-up): ensure we pass the tsconfig file name, not a path to it (#18875) 
* fix(pack-up): ensure we pass the tsconfig file name, not a path to it

fix(admin): annotate return type on createBuildContext

fix(admin): ensure shared is a the base folder not importing from server

chore(pack-up): PRINT MOREEEE

fix(ctb): export required type

chore: refactor tsconfigs

* chore: pr amends
 2023-11-23 09:16:25 +00:00
Jamie Howard
c6501d8941
fix(type): export JSONObject (#18870) 2023-11-23 09:54:03 +01:00
Alexandre Bodin
946f08c2e5 Merge branch 'main' into develop 2023-11-22 17:34:59 +01:00
Alexandre Bodin
37fcc99be4 Merge branch 'main' into v5/main 2023-11-22 17:28:51 +01:00
Marc Roig
c970d7027e
Merge pull request #18860 from strapi/ts/content-manager-entity-manager 
feat: type content manger entity manager service
 2023-11-22 15:22:15 +01:00
Josh
e47841a710
chore(i18n): convert CM hooks to TS (#18861) 2023-11-22 11:36:57 +00:00
Jamie Howard
fc0ebf30f1
[content-manager] types for policies (#18846) 2023-11-22 09:45:34 +00:00
Ben Irvin
668e382e40
chore: use strapi.fetch instead of http/https for requests (#18510) 
fix: replace http/https with fetch api
 2023-11-22 09:16:47 +01:00
Ben Irvin
2ac2ae5867
feat: Use fetch api for strapi.fetch (#18508) 2023-11-22 09:10:29 +01:00
JonathanHallen1991
4aea55bf4a
Add English (Norway) en-NO locale (#18828) 2023-11-22 09:08:55 +01:00