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
30,145 Commits 138 Branches 514 Tags
Commit Graph

30145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh
141d3675ab
revert react18 (#16793) 2023-05-22 12:23:24 +01:00
Marc
4e17f00e35
Merge pull request #16760 from strapi/fix/some-folders-cant-be-moved-inside-others 2023-05-22 12:40:25 +02:00
Gustav Hansen
4d07d9e411
Merge pull request #16742 from strapi/chore/update-licenses 
Chore: Update license files
 2023-05-22 11:32:40 +02:00
Josh
cb68382384
chore: update DS to 1.7.7 (#16770) 2023-05-22 10:08:09 +01:00
Gustav Hansen
a691d9dde8
Merge pull request #16784 from strapi/dependabot/npm_and_yarn/eslint-8.41.0 
chore(deps-dev): bump eslint from 8.27.0 to 8.41.0
 2023-05-22 10:59:16 +02:00
dependabot[bot]
62003b3e09
chore(deps-dev): bump eslint from 8.27.0 to 8.41.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.27.0 to 8.41.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.27.0...v8.41.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-22 08:37:15 +00:00
Marc
454952b6d9
Merge pull request #16787 from strapi/dependabot/npm_and_yarn/cloudinary-1.37.0 2023-05-22 10:35:14 +02:00
Marc-Roig
087ff3765b
chore: create util to check if folder is the same as another one or a child one 2023-05-22 10:06:37 +02:00
dependabot[bot]
6ca06c8c5b
chore(deps): bump cloudinary from 1.33.0 to 1.37.0 
Bumps [cloudinary](https://github.com/cloudinary/cloudinary_npm) from 1.33.0 to 1.37.0.
- [Release notes](https://github.com/cloudinary/cloudinary_npm/releases)
- [Changelog](https://github.com/cloudinary/cloudinary_npm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cloudinary/cloudinary_npm/compare/1.33.0...1.37.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-21 23:05:30 +00:00
Gustav Hansen
3f9b0e3769
Merge pull request #16404 from GitStartHQ/fix/description-min-and-max-characters 
fix: Description and min/max characters not visible during error screen
 2023-05-19 18:28:51 +02:00
Jamie Howard
ee413187df
Merge pull request #16700 from strapi/webhooks/list-view 2023-05-19 16:16:38 +01:00
Jamie Howard
4d29bb121c chore(webhooks/ListView): correct translation 2023-05-19 15:33:19 +01:00
Jamie Howard
05c1d3ec64 chore(webhooks/ListView): clean up tests 2023-05-19 13:58:22 +01:00
Jamie Howard
e499e4de53 Merge remote-tracking branch 'origin/main' into webhooks/list-view 2023-05-19 13:25:04 +01:00
Jamie Howard
2122cf6729 chore(webhooks/ListView): PR feedback 2023-05-19 13:20:27 +01:00
Marc
1285ba7ecd
Merge pull request #16759 from strapi/fix/delete-unintentional-folders 2023-05-19 12:40:51 +02:00
Marc
a7b8ad0fd5
Merge branch 'fix/delete-unintentional-folders' into fix/some-folders-cant-be-moved-inside-others 2023-05-19 12:15:06 +02:00
Marc-Roig
1b00e1d8e2
remove logs 2023-05-19 11:22:17 +02:00
Marc-Roig
c266835d04
chore: more logs 2023-05-19 10:35:15 +02:00
Marc-Roig
2ad193e1a3
chore: logs to debug test 2023-05-19 09:35:35 +02:00
Jamie Howard
5dfe7abe05 feat(webhooks/ListView): improve mutation logic 2023-05-18 12:42:58 +01: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
Marc-Roig
a781a8a368
fix: do not assign result to data folders 2023-05-18 09:39:28 +02:00
Marc-Roig
4870920918
fix: improve path match on check if folder is movable 2023-05-17 18:08:02 +02:00
Marc-Roig
a1a2453c15
chore: rename tests 2023-05-17 17:51:02 +02:00
Marc-Roig
c4b966a03d
chore: rename test 2023-05-17 17:36:39 +02:00
Marc-Roig
15e71b69b0
test: delete of folder does not delete unintended folders 2023-05-17 17:32:00 +02:00
Marc-Roig
008d82f8f7
fix: filter folder by eq and startswith 2023-05-17 17:31:38 +02:00
Jamie Howard
5747e3acf4 chore: test cleanup 2023-05-17 15:09:22 +01:00
Jamie Howard
28d36c1250 test(webhooks/ListView): improve element selection 2023-05-17 15:03:44 +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
Jamie Howard
8743dc6e7d test(webhooks/ListView): test cases for delete and enable 2023-05-17 12:58:49 +01:00
Jamie Howard
6c4439e7ae test(webhooks/ListView) 2023-05-17 12:47:50 +01: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
GitStart
d6979650f6
Merge branch 'main' into fix/description-min-and-max-characters 2023-05-16 20:07:40 +03:00
Gustav Hansen
432377b2dd Chore: Update license files 2023-05-16 17:43:19 +02:00
Jamie Howard
d983afc313 feat(webhooks/ListView): Refactor state management 
feat(webhooks/ListView): improve react-query usage
 2023-05-16 16:42:43 +01: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
Jamie Howard
7a4024a1ab test(webhooks): webhook disable 2023-05-15 15:12:19 +01: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