1233 Commits

Author SHA1 Message Date
Convly
94978036bc Merge branch 'main' into features/api-token-v2 2022-09-02 09:35:03 +02:00
GitStart
ca88a6802b
Merge branch 'main' into STRAP-54 2022-09-02 07:08:48 +01: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
Mark Kaylor
53d915db4e Translate aria-labels 2022-09-01 14:18:14 +02: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
Mark Kaylor
f1f06142c0 Update README and fix peerDep 2022-09-01 14:16:37 +02:00
Mark Kaylor
90c66d805c Fix color and sizing issues 2022-09-01 11:10:40 +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
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
Simone Taeggi
078c4fb96c merge main in features/api-token-v2 2022-09-01 09:50:19 +02:00
GitStart
d78c61e1ac
Merge branch 'main' into STRAP-54 2022-09-01 07:16:15 +01:00
Mark Kaylor
a3b014e47e Fix spacing on popover 2022-08-31 15:34:37 +02:00
Mark Kaylor
b5bd86bab6 Use Flex component with props 2022-08-31 15:16:59 +02:00
Dillen Meijboom
0826dc87db
Fix several issues in the users-permissions OpenAPI specification 2022-08-31 13:58:44 +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
Mark Kaylor
4622409c11 Fix accessibility and add tests 2022-08-31 11:58:24 +02:00
Convly
b25318b945 Merge branch 'main' into features/api-token-v2 2022-08-31 10:37:47 +02:00
Gustav Hansen
45ff887a21 chore: Update backend snapshot tests 2022-08-30 15:44:12 +02:00
Gustav Hansen
378ab81aee
Merge pull request #14239 from strapi/fix/cm-localepicker
CM: Fix i18n LocalePicker component
2022-08-30 09:33:20 +02:00
Julie Plantey
9496693a31
Merge pull request #14195 from WalkingPizza/fix/settings-button-sizes
Make all settings header primary actions small
2022-08-29 16:51:46 +02:00
Gustav Hansen
c2419b5a0d chore: Update snapshot tests 2022-08-29 12:14:20 +02:00
Gustav Hansen
905300f6e1 CM: Fix i18n LocalePicker component 2022-08-29 10:35:45 +02:00
Kevin Antonio Rateni Iatauro
df30b7a6c1
Merge branch 'main' into fix/settings-button-sizes 2022-08-29 09:51:12 +02:00
WalkingPizza
a25d813b6c Update snapshots 2022-08-29 09:50:46 +02:00
Adedoyin Akande
fae51fab10
Merge branch 'main' into add-locales 2022-08-27 09:48:49 +01:00
Mark Kaylor
308f0375f0 Remove comment and respect naming convention 2022-08-25 12:05:10 +02:00
Mark Kaylor
76e01be4cd Add custom fields plugin and color-picker custom field 2022-08-25 12:01:13 +02:00
Simone Taeggi
7e99205b28 Merge branch 'main' into features/api-token-v2 2022-08-24 16:02:46 +02:00
Simone Taeggi
160352044a Merge branch 'main' into features/api-token-v2 2022-08-24 16:01:33 +02:00
Alexandre Bodin
4c6e67c493 v4.3.6 2022-08-24 15:53:23 +02:00
WalkingPizza
a3c0b3b10b Make all header primary actions small 2022-08-24 14:49:01 +02:00
Alexandre Bodin
a52b053551 v4.3.5 2022-08-24 14:10:18 +02:00
Simone Taeggi
527c304366 Merge branch 'main' into features/api-token-v2 2022-08-24 11:31:08 +02:00
Julie Plantey
c4e6d21e4f
Merge pull request #13994 from yangfei4913438/yangfei/lang-code
show language code
2022-08-24 10:36:48 +02:00
Simone Taeggi
9114494d80 Merge branch 'main' into features/api-token-v2 2022-08-24 10:26:14 +02:00
Gustav Hansen
cd1604968c
Merge pull request #14177 from strapi/fix/locale-select-test
chore: Fix and simplify LocaleSelect tests
2022-08-23 20:37:31 +02:00
Gustav Hansen
4eb360c720
Merge pull request #14172 from strapi/dependabot/npm_and_yarn/react-intl-5.25.1
Bump react-intl from 5.20.2 to 5.25.1
2022-08-23 17:09:08 +02:00
Gustav Hansen
c39dfda5e3 chore: Fix and simplify LocaleSelect tests 2022-08-23 16:50:48 +02:00
Convly
6abea9cd85 Expose "get actions as map" & update sync actions
Co-authored-by: Ben Irvin <innerdvations@users.noreply.github.com>
2022-08-23 16:02:45 +02:00
Gustav Hansen
365bcf3014 Documentation: Fix eslint errors 2022-08-23 15:58:05 +02:00
Gustav Hansen
18e60778cc Documentation: Fix eslint errors 2022-08-23 15:51:04 +02:00
markkaylor
f5a62af92b
Merge pull request #13458 from meganoob1337/strapi/fix/issue-13453-documentation-fix
fix #13453 Documentation Plugin doesn't generate Proper Type for the …
2022-08-23 14:57:15 +02:00
杨飞
096595a1ea fix lint 2022-08-23 17:53:15 +08:00
yangfei
2a87f47901 fix 2022-08-23 17:23:19 +08:00
杨飞
d6a341a4bb show language code 2022-08-23 17:23:19 +08:00