yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-14 11:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,110 Commits 117 Branches 494 Tags
Commit Graph

30110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Irvin
8b10c20465 move most of the code to strapi/ee 2023-05-22 15:53:03 +02:00
Ben Irvin
894a2766bf add ssoLock to LocalStrategy 2023-05-19 18:02:20 +02:00
Simone Taeggi
858453e14f fix typo and wrong value passed in the onClear 2023-05-19 14:53:14 +02:00
Simone Taeggi
95aea1d0ee change schema validation on the frontend 2023-05-19 11:56:58 +02:00
Simone Taeggi
7d716d16f2 remove unused loadash merge 2023-05-19 11:11:25 +02:00
Simone Taeggi
3b133f4d7d Merge branch 'main' into fix/sso-lock-out-option 2023-05-19 11:03:27 +02:00
Simone Taeggi
041690d7b5 update snapshot SSO 2023-05-19 11:03:03 +02:00
Simone Taeggi
3fdb517b0b fix backend part of the sso form submission 2023-05-19 11:00:05 +02:00
Simone Taeggi
8a5683256f add the new field in the apis 2023-05-18 16:27:13 +02:00
Simone Taeggi
c5ab7915d6 implemented the multi select for the sso authentication disabled 2023-05-18 11:41:43 +02:00
Sébastien Vanvelthem
5d645f2103
chore: align swc usage for test:unit and fix swc/helpers hazards (#16731) 2023-05-18 09:53:07 +01:00
Josh
bdd0c462a1
chore: update to react18 (#16701) 
Co-authored-by: Paul Tiedtke <PaulTiedtke@web.de>
 2023-05-18 09:41:59 +01:00
DMehaffy
1ff71db3f6
Merge pull request #16746 from strapi/fix/marketCSP 
Remove all references to airtable assets and switch to market-assets
 2023-05-17 05:44:39 -07:00
Josh
8eec10c6ca
chore: remove react-fast-compare (#16749) 2023-05-17 10:57:47 +01:00
Josh
14c829e273
chore: remove react-test-renderer (#16750) 2023-05-17 10:57:27 +01:00
Marc
73852290ee
Merge pull request #16621 from goodhoko/patch-1 2023-05-17 11:46:04 +02:00
Simone
49a5c205d4
Chore: Replace axios calls with helper-plugin utils (#16628) 
* overwrite the Authorization header when passed as config

* replace axios call with fetchClient and remove axios cancel from the admin

* replace axios call in the UseCasePage form

* replace axios with useFetchClient inside the App component for the analytics call

* replace axios calls with the post useFetchClient inside the AuthPage

* remove axios instances inside the CollectionTypeFormWrapper and the SingleTypeFormWrapper

* Replace axios call with useFetchClient inside the Register component

* replace axios call with useFetchClient sinde the urlToFile utils

* remove axios instances inside the useFetchContentTypeLayout

* remove axios instances inside the ComponentSettingsView component

* update test urlToFile

* remove axios as dependency in admin and remove cancel token from ListView

* remove axios dependency from the admin

* revert dependency

* replace the downloadFile axios call with getFetchClient

* remove console log

* fix issue if preferedLanguage is null

* replace axios call with getFetchClient inside the urlToAssets utility

* revert back cancel token inside CollectionTypeFormWrapper

* revert cancel token logic

* add the logic to handle paths without prepending slash

* remove tip for the relative path

* move the fetchMarketplaceProviders util inside the useFetchMarketplaceProviders file

* use fetch instead of useFetchClient for external calls

* remove the control of the preferedLanguage inside the Profile page

* move up useFetchClient call

* refactor normalize url

* add mock getFetchClient in FromComputerForm test

* fix check full url

* refactor fetch

* cleanup code

* fix comments

* fix review comments

* refaactor fetch calls and fix types and format code

* add more info in the documentation

* fix unit tests marketplace and add a constants file shared between the two hooks

* change the import order

* refactor hooks returining type

* move whatwg-fetch import inside the admin-test-util and small refactoring

* fix test, remove comments and remove only
 2023-05-17 11:01:28 +02:00
derrickmehaffy
b66bd63a65 remove all references to airtable assets and switch to market-assets 2023-05-16 14:17:58 -07:00
Gustav Hansen
30c2c78008
Merge pull request #16736 from strapi/chore/window-strapi 
Chore: Add eslint rule to forbid access to the strapi global
 2023-05-16 11:24:31 +02:00
Gustav Hansen
e210edbb38 Chore: Fix eslint errors 2023-05-16 10:57:07 +02:00
Gustav Hansen
65a8d1965e Chore: Add eslint rule to forbid using strapi as global 2023-05-16 10:56:46 +02:00
Gustav Hansen
a0423a1414
Merge pull request #16732 from strapi/dependabot/npm_and_yarn/vm2-3.9.18 
chore(deps): bump vm2 from 3.9.17 to 3.9.18
 2023-05-16 10:42:22 +02:00
dependabot[bot]
63451295c8
chore(deps): bump vm2 from 3.9.17 to 3.9.18 
Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.17 to 3.9.18.
- [Release notes](https://github.com/patriksimek/vm2/releases)
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/patriksimek/vm2/compare/3.9.17...3.9.18)

---
updated-dependencies:
- dependency-name: vm2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-15 21:38:18 +00:00
Ben Irvin
4029068155
Merge pull request #16706 from marcoautiero/tracking-system-environment-attribute 2023-05-15 16:56:14 +02:00
Jean-Sébastien Herbaux
3db7c7236d
Merge pull request #16715 from strapi/dependabot/npm_and_yarn/graphql-tools/utils-8.13.1 2023-05-15 15:25:24 +02:00
Ben Irvin
55817f5f05
Update packages/core/strapi/lib/Strapi.js 2023-05-15 14:24:13 +02:00
Bassel Kanso
6bbdf94d5c
Merge pull request #16648 from strapi/fix/transfer-pull 
Wait for websocket to open only once in transfer pull
 2023-05-15 15:20:03 +03:00
Ben Irvin
1ce326c151
Merge pull request #16693 from belgattitude/example-remove-vscode-sqlite 2023-05-15 14:08:47 +02:00
Jean-Sébastien Herbaux
6d6a8ed944
Merge branch 'main' into dependabot/npm_and_yarn/graphql-tools/utils-8.13.1 2023-05-15 09:29:37 +02:00
Jean-Sébastien Herbaux
833f017981
Merge pull request #16705 from strapi/fix/generate-admin-user-hash 2023-05-15 09:20:07 +02:00
Gustav Hansen
cebf1a52fa
Merge pull request #16717 from strapi/dependabot/npm_and_yarn/nx-15.9.4 
chore(deps-dev): bump nx from 15.8.3 to 15.9.4
 2023-05-15 09:17:49 +02:00
Gustav Hansen
6345de302d
Merge pull request #16718 from strapi/dependabot/npm_and_yarn/date-fns-2.30.0 
chore(deps): bump date-fns from 2.29.3 to 2.30.0
 2023-05-15 09:16:49 +02:00
Gustav Hansen
d86d429e99
Merge pull request #16719 from strapi/dependabot/npm_and_yarn/babel-plugin-styled-components-2.1.1 
chore(deps): bump babel-plugin-styled-components from 2.0.2 to 2.1.1
 2023-05-15 09:15:26 +02:00
dependabot[bot]
5c17679d9c
chore(deps): bump babel-plugin-styled-components from 2.0.2 to 2.1.1 
Bumps [babel-plugin-styled-components](https://github.com/styled-components/babel-plugin-styled-components) from 2.0.2 to 2.1.1.
- [Release notes](https://github.com/styled-components/babel-plugin-styled-components/releases)
- [Commits](https://github.com/styled-components/babel-plugin-styled-components/compare/v2.0.2...v2.1.1)

---
updated-dependencies:
- dependency-name: babel-plugin-styled-components
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-14 23:04:46 +00:00
dependabot[bot]
04bd1d9eeb
chore(deps): bump date-fns from 2.29.3 to 2.30.0 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.29.3 to 2.30.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/v2.30.0/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.29.3...v2.30.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-14 23:04:03 +00:00
dependabot[bot]
8e05497848
chore(deps-dev): bump nx from 15.8.3 to 15.9.4 
Bumps [nx](https://github.com/nrwl/nx/tree/HEAD/packages/nx) from 15.8.3 to 15.9.4.
- [Release notes](https://github.com/nrwl/nx/releases)
- [Commits](https://github.com/nrwl/nx/commits/15.9.4/packages/nx)

---
updated-dependencies:
- dependency-name: nx
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-14 23:03:06 +00:00
dependabot[bot]
3126cf85d4
chore(deps): bump @graphql-tools/utils from 8.12.0 to 8.13.1 
Bumps [@graphql-tools/utils](https://github.com/ardatan/graphql-tools/tree/HEAD/packages/utils) from 8.12.0 to 8.13.1.
- [Release notes](https://github.com/ardatan/graphql-tools/releases)
- [Changelog](https://github.com/ardatan/graphql-tools/blob/master/packages/utils/CHANGELOG.md)
- [Commits](https://github.com/ardatan/graphql-tools/commits/@graphql-tools/utils@8.13.1/packages/utils)

---
updated-dependencies:
- dependency-name: "@graphql-tools/utils"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-14 22:59:41 +00:00
Sébastien Vanvelthem
086113084d ci: remove @vscode/sqlite for matrix 2023-05-13 10:20:20 +02:00
marcoautiero
e79e1f9257 Reintroduce the environment property in the tracking system 2023-05-12 16:53:17 +02:00
Convly
1916c48282 Make sure the admin user email is defined before trying to use it 2023-05-12 15:59:34 +02:00
Ben Irvin
e9bb5ccdc4
Merge pull request #16465 from strapi/feature/collection-names-and-ids-uniqueness 2023-05-12 12:40:11 +02:00
Sébastien Vanvelthem
bc1aafcb17 refactor(example): remove @vscode/sqlite from deps 2023-05-11 19:55:15 +02:00
Convly
e3b4cdeebf Merge branch 'releases/4.10.5' 2023-05-11 18:35:47 +02:00
Convly
93cc2aa479 Update yarn.lock 2023-05-11 18:33:16 +02:00
Josh
ba9b53b2ec
Merge pull request #16688 from strapi/chore/reshuffle-docs 2023-05-11 17:31:17 +01:00
Convly
d9277d616b v4.10.5 v4.10.5 2023-05-11 18:28:54 +02:00
Jean-Sébastien Herbaux
e348595b8d
Merge pull request #16686 from strapi/chore/ds-175 2023-05-11 18:12:01 +02:00
Ben Irvin
45333fe530
Merge pull request #16634 from strapi/fix/dts-bypass-schema-check 2023-05-11 18:11:38 +02:00
Ben Irvin
6c3d9b662a clean up path logic 2023-05-11 16:34:14 +02:00
Ben Irvin
498c18aade remove trailing dot 2023-05-11 15:26:00 +02:00