yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-29 08:04:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,260 Commits 138 Branches 514 Tags
Commit Graph

25260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc-Roig
6a1100b4f9 fix tests 2022-11-21 15:00:47 +01:00
Marc-Roig
b0091aa4a8 test for failing tests 2022-11-21 10:39:24 +01:00
Marc-Roig
75325fc9dc relations reordering api tests 2022-11-20 10:50:52 +01:00
Marc-Roig
c3c8f40d5b remove adjacent relations sorting as it is not necessary 2022-11-20 10:50:31 +01:00
Marc-Roig
114d67a9f2 fix adjacentRelations query to look for joinColum name 2022-11-20 10:49:59 +01:00
Marc-Roig
5fad91721b add reordering in attachRelations 2022-11-20 10:49:24 +01:00
Marc-Roig
a6993feab4 Merge branch 'feature/relations-reordering' into relations-reordering/database-logic-refactor 2022-11-18 09:29:13 +01:00
Marc-Roig
c568197c45 Merge branch 'main' into feature/relations-reordering 2022-11-18 09:28:57 +01:00
Josh
7edfefc706
Merge pull request #14524 from thelovekesh/add/nvmrc 2022-11-17 13:08:22 +00:00
Josh
70d7bbcb53
Merge pull request #14588 from wusuopu/fix-edit-json-field 2022-11-17 12:41:40 +00:00
Gustav Hansen
c1a9e7a360
Merge pull request #14910 from strapi/dependabot/npm_and_yarn/babel/parser-7.18.13 
chore(deps-dev): bump @babel/parser from 7.18.10 to 7.18.13
 2022-11-17 11:48:40 +01:00
Josh
6677b31cab
Merge branch 'main' into fix-edit-json-field 2022-11-17 10:24:18 +00:00
Josh
3a683fd983
Merge pull request #14718 from sargreal/fix/ctb-custom-relation-attributes-overwritten 2022-11-17 10:20:37 +00:00
Gustav Hansen
f7765d6663
Merge pull request #14899 from strapi/chore/frontend-tests-node-14 
Chore: Ensure core-js polyfills the frontend-tests based on the compile target
 2022-11-17 10:46:06 +01:00
dependabot[bot]
4bd30b2fa6
chore(deps-dev): bump @babel/parser from 7.18.10 to 7.18.13 
Bumps [@babel/parser](https://github.com/babel/babel/tree/HEAD/packages/babel-parser) from 7.18.10 to 7.18.13.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.13/packages/babel-parser)

---
updated-dependencies:
- dependency-name: "@babel/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-17 09:12:01 +00:00
Marc-Roig
980624f176 add sorting 2022-11-17 10:08:59 +01:00
Josh
49bf569bad
Merge pull request #14848 from strapi/chore/use-path-instead-of-require 2022-11-17 09:01:35 +00:00
Gustav Hansen
aa4a1ada02 Chore: Fix eslint errors 2022-11-17 09:57:57 +01:00
Gustav Hansen
55e84d3e9d Eslint: Lint jest configuration files 2022-11-17 09:57:57 +01:00
Gustav Hansen
475adb3122 Jest: Add env configuration for swc to add core-js polyfills 2022-11-17 09:57:57 +01:00
Gustav Hansen
e542eb5858 Chore: Update swc/core and swc/jest 2022-11-17 09:57:57 +01:00
Gustav Hansen
9e47dd0356 Chore: Polyfill core-js/array/at for frontend tests 2022-11-17 09:57:57 +01:00
Alexandre BODIN
a9613ef178
Merge pull request #14892 from strapi/dependabot/npm_and_yarn/docs/loader-utils-2.0.4 2022-11-17 09:56:10 +01:00
Alexandre BODIN
b42dd79b9e
Merge branch 'main' into dependabot/npm_and_yarn/docs/loader-utils-2.0.4 2022-11-17 09:50:47 +01:00
Gustav Hansen
1210f8406c
Merge pull request #14903 from strapi/chore/asset-card-tests 
Chore: Fix AssetCardBase tests
 2022-11-17 09:36:55 +01:00
dependabot[bot]
3aca49c6c6
chore(deps): bump loader-utils from 2.0.2 to 2.0.4 in /docs 
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.2 to 2.0.4.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v2.0.2...v2.0.4)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-17 05:45:04 +00:00
Gustav Hansen
b169f6fe33
Merge pull request #14906 from strapi/dependabot/npm_and_yarn/deep-object-diff-1.1.9 
chore(deps): bump deep-object-diff from 1.1.7 to 1.1.9
 2022-11-17 06:44:05 +01:00
