yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 08:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,789 Commits 129 Branches 498 Tags
Commit Graph

27789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simone Taeggi
3fdd100107 move the logic from admin to helper-plugin 2023-01-10 17:59:58 +01:00
Jean-Sébastien Herbaux
4291b033a2
Merge branch 'main' into fix/service-typings 2023-01-10 17:04:19 +01:00
Jean-Sébastien Herbaux
e3995c594c
Merge branch 'main' into fix/factories-types 2023-01-10 17:00:43 +01:00
Convly
0c00c19332 Prevent license ping for api tests 2023-01-10 16:38:36 +01:00
Ben Irvin
c0bd11c47b
Merge pull request #15374 from denisukvadim/bagfix/15308 
fix https://github.com/strapi/strapi/issues/15308
 2023-01-10 16:07:19 +01:00
derrickmehaffy
c770a253ba Fix CVE-2022-23539 / CVE-2022-23541 / CVE-2022-23540 / CVE-2022-23529 2023-01-10 07:50:43 -07:00
Marc-Roig
bf3c7e6a9d remove relations performance config 2023-01-10 15:18:34 +01:00
Marc-Roig
8fb75a8ce9 rename relations populate config 2023-01-10 15:15:11 +01:00
Marc-Roig
64bf4b8f1d return entities without loaded relations 2023-01-10 15:15:01 +01:00
Josh
99f1b3a8b6 Merge branch 'main' into feature/relations-reordering 2023-01-10 14:03:27 +00:00
Josh
8d6a247b14 fix: tidy-up name solving function and handle refetching and removing 2023-01-10 13:58:55 +00:00
Jamie Howard
168fe777d5 fix(content-manager): initial data indexing 2023-01-10 12:56:32 +00:00
Marc-Roig
610ce2aadf simplify marking relation as computed 2023-01-10 11:20:16 +01:00
Ben Irvin
17a547e78f
Merge branch 'main' into bagfix/15308 2023-01-10 11:07:30 +01:00
Marc-Roig
5a185f1e00 delete duplicate relation in connect array 2023-01-10 10:58:56 +01:00
Jean-Sébastien Herbaux
921d30961d
Merge pull request #15385 from strapi/fix/email-templates-interpolation 2023-01-10 10:45:33 +01:00
Marc-Roig
b81cfb0055 do not allow to connect same relation more than once 2023-01-10 10:45:31 +01:00
Julie Plantey
479bdde67e
Merge pull request #15032 from lkho/pr/admin-content-type-builder-nav-sort 
[admin] fix left menu sorting behaviour
 2023-01-10 10:36:50 +01:00
Convly
56aa69f472 Use lodash fp instead of lodash 2023-01-10 10:34:49 +01:00
Christian
37d2a1dfcb
Merge branch 'main' into fix/unvalidated-cognito-access 2023-01-10 09:52:54 +01:00
Simone Taeggi
0c516ffb51 Merge branch 'enhancement/axios-migration-step-2' into enhancement/axios-migration-users-permissions 2023-01-10 09:45:43 +01:00
Fernando Chávez
ebd758cd3a
Merge pull request #15368 from strapi/audit-logs/pagination 
[Audit Logs] Add pagination to Audit logs page
 2023-01-10 09:43:01 +01:00
Fernando Chavez
65e29e5f61 Merge fix 2023-01-10 09:42:33 +01:00
Convly
6f07d33f88 Disable lodash template's escape 2023-01-09 18:28:30 +01:00
Christian Capeans
14cf30e400 Rename number of content types 2023-01-09 18:15:38 +01:00
Christian
e2d6cc685f
Merge pull request #15295 from strapi/chore/document-fetch-client 
Document the useFetchClient hook
 2023-01-09 17:27:29 +01:00
Rémi de Juvigny
38ccee0ce9
Merge pull request #15370 from strapi/audit-logs/api-modal 
[Audit logs] Use real data in audit log modal
 2023-01-09 17:08:04 +01:00
Convly
7c391c2c19 Merge branch 'main' of github.com:strapi/strapi into fix/email-templates-interpolation 2023-01-09 16:53:21 +01:00
Jean-Sébastien Herbaux
544fb057c2
Merge pull request #15383 from strapi/deits/provider-naming-improvement 2023-01-09 16:39:16 +01:00
Jamie Howard
143ddc8466 chore(content-manager) 2023-01-09 15:03:02 +00:00
Jamie Howard
71ce491e2a fix(content-manager): compute path to initialData in RelationInputDataManager 2023-01-09 15:00:00 +00:00
Convly
9c1581c94f Fix remote push controller typings 2023-01-09 15:58:41 +01:00
Julie Plantey
835b47f433 fix sort CM LeftMenu 2023-01-09 15:58:27 +01:00
Simone Taeggi
9352a38fdc replace the getFetchClient with the useFetchClient inside the useFetchRole 2023-01-09 15:51:40 +01:00
Simone Taeggi
c38758401c fix the renaming of the get method 2023-01-09 15:47:03 +01:00
Simone Taeggi
e3ba4e70d7 Merge branch 'enhancement/axios-migration-step-2' into enhancement/axios-migration-users-permissions 2023-01-09 15:34:04 +01:00
Convly
5172f7bc8f Rename providers' create read/write stream methods 2023-01-09 15:27:48 +01:00
Gustav Hansen
af53985b56
Merge pull request #15344 from strapi/dependabot/npm_and_yarn/json5-1.0.2 
chore(deps): bump json5 from 1.0.1 to 1.0.2
 2023-01-09 14:59:53 +01:00
Josh
c2f8a6369c
Merge pull request #15381 from strapi/feat/admin-modals-closing 2023-01-09 13:58:07 +00:00
Rémi de Juvigny
9b5dd1b562 Fix modal labelledBy 2023-01-09 14:37:50 +01:00
Christian Capeans
46f8f98378 Verify cognito token with AWS 2023-01-09 14:20:02 +01:00
Josh
107e0d59b9 feat: add in prompt to CTB modals to avoid premature closing and data loss 2023-01-09 12:13:16 +00:00
dependabot[bot]
197091f1eb chore(deps): bump json5 from 1.0.1 to 1.0.2 
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-09 12:41:44 +01:00
Pierre Noël
5c140061f6
Merge pull request #15341 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1287.0 
chore(deps): bump aws-sdk from 2.1260.0 to 2.1287.0
 2023-01-09 12:27:49 +01:00
Rémi de Juvigny
26f750d8a6 feedback 2023-01-09 12:06:36 +01:00
Simone Taeggi
e862353def remove the axiosInstance implementation from the users-permissions plugin 2023-01-09 11:48:46 +01:00
Simone Taeggi
d9d108fed4 replace axiosInstance in the edit Roles function to replace the api call with the useFetchClient put method 2023-01-09 11:46:19 +01:00
Simone Taeggi
65bbac9aed replace axiosInstance in the create Roles function to replace the api call with the useFetchClient post method 2023-01-09 11:37:42 +01:00
Fernando Chavez
4a2cc232fe Fix tests 2023-01-09 11:31:28 +01:00
Fernando Chavez
b9a503c053 pageSize defaults to 50 on audit logs page 2023-01-09 11:25:18 +01:00