yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-19 14:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 119 Branches 489 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ivanThePleasant
00f5efec51 Refactor properties format to move all properties objects to the root level of the req body 2022-09-05 16:44:58 +03: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
Tim Izzo
6dbccb2d5a Add missing ';' 2022-09-05 14:59:31 +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
ivanThePleasant
b704a6b918 Merge branch 'main' into chore/user-level-data 2022-09-05 14:10:05 +03: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
Tim Izzo
f9a7ef6858 fix: 🐛 Use importDefault 2022-09-05 12:33:41 +02:00
Tim Izzo
78c3c909e5
Merge branch 'strapi:main' into main 2022-09-05 12:29:29 +02:00
ivanThePleasant
d568592d5c Refactor 'didUpdateRolePermissions' calls 2022-09-05 12:19:31 +03: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
Julie Plantey
0435769fec poc react window 2022-09-02 17:29:52 +02: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
ivanThePleasant
a2ee4bb855 Change location of user creation analytics call, remove development console log, adjust tests accordingly 2022-09-02 16:21:48 +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
ivanThePleasant
b5c98ae0cd Refactor event calls to follow old format, encapsulate hashing in the sender, refactor the format of event payload to better correspond to the new api 2022-09-02 14:43:51 +03: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
ivanThePleasant
cbfde4a11c Merge branch 'main' into chore/user-level-data 2022-09-02 12:22:12 +03: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
Bassel Kanso
30e3a2ac70 Merge branch 'features/api-token-v2' into api-token-v2/get-action-bound-routes 2022-09-02 11:17:39 +03:00
Bassel Kanso
c842085fe3 move routes map service to content API coontainer 2022-09-02 11:06:55 +03:00
Convly
94978036bc Merge branch 'main' into features/api-token-v2 2022-09-02 09:35:03 +02:00
Alexandre BODIN
2c43eb4e39
Merge pull request #14279 from strapi/update/DBVersions 
Update minimum and recommended database versions
 2022-09-02 09:10:02 +02:00
Rémi de Juvigny
acd1d0640f
Merge pull request #14212 from strapi/custom-fields/color-picker 
[Custom fields] Create custom fields plugin and first Strapi custom field: Color Picker
 2022-09-02 08:44:01 +02:00
GitStart
ca88a6802b
Merge branch 'main' into STRAP-54 2022-09-02 07:08:48 +01:00
Zharkan
2b8a9ba33a
fix some translations 2022-09-01 23:06:23 +02:00
WalkingPizza
1b6ccc76b6 Trim admin's first name when validating 2022-09-01 22:45:23 +02:00
DMehaffy
30651203b2
Merge branch 'main' into update/DBVersions 2022-09-01 09:16:16 -07:00
Mark Kaylor
2bf73e4fdc Merge branch 'features/custom-fields' of github.com:strapi/strapi into custom-fields/color-picker 2022-09-01 18:01:46 +02:00
Alexandre Bodin
beb512149b Only deploy gh pages on docs changes 2022-09-01 14:30:10 +02:00
Jean-Sébastien Herbaux
360836c5b6
Merge pull request #14282 from strapi/fix/i18n-locale-queries-forbidden-access 
Fix/i18n locale queries forbidden access
 2022-09-01 14:19:29 +02:00
Mark Kaylor
53d915db4e Translate aria-labels 2022-09-01 14:18:14 +02:00
Bassel Kanso
6fdd0444fa
Merge pull request #14259 from strapi/api-token-v2/refactor-frontend 
Api token v2 refactor frontend
 2022-09-01 15:17:58 +03:00
Mark Kaylor
c17cf6e04e Increase padding to avoid cursor cut off 2022-09-01 14:17:52 +02:00
Mark Kaylor
0a10b9e4a0 Fix CTB icon colors between themes 2022-09-01 14:17:26 +02:00