Gustav Hansen
8b77dbfb59
Merge pull request #14901 from strapi/dependabot/npm_and_yarn/loader-utils-1.4.2 
chore(deps): bump loader-utils from 1.4.1 to 1.4.2
 2022-11-17 06:43:13 +01:00
dependabot[bot]
5ff1ae3972
chore(deps): bump deep-object-diff from 1.1.7 to 1.1.9 
Bumps [deep-object-diff](https://github.com/mattphillips/deep-object-diff) from 1.1.7 to 1.1.9.
- [Release notes](https://github.com/mattphillips/deep-object-diff/releases)
- [Commits](https://github.com/mattphillips/deep-object-diff/commits)

---
updated-dependencies:
- dependency-name: deep-object-diff
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-16 23:56:06 +00:00
Gustav Hansen
ea9d957a29 Chore: Fix AssetCardBase tests 2022-11-16 20:02:26 +01:00
Josh
00ec0d586a
Merge branch 'main' into fix/ctb-custom-relation-attributes-overwritten 2022-11-16 17:44:00 +00:00
Josh
e05abf9136
Merge branch 'main' into chore/use-path-instead-of-require 2022-11-16 17:06:47 +00:00
dependabot[bot]
c671bfe698
chore(deps): bump loader-utils from 1.4.1 to 1.4.2 
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.1...v1.4.2)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-16 17:06:25 +00:00
Convly
8c20ea2b5c v4.5.1 v4.5.1 2022-11-16 18:00:30 +01:00
Gustav Hansen
13e983d754
Merge pull request #14884 from callum-gander/chore/fix-spelling 
Chore: fix spelling of SchemaProvideer to SchemaProvider
 2022-11-16 16:23:33 +01:00
Julie Plantey
acfd0ea222
Merge pull request #14753 from dmoKruso/fix-ptBR-lang 
Update pt-BR.json
 2022-11-16 16:09:55 +01:00
Julie Plantey
6d2cb8281a
Merge pull request #14742 from alvesvaren/master 
Add even more swedish translations :)
 2022-11-16 16:08:44 +01:00
Sid
7d2a8bb337 chore: fixing spelling cont., missed a file 2022-11-16 14:17:17 +01:00
Sid
2ca3443a21 chore:fix spelling of SchemaProvideer to SchemaProvider 2022-11-16 14:17:17 +01:00
Jamie Howard
49c4ba2e73
Merge pull request #14839 from strapi/fix/relations-knex-raw 
Fix: knex withSchema.raw error
 2022-11-16 12:27:11 +00:00
Marc-Roig
6df6c9487b remove sorting from orderer 2022-11-16 12:44:28 +01:00
Jamie Howard
04295573f1 chore(entity-manager): revert to not handle multiple pg schemas 2022-11-16 11:22:22 +00:00
Jamie Howard
4b1f8101e6 fix(entity-manager): use db.connection for .raw() 
chore(database): revert getConnection()
 2022-11-16 09:34:08 +00:00
Ben Irvin
bcc1eed9fd
Merge pull request #14837 from strapi/fix/14802-postgres-token-duration 
Fix 30- and 90-day API token creation
 2022-11-16 09:59:53 +01:00
Marc-Roig
737b577919 Merge branch 'main' into feature/relations-reordering 2022-11-16 09:11:12 +01:00
Alve Svarén
6eeda5695d
Merge branch 'main' into master 2022-11-15 22:58:32 +01:00
Alve Svarén
8941d92127
Merge branch 'master' of github.com:alvesvaren/strapi-tranlsation-sv 2022-11-15 22:57:17 +01:00
Alve Svarén
c369330b62
Fix missing translations 2022-11-15 22:57:06 +01:00
Josh
505ad91008
Merge pull request #14874 from strapi/feat/save-relations-reordering 2022-11-15 18:18:38 +00:00
Gustav Hansen
82534279e9
Merge pull request #14861 from strapi/chore/update-testing-user-event 
Chore: Update @testing-library/user-event to 14.4.3
 2022-11-15 17:47:55 +01:00