yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-20 19:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,134 Commits 141 Branches 514 Tags
Commit Graph

5511 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Bassel Kanso
94488a07c3 update snapshot test 2022-09-01 15:17:19 +03: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
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
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
Bassel Kanso
1411367b5f Merge branch 'features/api-token-v2' into api-token-v2/refactor-frontend 2022-09-01 11:36:11 +03: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
GitStart
d78c61e1ac
Merge branch 'main' into STRAP-54 2022-09-01 07:16:15 +01:00
DMehaffy
1df064c4f7
Merge branch 'main' into fix/14193 2022-08-31 10:13:54 -07:00
derrickmehaffy
78c45c95a8 Update db versions and mirror readme to strapi package 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2022-08-31 08:05:55 -07:00
Ben Irvin
55634bacbd lifespan update not allowed 2022-08-31 16:42:48 +02:00
Fabien del Carmen
29410dd8fb
Merge pull request #14190 from strapi/fix/project-analytics-metadata-structure 
Update metadata casing and structure
 2022-08-31 16:26:45 +02:00
Julie Plantey
b3ac09da14
Merge pull request #14246 from strapi/enh/ReactSelect-loading-state 
[Enh] ReactSelect loading state
 2022-08-31 15:16:38 +02:00
Gustav Hansen
b220ecb7fc
Merge pull request #14270 from strapi/dependabot/npm_and_yarn/codemirror-5.65.8 
Bump codemirror from 5.65.7 to 5.65.8
 2022-08-31 15:08:58 +02:00
Convly
7eded0ab7b Merge branch 'features/api-token-v2' into api-token-v2/cleanup-content-api-core-service 2022-08-31 14:54:16 +02:00
Gustav Hansen
7f0ddf0654
Merge pull request #14221 from strapi/chore/jest-29 
chore: Update jest packages to v29
 2022-08-31 14:40:00 +02:00
GitStart
f138bc381a
Merge branch 'main' into STRAP-54 2022-08-31 16:31:24 +05:45
gitstart
6b94965574 ID in schema have type string 2022-08-31 10:37:08 +00:00