yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-31 12:55:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,778 Commits 106 Branches 487 Tags
Commit Graph

708 Commits

Author SHA1 Message Date
Marc Roig
df79981a07
Merge pull request #17262 from strapi/fix/relation-reordering-inv 2023-07-24 15:12:00 +02:00
Marc-Roig
db97bf9ff3
chore: mark jsonSuperSetOf as experimental and for internal use 2023-07-20 08:51:06 +02:00
Convly
b4a4e42919 Merge branch 'main' of github.com:strapi/strapi into releases/4.11.6 2023-07-19 16:47:47 +02:00
Convly
1edefac8a3 v4.11.7 2023-07-19 16:39:46 +02:00
Gustav Hansen
9483cef63e
Merge branch 'main' into feature/review-workflow-multiple 2023-07-18 15:37:47 +02:00
dependabot[bot]
881dae1dce
chore(deps): bump semver from 7.5.1 to 7.5.2 
Bumps [semver](https://github.com/npm/node-semver) from 7.5.1 to 7.5.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v7.5.1...v7.5.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-18 12:26:35 +00:00
Gustav Hansen
72cc277165 Merge branch 'main' into feature/review-workflow-multiple-merge-17-07-23 2023-07-17 13:38:35 +02:00
Marc-Roig
f5e40910a5
Merge branch 'main' into releases/4.11.5 2023-07-12 15:44:01 +02:00
Marc-Roig
7bdef3d278
v4.11.5 2023-07-12 14:47:27 +02:00
Marc-Roig
43f56d426e
fix: two separate queries to update order and inverse order 2023-07-11 13:22:16 +02:00
Gustav Hansen
2291816276 Merge branch 'main' into feature/review-workflow-multiple 2023-07-11 12:47:44 +02:00
Marc-Roig
f6246c145d
fix: relations are not returned in the correct order 
When removing or adding a relation in an entity, other entities from the same Content Type were seeing that same relation reordered.

Cause: We were updating the order of the other entities when we should only be updating the inverse order.
 2023-07-11 10:17:06 +02:00
dependabot[bot]
de90fbcd78
chore(deps): bump knex from 2.4.0 to 2.5.0 
Bumps [knex](https://github.com/knex/knex) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/knex/knex/releases)
- [Changelog](https://github.com/knex/knex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/knex/knex/compare/2.4.0...2.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-10 08:18:48 +00:00
Gustav Hansen
a886c69b56 Merge branch 'main' into feature/review-workflow-multiple-merge-07-2023 2023-07-07 13:35:15 +02:00
Convly
8d325a6953 v4.11.4 2023-07-05 16:46:16 +02:00
Christian Capeans
98f34c162e Fix date parser 2023-07-05 15:01:37 +02:00
Marc-Roig
aac28413ad
v4.11.3 2023-06-28 16:52:34 +02:00
Gustav Hansen
4410fb8f97 Merge branch 'main' into feature/review-workflow-multiple-merge-main 2023-06-22 12:17:05 +02:00
Gustav Hansen
7b83703576 Merge branch 'main' into feature/review-workflow-multiple-merge-main 2023-06-22 11:20:53 +02:00
Marc
28252dfa94 chore: remove todo 2023-06-22 08:00:14 +01:00
Marc
a6f4afeda6 refactor: change cloneRelations cloneAttrs format 2023-06-22 08:00:14 +01:00
Marc
b1d780bebb update lock 2023-06-22 08:00:14 +01:00
Marc-Roig
4d79a359bd feat: compute omitIds 2023-06-22 07:59:49 +01:00
Marc-Roig
49f290ff97 feat: add omitIds 2023-06-22 07:59:49 +01:00
Marc-Roig
460099408b remove todos 2023-06-22 07:59:49 +01:00
Marc-Roig
292ae24aea update relations inside clone relations 2023-06-22 07:59:48 +01:00
Marc-Roig
a8af01763c rename merge with customizer variables 2023-06-22 07:59:48 +01:00
Marc-Roig
76eb559466 clone entity 2023-06-22 07:59:48 +01:00
Marc-Roig
4c310e5659 polymorphic check 2023-06-22 07:59:48 +01:00
Marc-Roig
b5f1d6842c rename targetId to id 2023-06-22 07:59:48 +01:00
Marc-Roig
2e7e8b6813 rename id cloneId to targetId sourceId 2023-06-22 07:59:48 +01:00
Marc-Roig
e970451c9e update clone relation jsdoc 2023-06-22 07:59:48 +01:00
Marc-Roig
8241f4ae3a mention future support for join columns 2023-06-22 07:59:48 +01:00
Marc-Roig
2faed39cbb remove todos 2023-06-22 07:59:48 +01:00
Marc-Roig
8cf615583d clone and replace regular relations db queries 2023-06-22 07:59:48 +01:00
Marc-Roig
e817c74b25 clean inverse order column 2023-06-22 07:59:48 +01:00
Marc-Roig
c4386ef013 add entity-repository cloneRelations method 2023-06-22 07:59:48 +01:00
Marc-Roig
49cc9cfb89 add entity-repository cloneRelations method 2023-06-22 07:59:48 +01:00
Convly
6f7c815c2b v4.11.2 2023-06-21 15:57:32 +02:00
Jean-Sébastien Herbaux
aea0ea8350
Merge pull request #16990 from strapi/releases/4.11.1 2023-06-12 17:27:43 +02:00
Marc-Roig
6cdb5a7737
v4.11.1 2023-06-12 17:10:44 +02:00
Marc
cc4f58ce38
Merge pull request #16552 from strapi/fix/remove-persisted-tables-from-store 2023-06-12 10:53:21 +02:00
Ben Irvin
e321cba19b
Merge pull request #16912 from strapi/dependabot/npm_and_yarn/semver-and-types/semver-7.5.1 2023-06-08 17:36:19 +02:00
Alexandre Bodin
0de06a008d v4.11.0 2023-06-07 17:16:22 +02:00
dependabot[bot]
1c485c01a3
chore(deps): bump semver and @types/semver 
Bumps [semver](https://github.com/npm/node-semver) and [@types/semver](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/semver). These dependencies needed to be updated together.

Updates `semver` from 7.3.8 to 7.5.1
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v7.3.8...v7.5.1)

Updates `@types/semver` from 7.3.13 to 7.5.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/semver)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-06 14:29:44 +00:00
Ben Irvin
7f3da5d08d fix utils version 2023-06-05 11:29:18 +02:00
Ben Irvin
e736474f1a Merge branch 'main' of https://github.com/strapi/strapi into fix/clean-filters 2023-06-05 11:26:38 +02:00
Gustav Hansen
50159813a5
Merge branch 'main' into feature/review-workflow-multiple 2023-06-02 13:12:22 +02:00
Gustav Hansen
dc58d6c205 Merge branch 'main' into feature/review-workflow-multiple 2023-06-02 11:54:21 +02:00
Marc-Roig
52b37c3fcf
fix: move ID type definition in databse 2023-06-01 17:37:41 +02:00