yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-05 23:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 112 Branches 487 Tags
Commit Graph

9899 Commits

Author SHA1 Message Date
Jamie Howard
9f6e79ebe3 chore(content-manager) 2023-01-03 15:43:24 +00:00
Marc-Roig
030c109a95 better circular reference error handling 2023-01-03 16:38:14 +01:00
Fernando Chavez
484dc5022c Merge branch 'feature/audit-logs' of github.com:strapi/strapi into audit-logs/list-api-mapping 2023-01-03 16:29:22 +01:00
Jamie Howard
aef978999b
Merge pull request #15296 from pataiadam/main 2023-01-03 13:59:23 +00:00
Marc-Roig
8ec567ef9f move mysql where clause to the correct query 2023-01-03 14:49:00 +01:00
Marc-Roig
621a16119b remove constraints list 
it does not apply anymore
 2023-01-03 14:19:08 +01:00
Rémi de Juvigny
287aac9f0c Merge remote-tracking branch 'origin/audit-logs/list-api-mapping' into audit-logs/api-modal 2023-01-03 14:13:46 +01:00
Fernando Chavez
f6a591aa58 Delete CellValue component and make it a function 2023-01-03 13:58:27 +01:00
Josh
70fe7d251b chore: fix snapshot 2023-01-03 12:21:45 +00:00
Jamie Howard
a41e972082
Merge pull request #15196 from strapi/fix/close-modal-with-esc 2023-01-03 12:15:25 +00:00
Jamie Howard
c028712983 test(content-manager): RelationInputDataManager select to use source component ID 2023-01-03 12:13:12 +00:00
Josh
c5ebf3edac Merge branch 'main' into feature/relations-reordering 2023-01-03 12:09:25 +00:00
Marc-Roig
26fba9f4be test for circular references 2023-01-03 12:21:40 +01:00
Convly
60d8434fad Merge branch 'deits/architecture-rework' into deits/transfer-protocol 2023-01-03 10:35:29 +01:00
Ben Irvin
d04f669d29 add missing package 2023-01-03 10:32:09 +01:00
Ben Irvin
52743df376
Merge pull request #15279 from strapi/deits/transfer-push-cli 2023-01-03 10:09:20 +01:00
dependabot[bot]
0861118149
chore(deps): bump codemirror from 5.65.8 to 5.65.11 
Bumps [codemirror](https://github.com/codemirror/basic-setup) from 5.65.8 to 5.65.11.
- [Release notes](https://github.com/codemirror/basic-setup/releases)
- [Changelog](https://github.com/codemirror/basic-setup/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/basic-setup/commits)

---
updated-dependencies:
- dependency-name: codemirror
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-03 09:04:32 +00:00
dependabot[bot]
b7f3b576be
chore(deps-dev): bump @storybook/builder-webpack5 from 6.5.9 to 6.5.15 
Bumps [@storybook/builder-webpack5](https://github.com/storybookjs/storybook/tree/HEAD/lib/core) from 6.5.9 to 6.5.15.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.15/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.15/lib/core)

---
updated-dependencies:
- dependency-name: "@storybook/builder-webpack5"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-03 09:03:02 +00:00
Fernando Chavez
569da42a9f Merge fix and small change 2023-01-02 18:46:56 +01:00
Convly
5e86d93b86 Merge branch 'deits/transfer-push' into deits/architecture-rework 2023-01-02 18:16:23 +01:00
Convly
ee234b89be Merge branch 'deits/transfer-push' into deits/transfer-protocol 2023-01-02 18:16:13 +01:00
Convly
b98c873a8c Add data-transfer dependency to strapi/strapi 2023-01-02 18:15:59 +01:00
Ben Irvin
8a3fe03bf4 add missing dep 2023-01-02 18:12:13 +01:00
Convly
00f2b99705 Add lib to the eslintignore file 2023-01-02 18:10:51 +01:00
Convly
fc1cf45fcc Merge branch 'deits/transfer-push' into deits/transfer-protocol 2023-01-02 17:54:45 +01:00
Convly
9bd3453e83 Merge branch 'deits/transfer-protocol' of github.com:strapi/strapi into deits/transfer-protocol 2023-01-02 17:54:28 +01:00
Convly
83f10de1e0 Merge branch 'deits/transfer-push' into deits/architecture-rework 2023-01-02 17:54:01 +01:00
Convly
0ce03a14f2 Merge branch 'features/deits' into deits/transfer-push 2023-01-02 17:53:29 +01:00
Ben Irvin
829e197e99 Merge branch 'features/deits' into deits/transfer-push-cli 2023-01-02 17:51:30 +01:00
Ben Irvin
9d45f557a2 update version 2023-01-02 17:49:17 +01:00
Ben Irvin
a0e1b8d31e fix tests 2023-01-02 17:35:43 +01:00
Ben Irvin
c700027a6d reenable lint 2023-01-02 17:11:51 +01:00
Ben Irvin
bc609a2f0a
Merge branch 'deits/transfer-push' into deits/transfer-push-cli 2023-01-02 17:10:53 +01:00
Marc-Roig
036cb8b250 filter by entity id when reordering components 2023-01-02 16:48:02 +01:00
Ben Irvin
496ae40ede
Merge branch 'main' into features/deits 2023-01-02 16:29:27 +01:00
Convly
3b9dbbe4b9 Remove useless async 2023-01-02 16:07:16 +01:00
Convly
42a6497e42 Merge branch 'deits/transfer-push-tests' into deits/architecture-rework 2023-01-02 15:46:20 +01:00
Convly
57ef36c3ce Merge branch 'deits/transfer-push-tests' into deits/transfer-protocol 2023-01-02 15:44:31 +01:00
Convly
db89c53edc Merge branch 'features/deits' into deits/transfer-push-tests 2023-01-02 15:41:50 +01:00
Convly
34ca7adbe2 Update import path & fix tests 2023-01-02 15:33:15 +01:00
Convly
611f991820 data-transfer: Move from lib to src & update folder architecture 2023-01-02 15:30:37 +01:00
Marc-Roig
2528ae5637 Merge branch 'feature/relations-reordering' into relations-reordering/non-strict-connect 2023-01-02 14:44:02 +01:00
Fernando Chavez
01ca9a66fc typo fix 2023-01-02 14:16:30 +01:00
Fernando Chavez
b16517ad4e Better name to the delete expired events job 2023-01-02 13:18:48 +01:00
Gustav Hansen
129d88cccc
Merge pull request #15278 from ivan-ha/fix/zh-translations 
fix: broken translations in EditFolderDialog and various zh translations in Media Library
 2023-01-02 12:29:31 +01:00
Gustav Hansen
4f01dd1c8c
Merge pull request #15289 from ivan-ha/fix/content-manager-i18n 
fix: zh translations of content-manager.containers.Edit.information.by
 2023-01-02 12:26:54 +01:00
Marc-Roig
74c6ec1f61 add validation folder in database 2023-01-02 11:28:48 +01:00
Ben Irvin
1b4560ba28 alphabetize 2023-01-02 11:12:09 +01:00
Fernando Chavez
e53c3544e6 Create a new admin-actions file for EE and add audit logs actions 2023-01-02 10:08:16 +01:00
Ben Irvin
897bb4a87c
Merge branch 'features/deits' into deits/ts-workflow 2023-01-02 10:04:14 +01:00