yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-01 12:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,626 Commits 113 Branches 491 Tags
Commit Graph

30626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc
6cd60520fa
Merge pull request #16965 from strapi/chore/fix-styling 2023-06-09 12:00:33 +02:00
Marc-Roig
7a80dfa0d5
chore: fix styling 2023-06-09 10:54:12 +02:00
Marc
e41415e8ff
Merge pull request #16868 from strapi/fix/s3-bucket-compat-providers 2023-06-08 17:46:53 +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
Bassel Kanso
b6ba26fe05
Merge pull request #16765 from strapi/fix/sso-lock-out-option 
SSO - add local authentication lock-out feature
 2023-06-08 14:43:20 +03:00
Marc
aa7f6368d0
Update utils.ts 2023-06-08 11:02:12 +02:00
Bassel
2282ba810a Merge branch 'main' into fix/sso-lock-out-option 2023-06-08 11:46:28 +03:00
Alexandre Bodin
65a6c9cfa7 Merge branch 'releases/4.11.0' 2023-06-07 17:25:38 +02:00
Alexandre Bodin
0de06a008d v4.11.0 2023-06-07 17:16:22 +02:00
Jean-Sébastien Herbaux
d0785a2eb7
Merge pull request #16942 from strapi/fix/date-time-picker-values 2023-06-07 16:46:09 +02:00
Josh
8d6dc353e8 fix: dtp value should not pass empty string 2023-06-07 15:35:02 +01:00
Convly
951765ee62 Merge branch 'releases/4.10.8' v4.11.0 2023-06-07 15:49:34 +02:00
Convly
4ce15c43a8 Update yarn.lock 2023-06-07 15:39:29 +02:00
Convly
634d9e39de v4.10.8 v4.10.8 2023-06-07 15:34:54 +02:00
Ben Irvin
452e2b86d3 add more test cases 2023-06-07 15:08:09 +02:00
Ben Irvin
4d4e1c4c64 fix utils version 2023-06-07 15:08:09 +02:00
Ben Irvin
0af9620f7c require matching case for operators 2023-06-07 15:08:08 +02:00
Ben Irvin
6e51da2815 update strapi/utils package 2023-06-07 15:08:08 +02:00
Ben Irvin
9c42a9232c test filtering 2023-06-07 15:08:08 +02:00
Ben Irvin
a881c3929c remove case sensitivity 2023-06-07 15:08:08 +02:00
Ben Irvin
93181d5a9c allow id filter 2023-06-07 15:08:08 +02:00
Ben Irvin
135bb34518 remove case insensitivity from id check 2023-06-07 15:08:08 +02:00
Ben Irvin
ebb2a3ee16 fix scope 2023-06-07 15:08:08 +02:00
Ben Irvin
1f9e0bcf1d Update packages/core/utils/lib/convert-query-params.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-06-07 15:08:08 +02:00
Ben Irvin
2764c3c6ba Update packages/core/utils/lib/operators.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-06-07 15:08:08 +02:00
Ben Irvin
1c0c28fb0d Update packages/core/utils/lib/operators.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-06-07 15:08:08 +02:00
Ben Irvin
32dc008197 export isOperator and isOperatorOfType directly 2023-06-07 15:08:08 +02:00
Ben Irvin
5d915bc496 remove comment 2023-06-07 15:08:08 +02:00
Ben Irvin
9f57ff7bff only allow attributes and operators on filters 
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
 2023-06-07 15:08:08 +02:00
Ben Irvin
be02aa2130 move operators to utils 2023-06-07 15:08:03 +02:00
Ben Irvin
6a0444334b initial commit 2023-06-07 15:07:07 +02:00
nathan-pichon
2fa8f30371 fix(content-types): remove getter for private attributes 
+ Fixes a flaky test (transactions.test.api.js)
 2023-06-07 14:44:04 +02:00
Bassel
f704024bdf fix failing test 2023-06-07 14:37:22 +03:00
Josh
8357aab46e
chore: fix tests (#16937) 
Co-authored-by: Marc-Roig <marc12info@gmail.com>
 2023-06-07 11:43:09 +01:00
Bassel
f4908a8a21 remove lodash pick and omit 2023-06-07 13:26:32 +03:00
Convly
b71f521762 Merge branch 'main' into releases/4.11.0 2023-06-07 12:07:35 +02:00
Jean-Sébastien Herbaux
7ec5466c22
Merge pull request from GHSA-9xg4-3qfm-9w8f 
Improve sanitization in sanitizeQuery and convertQueryParams
 2023-06-07 12:06:40 +02:00
Bassel
057cb55f9c remove testids and use labels instead 2023-06-07 12:42:14 +03:00
Convly
106cfafca4 Merge branch 'main' into releases/4.11.0 2023-06-07 11:31:42 +02:00
Bassel
587d2ee944 remove onSuccess 2023-06-07 12:23:16 +03:00
Convly
58d2f3ec0b Fix missing require for ee auth service 2023-06-06 22:40:24 +02:00
Bassel
1449663b27 move to user controller 2023-06-06 18:40:23 +03:00
Bassel
bda9508bc9 fixing tests 2023-06-06 18:28:48 +03:00
Bassel
3510a7ff1e remove console.log 2023-06-06 18:07:30 +03:00
Bassel
84da83aa4d making things work on CE edition 2023-06-06 18:05:07 +03:00
Bassel
f07531cb86 add route to for ssoLocked and update accordingly 2023-06-06 17:29:55 +03: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
Jean-Sébastien Herbaux
4d76b58dee
Merge pull request #16910 from strapi/dependabot/npm_and_yarn/typescript-5.1.3 2023-06-06 16:27:46 +02:00
Josh
38fb966605
chore: upgrade ds to 1.8.0 (#16931) 2023-06-06 15:13:17 +01:00
Bassel
a97d8da47f Merge branch 'main' into fix/sso-lock-out-option 2023-06-06 14:31:41 +03:00