yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-17 04:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,539 Commits 122 Branches 494 Tags
Commit Graph

30539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bassel Kanso
94488a07c3 update snapshot test 2022-09-01 15:17:19 +03:00
Mark Kaylor
f1f06142c0 Update README and fix peerDep 2022-09-01 14:16:37 +02:00
Bassel Kanso
a9f0987f73 update permissions after submit 2022-09-01 14:57:04 +03:00
Bassel Kanso
641122d3ff update tests 2022-09-01 14:17:58 +03:00
Bassel Kanso
94fb69e01e re intialize formik values when initial values change 2022-09-01 14:16:08 +03:00
Bassel Kanso
5c202135e3 Merge branch 'features/api-token-v2' into api-token-v2/refactor-frontend 2022-09-01 14:02:44 +03:00
Julie Plantey
a3a1bea099 RelationInput tests 2022-09-01 12:30:58 +02:00
Bassel Kanso
7f2f205fa3 remove default lifespan value 2022-09-01 12:24:26 +03:00
Convly
4a5562bf78 Merge branch 'features/api-token-v2' of github.com:strapi/strapi into features/api-token-v2 2022-09-01 11:23:47 +02:00
Convly
c3f18c7fdc Update frontend snapshots 2022-09-01 11:21:43 +02:00
Pierre Noël
29376f8113
Merge pull request #14014 from strapi/relations-main-view/find-new-relations 
refactor relation findNew route
 2022-09-01 11:11:06 +02:00
Mark Kaylor
90c66d805c Fix color and sizing issues 2022-09-01 11:10:40 +02:00
Simone
758ab18329
Merge pull request #14213 from strapi/api-token-v2/regenerate-an-api-token 
Regenerate an API token
 2022-09-01 11:07:04 +02:00
Convly
e826297051 Remove NOTE 2022-09-01 10:54:32 +02:00
Convly
7d5c1e9b21 Revert add comment 2022-09-01 10:50:44 +02:00
Bassel Kanso
1411367b5f Merge branch 'features/api-token-v2' into api-token-v2/refactor-frontend 2022-09-01 11:36:11 +03:00
Convly
ccf39e4f2f Merge branches 'fix/i18n-locale-queries-forbidden-access' and 'main' of github.com:strapi/strapi into fix/i18n-locale-queries-forbidden-access 2022-09-01 10:35:35 +02:00
Convly
18e07d8d0f Update comment 2022-09-01 10:30:26 +02:00
Convly
d71ffb2f5d Merge branch 'main' into fix/i18n-locale-queries-forbidden-access 2022-09-01 10:02:09 +02:00
Ben Irvin
7091e551c4
Merge pull request #14278 from strapi/api-token-v2/lifespan-no-update 
Prevent updating an API token's lifespan from the admin API
 2022-09-01 10:00:31 +02:00
Simone Taeggi
5985b3ca08 Merge branch 'features/api-token-v2' into api-token-v2/regenerate-an-api-token 2022-09-01 09:50:51 +02:00
Simone Taeggi
078c4fb96c merge main in features/api-token-v2 2022-09-01 09:50:19 +02:00
Simone Taeggi
df1db27b58 add some tests 2022-09-01 09:46:43 +02:00
Dieter Stinglhamber
c068ec5aef fix sqlite client 2022-09-01 09:17:23 +02:00
GitStart
d78c61e1ac
Merge branch 'main' into STRAP-54 2022-09-01 07:16:15 +01:00
Dieter Stinglhamber
28db135322 remove DATABASE_URL for SQLite 2022-09-01 07:53:05 +02:00