yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-21 06:22:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,188 Commits 123 Branches 496 Tags
Commit Graph

9448 Commits

Author SHA1 Message Date
Jamie Howard
b9ad623f06
Merge pull request #15878 from strapi/private-s3-bucket/url-signing-api-tests 2023-03-02 09:54:43 +00:00
Jamie Howard
8a26dea51e fix(upload): add expectations for content creation 2023-03-02 09:50:49 +00:00
dependabot[bot]
a2a40506b0
chore(deps): bump ci-info from 3.5.0 to 3.8.0 
Bumps [ci-info](https://github.com/watson/ci-info) from 3.5.0 to 3.8.0.
- [Release notes](https://github.com/watson/ci-info/releases)
- [Changelog](https://github.com/watson/ci-info/blob/master/CHANGELOG.md)
- [Commits](https://github.com/watson/ci-info/compare/v3.5.0...v3.8.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-02 09:27:31 +00:00
Alexandre Bodin
435362adab Merge branch 'releases/4.7.1-hotfix' 2023-03-02 10:25:29 +01:00
Alexandre Bodin
0307fb4bf7 v4.7.1 2023-03-02 10:24:10 +01:00
Marc
6662580bf0
Merge pull request #15950 from strapi/fix/improve-is-private-attribute-performance 2023-03-02 09:45:54 +01:00
Alexandre Bodin
e56b0061c7 Make checks stricter 2023-03-02 09:19:25 +01:00
Marc
8ac67d6b8b
Update packages/core/utils/lib/content-types.js 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2023-03-02 09:17:44 +01:00
Fernando Chavez
5896480c22 Add new page to helper-plugin's storybook about useCustomFields 2023-03-02 09:06:48 +01:00
Alexandre Bodin
24901be60b Fix license seat undefined block user creation 2023-03-01 20:13:22 +01:00
Simone Taeggi
7545ef3f5c Merge branch 'main' into data-transfer/limit-token-name-length 2023-03-01 16:48:44 +01:00
Jamie Howard
78a155b972
Merge pull request #15958 from strapi/fix/CM-component-categories 2023-03-01 15:45:23 +00:00
Jamie Howard
c4a973fea4 test(upload): support components, repeatable components and dynamiczones in API test 2023-03-01 15:07:18 +00:00
Jamie Howard
33f8f8e1c3 test(upload): api test for private media signing 2023-03-01 14:48:59 +00:00
Simone
46c1eef111
Merge branch 'main' into data-transfer/limit-token-name-length 2023-03-01 14:23:25 +01:00
Jamie Howard
2f6e237559
Merge pull request #15896 from strapi/private-s3-bucket/fix/api-tests 2023-03-01 12:13:35 +00:00
Jamie Howard
17210958d8
Merge pull request #15916 from manfwh/main 2023-03-01 12:13:15 +00:00
Jamie Howard
5925ace19a fix(content-manager): typo when returning a component category 2023-03-01 12:08:52 +00:00
Jamie Howard
f2346222fa chore(content-manager): fix typos 2023-03-01 11:31:52 +00:00
Marc-Roig
571ed83628 use optional chaining on isPrivateAttribute 2023-02-28 16:38:33 +01:00
Marc-Roig
312be981e0 change order of execution on mapEntity 2023-02-28 14:20:19 +01:00
Marc-Roig
8ebd933d51 Merge branch 'main' into feature/private-s3-bucket 2023-02-28 11:53:09 +01:00
Simone Taeggi
da8e3d91d5 Merge branch 'main' into data-transfer/limit-token-name-length 2023-02-28 10:01:19 +01:00
Marc-Roig
37e980fc7e send entity with updates in it in publish webhook 2023-02-28 09:19:26 +01:00
Convly
948dbb3121 v4.7.0 2023-02-27 20:33:14 +01:00
Jean-Sébastien Herbaux
8cdc2b4d64
Merge pull request #15607 from strapi/features/data-transfer 2023-02-27 19:39:03 +01:00
Convly
b502f188b5 Fix unit test 2023-02-27 19:30:26 +01:00
Jean-Sébastien Herbaux
03cb2b91ae
Merge pull request #15935 from strapi/data-transfer/disable-transfer-when-missing-salt 2023-02-27 19:14:14 +01:00
Convly
9afb0ad86d Check token salt on hash 2023-02-27 19:10:04 +01:00
Convly
ae23359954 Emit a warning when the feature is enabled but salt is not set 2023-02-27 18:55:16 +01:00
Simone Taeggi
d8b3e5559f fix missing translations, remove unused file 2023-02-27 18:41:50 +01:00
Ben Irvin
13099b4c55 Send error status when token salt not set 
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
 2023-02-27 17:56:23 +01:00
Fernando Chávez
e66228b24c
Merge pull request #15926 from strapi/fix/display-name-on-audit-logs 
[Audit Logs] Use username or email on audit logs page
 2023-02-27 16:27:36 +01:00
Simone Taeggi
301a6fd0f6 Merge branch 'features/data-transfer' into data-transfer/limit-token-name-length 2023-02-27 16:21:23 +01:00
Convly
928cfe9928 Merge branch 'releases/4.7.0' into features/data-transfer 2023-02-27 16:12:27 +01:00
Convly
e366e030c5 Fix conflict for en translation 2023-02-27 16:10:52 +01:00
Convly
98c0b9f500 Merge branch 'main' into releases/4.7.0 2023-02-27 16:09:41 +01:00
Fernando Chavez
793df833bb fix test failing 2023-02-27 15:08:14 +01:00
Alexandre BODIN
d6098036a3
Merge pull request #15929 from strapi/chore/ee-users-delete-reload 2023-02-27 14:52:08 +01:00
Gustav Hansen
1b9f26cecc Users: Refetch EE license-data after inviting or deleting 2023-02-27 13:57:12 +01:00
Josh
739fd86b98
Merge pull request #15794 from hide-me/main 2023-02-27 12:51:03 +00:00
Ben Irvin
731e2cf4c9 allow sending errors without uuid 2023-02-27 13:49:49 +01:00
Alexandre Bodin
461f2862dd Merge branch 'main' into releases/4.7.0 2023-02-27 13:46:19 +01:00
Gustav Hansen
017cf37198 Users: Refetch all users after one has been deleted 2023-02-27 13:40:25 +01:00
Gustav Hansen
3f2ca68e05
Merge pull request #15924 from strapi/chore/users-list-refetch 
Settings: Re-fetch users list every time
 2023-02-27 13:24:29 +01:00
Jamie Howard
7da22885ad chore(content-manager): PR feedback 2023-02-27 11:50:49 +00:00
Gustav Hansen
da4d4adc59 Users: Refactor list-page tests 2023-02-27 12:15:18 +01:00
Alexandre BODIN
c822928169
Merge pull request #15734 from strapi/chore/ee-seats 2023-02-27 11:58:04 +01:00
Fernando Chavez
9bb9a58a6a show displayname on audit logs modal 2023-02-27 10:45:53 +01:00
Fernando Chavez
0970aef429 Merge branch 'main' of github.com:strapi/strapi into fix/display-name-on-audit-logs 2023-02-27 10:35:05 +01:00