yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 00:09:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,134 Commits 112 Branches 488 Tags
Commit Graph

1233 Commits

Author SHA1 Message Date
cyril lopez
2029786031
Merge pull request #11097 from strapi/cm/add-border-to-nested-components 
Add border to nested compos
 2021-09-28 10:05:55 +02:00
soupette
4e199406b0 Add border to nested compos 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-28 08:04:11 +02:00
soupette
d71ee4a36e Display selected locale 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-28 06:29:45 +02:00
soupette
c0a06d5e40 Enable doc plugin 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-28 05:30:21 +02:00
ELABBASSI Hicham
b16d07f3da
Merge pull request #11079 from strapi/i18n-combobox 
MigrationQA/ Combobox in i18n
 2021-09-27 18:26:44 +02:00
Convly
20b20a0f92 Fix e2e test for UP, i18n & upload + various i18n fixes 2021-09-27 17:17:24 +02:00
Marvin Frachet
b5773fe71f
Update packages/plugins/i18n/admin/src/components/LocalePicker/index.js 2021-09-27 16:31:30 +02:00
mfrachet
f0ebcbf532 Select for locale picker 2021-09-27 16:05:23 +02:00
ronronscelestes
3145518c8e integrated combobox 2021-09-27 15:34:11 +02:00
cyril lopez
4aea5de416
Split parts imports (#11074) 2021-09-27 14:01:25 +02:00
Convly
3da1acebf4 Fix createLocalization mutations 2021-09-27 10:56:43 +02:00
Convly
ef3650f073 Merge branch 'releases/v4' into v4/graphql-schema-generation-refactor 2021-09-27 10:33:31 +02:00
Alexandre Bodin
086a80eb28 Remove unused dependencies 2021-09-27 09:30:32 +02:00
Alexandre Bodin
d2e523d942 Upgrade @strapi/strapi dependencies 2021-09-27 08:30:11 +02:00
cyril lopez
2db89ff1c8
Merge pull request #11065 from strapi/axios-instance-fix 
AxiosInstance Fix
 2021-09-27 08:16:35 +02:00
soupette
1a58633c53 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-27 07:52:19 +02:00
Convly
33a822a347 Fix ignored pagination for associations (gql) 2021-09-24 16:31:57 +02:00
Alexandre BODIN
4fadcdee91
Merge pull request #11029 from strapi/features/api-token 
API Token backend implementation
 2021-09-24 14:21:10 +02:00
ronronscelestes
cc8aac71cc fixed 401 error with axiosInstance 2021-09-24 12:32:51 +02:00
Alexandre Bodin
9774e14890 Fixing invalid action name on restart because of lowercasing 2021-09-24 12:23:02 +02:00
Dieter Stinglhamber
b9b98c620c improve scope matching and verification failures 2021-09-24 12:07:00 +02:00
Dieter Stinglhamber
6c6328bc0d remove console.log statement 2021-09-24 12:07:00 +02:00
Dieter Stinglhamber
1a72747672 add api-token auth strategy to the content-api 2021-09-24 12:06:56 +02:00
Alexandre Bodin
b8d388b4a7 Prefix route in U&P with /api 2021-09-24 09:55:01 +02:00
Alexandre Bodin
7cf05bfb10 Move CM files into the new structure 2021-09-24 09:04:44 +02:00
soupette
c8a9219a45 Add label to DZ 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-24 07:24:10 +02:00
Convly
892c0dc300 Fix broken lint 2021-09-23 18:13:06 +02:00
Convly
74aee6f2d2 Remove old tests (will add more later) 2021-09-23 18:06:43 +02:00
Convly
4737eff9f9 Fix PR review comments 2021-09-23 17:25:25 +02:00
Convly
fa7467dbf8 Remove typo 2021-09-23 16:35:59 +02:00
Alexandre Bodin
94d6abafaa Use strapi-admin as reference to load frontend of the plugins 2021-09-23 14:33:19 +02:00
Convly
9718ce1c52 Fix lint issues 2021-09-23 14:26:31 +02:00
Alexandre Bodin
021ed62d07 Merge branch 'v4/ds-migration' of github.com:strapi/strapi into v4/strapi-admin-js 2021-09-23 12:09:39 +02:00
soupette
4544764186 Fix build 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 11:39:24 +02:00
Alexandre Bodin
f2f485ff17 Add strapi-admin.js 2021-09-23 11:24:15 +02:00
Convly
033d3274d2 Merge branch 'releases/v4' into v4/graphql-schema-generation-refactor 2021-09-23 10:05:31 +02:00
soupette
3fb4297cae Upgrade parts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 08:19:53 +02:00
soupette
c475c96722 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 05:54:12 +02:00
Rémi de Juvigny
e0048be1fa Delete unused translated keys 2021-09-22 19:08:24 +02:00
Rémi de Juvigny
c44eb8c9e6 Delete more unused components 2021-09-22 18:59:53 +02:00
Rémi de Juvigny
94a21d6ac6 Remove policies from tests 2021-09-22 18:45:39 +02:00
Rémi de Juvigny
6245b7d4bb Delete unused files 2021-09-22 18:41:44 +02:00
Convly
a303b0e5c4 Don't run shadowCRUD related operations if it's disabled 2021-09-22 18:17:51 +02:00
Rémi de Juvigny
4880b64744 Merge remote-tracking branch 'origin/v4/ds-migration' into ds-migration/roles-edit-policies 2021-09-22 18:13:02 +02:00
Rémi de Juvigny
a62b117edb Update tests 2021-09-22 18:10:27 +02:00
Alexandre Bodin
c5f9d16105 Rename creator fields 2021-09-22 17:06:16 +02:00
Alexandre Bodin
65eba8f63b Rename timestamps in front 2021-09-22 17:06:16 +02:00
Alexandre Bodin
fe85273301 Move published_at to publishedAt in frontend 2021-09-22 17:06:15 +02:00
Alexandre Bodin
58e024d3ad use columnName snake casing and rename timestamp attributes 2021-09-22 17:05:30 +02:00
Rémi de Juvigny
45251bf395 Remove unused policy selector 2021-09-22 16:56:31 +02:00