yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-01 05:17:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,134 Commits 106 Branches 487 Tags
Commit Graph

24134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GitStart
d3c8267cf2
Merge branch 'main' into STRAP-54 2022-09-06 12:30:37 +01:00
Kevin Antonio Rateni Iatauro
0dc64e1c09
Merge branch 'main' into fix/13648 2022-09-06 13:26:12 +02:00
Adedoyin Akande
e803830a88
update Antigua 2022-09-06 10:51:18 +01:00
Adedoyin Akande
73b97a1d26
update Antigua 2022-09-06 10:50:31 +01:00
Adedoyin Akande
cffa83acf6
Merge branch 'main' into add-locales 2022-09-06 10:49:25 +01:00
Zharkan
6fb223b1e6
fix typo 2022-09-06 11:36:34 +02:00
Simone Taeggi
9ddd46a776 add the regenerate permission to the api token 2022-09-06 11:02:44 +02:00
gitstart
9175297519 ID in schema have type string 2022-09-06 05:35:56 +00:00
Alexandre Bodin
70b6966458 Fix eslint database 2022-09-05 19:44:58 +02:00
Alexandre Bodin
22589cf0e1 Fix eslint core strapi 2022-09-05 17:53:28 +02:00
Simone Taeggi
0ea9929138 change error message if the name is already taken 2022-09-05 17:52:01 +02:00
Simone Taeggi
c3f7733c19 add validation to the lifespan token if its value is undefined 2022-09-05 17:26:44 +02:00
Simone Taeggi
d64ee4e52f Merge branch 'features/api-token-v2' into api-token-v2/sync-token-type-and-permissions 2022-09-05 17:02:39 +02:00
Simone Taeggi
8c1e0ea2fe Merge branch 'main' into features/api-token-v2 2022-09-05 17:01:58 +02:00
Pierre Noël
b68aa8fcc6 fix conflict 2022-09-05 16:31:05 +02:00
Pierre Noël
e06062ce6e
Merge pull request #14296 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1208.0 
Bump aws-sdk from 2.1188.0 to 2.1208.0
 2022-09-05 16:25:47 +02:00
Alexandre Bodin
7b9866a770 Fix eslint utils 2022-09-05 16:23:18 +02:00
Alexandre Bodin
eab835e301 Fix eslint content-manager 2022-09-05 16:20:47 +02:00
Alexandre Bodin
e3d92185f1 Fix eslint content-type-builder 2022-09-05 16:20:10 +02:00
Simone Taeggi
2f3555fe1d change the logic for the sync between permissions and api token Type 2022-09-05 16:19:50 +02:00
Pierre Noël
23657b7b5a factorize code 2022-09-05 16:18:37 +02:00
Pierre Noël
aa53790bd5 refactor with groupby 2022-09-05 16:18:37 +02:00
Pierre Noël
a658c6cc0a handle component use case 2022-09-05 16:18:36 +02:00
Pierre Noël
8100cffb3d use a grouped approach for where 2022-09-05 16:18:36 +02:00
Pierre Noël
f681c064c4 Fix relation not correctly set when uploadinga new file to an entity 2022-09-05 16:18:35 +02:00
Alexandre Bodin
4e989321e3 Fix eslint core/admin 2022-09-05 16:15:21 +02:00
Pierre Noël
578d8b4682
Merge branch 'main' into dependabot/npm_and_yarn/aws-sdk-2.1208.0 2022-09-05 15:20:42 +02:00
Alexandre Bodin
04f218346d Fix esint in generators folder 2022-09-05 15:19:02 +02:00
Alexandre Bodin
e57f02d2d9 Fix eslint in plugins folder 2022-09-05 15:18:24 +02:00
Alexandre Bodin
c563955d46 Lighten no-param-reassign 2022-09-05 15:07:36 +02:00
Alexandre Bodin
bba4c4c85a Fix eslint in test utils 2022-09-05 15:05:26 +02:00
Alexandre Bodin
3909b91efa Fix eslint in scripts 2022-09-05 15:04:28 +02:00
Alexandre Bodin
19cc297f74 Update rules 2022-09-05 15:02:36 +02:00
Alexandre BODIN
e8cdc26240
Merge pull request #14275 from dmeijboom/hotfix/users-permissions-openapi-spec 
Fix several issues in the users-permissions OpenAPI specification
 2022-09-05 14:53:52 +02:00
Marc
d982d6470e
Merge pull request #14132 from strapi/fix/delete-components-when-deleting-entity 
Fix/delete components when deleting entity
 2022-09-05 12:33:52 +02:00
Julie Plantey
66e998cb31
Merge pull request #14264 from WalkingPizza/fix/14205 
Fix global.users translation for ES
 2022-09-05 10:41:31 +02:00
Adedoyin Akande
5374874a03
Merge branch 'main' into add-locales 2022-09-04 07:38:42 +01:00
Adedoyin Akande
93cddd8f9f update locales 
- with specific code language
- ensure to follow consistent name sorting
 2022-09-04 07:18:23 +01:00
Bassel Kanso
36d0c5c8ac
Merge pull request #14301 from strapi/api-token-v2/small-fixes 
small fixes and changes
 2022-09-02 17:35:52 +03:00
Bassel Kanso
6ce5bf6a89 small fixes and changes 2022-09-02 16:56:44 +03:00
WalkingPizza
12fffff5c8 Prevent InputJSON from crashing when field value is 0 2022-09-02 15:12:52 +02:00
WalkingPizza
617ae0f396 Remove console.log 2022-09-02 15:04:30 +02:00
WalkingPizza
55efd7b034 Update lang attribute on locale change 2022-09-02 14:46:31 +02:00
WalkingPizza
d63c47b6e6 Do not allow reserved names for singular/plural API names 2022-09-02 13:18:07 +02:00
Bassel Kanso
9857818fe0
Merge pull request #14297 from strapi/api-token-v2/show-action-routes 
Api token v2 show action routes
 2022-09-02 13:51:41 +03:00
Bassel Kanso
7ae458480f used terinary operator 2022-09-02 13:01:31 +03:00
Bassel Kanso
dae381cbc7 fix don't filter the plugin action 2022-09-02 12:46:55 +03:00
Bassel Kanso
e8bde13352 show routes for actions 2022-09-02 12:43:48 +03:00
dependabot[bot]
1ea94fdfc0
Bump aws-sdk from 2.1188.0 to 2.1208.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1188.0 to 2.1208.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1188.0...v2.1208.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-02 09:36:26 +00:00
Bassel Kanso
2ebf213a63
Merge pull request #14266 from strapi/api-token-v2/get-action-bound-routes 
Api token get content api routes
 2022-09-02 12:03:10 +03:00