yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 09:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,860 Commits 115 Branches 488 Tags
Commit Graph

760 Commits

Author SHA1 Message Date
GitStart
d829a49733
Merge branch 'main' into fix/application-crash-on-filter-delete 2022-12-19 05:56:24 +01:00
GitStart
602c6eddca
Merge branch 'main' into fix/application-crash-on-filter-delete 2022-12-16 16:02:15 +01:00
Julie Plantey
775777fae2 Merge branch 'main' of https://github.com/strapi/strapi into features/MediaLibrary-listview 2022-12-16 14:35:24 +01:00
derrickmehaffy
e09614c9a4 Update qs to fix CVE-2022-24999 2022-12-15 09:49:40 -07:00
GitStart
2297b70a5b
Merge branch 'main' into fix/application-crash-on-filter-delete 2022-12-14 16:22:45 +01:00
Convly
8716ecc920 v4.5.4 2022-12-14 15:39:30 +01:00
ivanThePleasant
b95d6e3f28 Merge branch 'main' into chore/user-level-data 2022-12-13 12:17:31 +02:00
Gustav Hansen
978630d655
Merge pull request #14759 from strapi/enhancement/axios-refactoring 
useFetchClient hook replacing axiosInstance
 2022-12-07 17:26:51 +01:00
gitstart
552f8b5056 fix: application crash when deleting a filter 2022-12-06 16:08:15 +00:00
Julie Plantey
5a6529ab8d Merge branch 'main' of https://github.com/strapi/strapi into features/MediaLibrary-listview 2022-12-06 16:32:38 +01:00
Gustav Hansen
acada6047e
Merge pull request #15090 from strapi/dependabot/npm_and_yarn/jest-styled-components-7.1.1 
chore(deps-dev): bump jest-styled-components from 7.0.2 to 7.1.1
 2022-12-06 13:10:01 +01:00
Gustav Hansen
67ad079472 Chore: Update snapshot tests 2022-12-06 12:35:31 +01:00
Gustav Hansen
851425e82b
Merge pull request #14988 from strapi/dependabot/npm_and_yarn/react-router-dom-5.3.4 
chore(deps): bump react-router-dom from 5.2.0 to 5.3.4
 2022-12-06 12:31:38 +01:00
Julie Plantey
3835a29126 Merge branch 'main' of https://github.com/strapi/strapi into features/MediaLibrary-listview 2022-12-05 17:32:52 +01:00
Convly
5453885f7a v4.5.3 2022-11-30 16:27:25 +01:00
Simone
574985f9f0
Merge branch 'main' into enhancement/axios-refactoring 2022-11-30 14:57:09 +01:00
dependabot[bot]
e49ee71ce2
chore(deps): bump react-router-dom from 5.2.0 to 5.3.4 
Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 5.2.0 to 5.3.4.
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/v5.3.4/packages/react-router-dom)

---
updated-dependencies:
- dependency-name: react-router-dom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-30 10:45:09 +00:00
Simone Taeggi
3e7d720046 upgrade ds version and tests 2022-11-28 18:02:23 +01:00
ivanThePleasant
2f1a478206 Change location of async context, improve tests, remove webcrypto package, rename adminUserId to userId 2022-11-24 13:05:56 +02:00
ivanThePleasant
2af669c961 Merge branch 'main' into chore/user-level-data 2022-11-23 09:35:16 +02:00
Simone Taeggi
852c9b44d0 Merge branch 'enhancement/axios-refactoring' of github.com:strapi/strapi into enhancement/axios-refactoring 2022-11-22 19:57:28 +01:00
Simone Taeggi
39f1382f6d change comment content 2022-11-22 19:57:17 +01:00
Simone
a4233b4864
Merge branch 'main' into enhancement/axios-refactoring 2022-11-22 19:55:25 +01:00
Alexandre Bodin
bcb1b7f472 v4.5.2 2022-11-22 17:54:52 +01:00
Simone
bf5ba30d5b
Merge branch 'main' into enhancement/axios-refactoring 2022-11-22 16:48:04 +01:00
Simone Taeggi
0aa31064b2 refactoring the axios migration move the code in admin 2022-11-22 15:43:05 +01:00
Josh
e4dd1b262e chore: use stable 1.3.1 of DS 2022-11-22 15:30:02 +01:00
Josh
ff02218d28 chore: use alpha version of DS 2022-11-22 15:30:02 +01:00
Jamie Howard
69b4b637f1 chore(upload): feedback 
feat(helper-plugin): persist upload localstroage
 2022-11-22 13:58:28 +00:00
Simone
ef8983f905
Merge branch 'main' into enhancement/axios-refactoring 2022-11-21 10:09:23 +01:00
Gustav Hansen
2c23ca234b Chore: Update codecov uploader 2022-11-18 17:10:45 +01:00
Simone
0a1adb5c8d
Merge branch 'main' into enhancement/axios-refactoring 2022-11-18 16:05:25 +01:00
Josh
4ad46e481f Revert "chore: replace imports" 
This reverts commit 1c8b34c3fa7002c0e44d3c583c844367e006f631.
 2022-11-18 10:01:22 +00:00
Josh
1c8b34c3fa chore: replace imports 2022-11-18 08:56:10 +00:00
Simone Taeggi
7a06c7e444 move the condition to show the warning inside the warapAxiosInstance 2022-11-18 00:43:19 +01:00
Josh
37f523b78d chore: update snapshots 2022-11-17 17:25:14 +00:00
Josh
97614f90a5 chore: update deps 2022-11-17 17:25:03 +00:00
Simone Taeggi
f9578e5937 Merge branch 'main' into enhancement/axios-refactoring 2022-11-17 16:49:44 +01:00
Josh
6677b31cab
Merge branch 'main' into fix-edit-json-field 2022-11-17 10:24:18 +00:00
Simone
834b7c1917
Merge branch 'main' into enhancement/axios-refactoring 2022-11-16 18:18:55 +01:00
Convly
8c20ea2b5c v4.5.1 2022-11-16 18:00:30 +01:00
Simone
98e3ec7e8a
Merge branch 'main' into enhancement/axios-refactoring 2022-11-15 15:10:30 +01:00
Simone Taeggi
d8a449e2ed refactor the fetchClient to the getFetchClient utils 2022-11-15 12:48:32 +01:00
Gustav Hansen
5f24350a48
Merge branch 'main' into chore/update-testing-library-react 2022-11-15 11:54:47 +01:00
Gustav Hansen
db6f0cd2b7
Merge pull request #14866 from strapi/chore/update-ds 
chore: update design-system to 1.2.8
 2022-11-15 11:53:43 +01:00
Gustav Hansen
65597622c6 Chore: Update @testing-library/react to 12.1.4 2022-11-15 11:15:30 +01:00
Josh
f0e94fde66 chore: update design-system to 1.2.8 2022-11-15 09:01:04 +00:00
Gustav Hansen
ee75ce9e32 Chore: Update @testing-library/react-hooks to 8.0.1 2022-11-14 18:39:19 +01:00
Simone Taeggi
4da811c322 create a util to wrap the old axiosInstance implementations and log the warning 2022-11-14 16:36:30 +01:00
Simone
4a211a50d0
Merge branch 'main' into enhancement/axios-refactoring 2022-11-11 14:09:13 +01:00