yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-01 13:29:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,252 Commits 108 Branches 487 Tags
Commit Graph

181 Commits

Author SHA1 Message Date
soupette
9a052ee876 Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2022-04-13 17:15:16 +02:00
Alexandre Bodin
5cbb60ce4b Merge branch 'master' into releases/4.2.0 2022-03-24 11:11:00 +01:00
vincentbpro
377597f3ba fix: prop validation warning in dark mode tests 2022-03-16 15:26:14 +01:00
vincentbpro
e67067c584 merged duplicated tranlations using the interactive script 2022-03-15 10:25:43 +01:00
ronronscelestes
fb316d3824 Merge branch 'master' of https://github.com/strapi/strapi into features/dark-mode 2022-03-10 18:20:50 +01:00
ronronscelestes
524067fc44 Merge branch 'master' of https://github.com/strapi/strapi into features/dark-mode 2022-03-10 15:11:44 +01:00
HichamELBSI
e89098da42 Bump DS alpha.77 (no breaking changes) 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-03-10 15:06:30 +01:00
vincentbpro
042efd0543 test(dark-mode): added global mock for window.matchMedia 2022-02-25 10:22:53 +01:00
vincentbpro
b93ad2524e test(dark-mode): updated snapshots changed because of ThemeToggleProvider 2022-02-24 17:32:08 +01:00
vincentbpro
d4447cb481 test(dark-mode): updated tests using the theme provider 2022-02-24 16:57:36 +01:00
ronronscelestes
1878d44669 Merge branch 'master' of https://github.com/strapi/strapi into feature/usecase-ui 2022-02-17 17:24:46 +01:00
Gustav Hansen
75fdc2415c chore: Update snapshot tests 2022-02-15 16:40:15 +01:00
ronronscelestes
d03c7b9a2d feat(usecase): moved Logo to admin components + updated yarn lock 2022-02-11 18:13:34 +01:00
Gustav Hansen
73853a16da chore: Update snapshot tests 2022-02-10 18:04:42 +01:00
ronronscelestes
6016485f3c merge bis bis + fix merge conflicts 2022-01-28 15:32:19 +01:00
Convly
4fc8e83eb8 Fix redirect path for sso & fix customEERoute 2022-01-28 14:22:14 +01:00
ronronscelestes
bb222c995d
Required-field: Bump ds 74 (#12335) 2022-01-28 11:47:47 +01:00
vincentbpro
36bfa44b70 Merge branch 'master' of github.com:strapi/strapi into v4/product-copy-text-changes-v1 2021-12-01 18:15:44 +01:00
vincentbpro
55262183ed style: text change settings users 2021-11-30 13:41:38 +01:00
Alexandre Bodin
8b9d095388 Update snapshots 2021-11-30 12:00:44 +01:00
vincentbpro
b50d83729c style: text change go back 2021-11-30 10:57:56 +01:00
Marvin Frachet
62e35985ec
Bump parts alpha 70 (#11694) 
Co-authored-by: ronronscelestes <julie.plantey@gmail.com>
 2021-11-26 18:48:14 +01:00
Marvin Frachet
4cd5c4d982
Bump parts alpha 69 (#11684) 2021-11-25 17:23:37 +01:00
Convly
fdefb1382c Use a custom findOneByEmail to search for existing user 2021-11-23 12:16:54 +01:00
ronronscelestes
9e5732df08 updated tests 2021-11-19 11:00:20 +01:00
ronronscelestes
a1ca9a152a auth page 2nd part, roles settings fix, documentation plugin page 2021-11-19 10:52:22 +01:00
soupette
443c4d0785 Fix ctb navigation and upgrade DS version 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-18 16:21:49 +01:00
cyril lopez
4b2127797f
Merge pull request #11588 from strapi/typography-sso 
[DS] Typography in SSO
 2021-11-17 14:26:49 +01:00
ronronscelestes
fba8f405b1 feedback fix + replaced Layout component in the right order 2021-11-16 11:19:59 +01:00
ronronscelestes
8d63de8d42 added Settings title + fixed tests 2021-11-16 11:01:51 +01:00
soupette
faa557ecbf Remove buffetjs dependencies 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-16 08:10:36 +01:00
ronronscelestes
56feffb15b updated snapshots 2021-11-09 16:19:41 +01:00
soupette
b416194cc9 Remove old components from helper 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-09 13:40:23 +01:00
ronronscelestes
e0e415551b updated tests 2021-11-08 12:17:38 +01:00
Alexandre BODIN
5b04fa152d
Merge pull request #11307 from strapi/v4/error-handling 
refactor error handling
 2021-11-05 18:38:40 +01:00
ronronscelestes
7f16b2e465 merge conflict 2021-11-05 13:36:18 +01:00
Pierre Noël
c6a5a047d6 Merge branch 'releases/v4' into v4/error-handling 2021-11-05 10:40:11 +01:00
ronronscelestes
8b4a2e0853 replaced Search component in ee settings roles LV 2021-11-04 16:49:58 +01:00
Pierre Noël
cb098ec280 clean yup validations 2021-11-04 11:42:45 +01:00
Pierre Noël
b4c9ad0440 refacto graphql errors 2021-11-04 11:42:43 +01:00
Pierre Noël
b58274aecb refactor error handling 2021-11-04 11:41:29 +01:00
soupette
2220487a46 Fix RBAC in input file 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-02 16:08:47 +01:00
soupette
c3147e90c2 Disable conditions in EE 
Signed-off-by: soupette <cyril@strapi.io>
 2021-11-02 15:29:49 +01:00
soupette
d8f2c4ea71 Fix magiclink with sso 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-29 12:01:15 +02:00
soupette
c7dbfc6f88 Update all icons with the new set 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-27 12:30:54 +02:00
soupette
e137f46d85 Change parts import name 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-27 10:36:00 +02:00
Alexandre Bodin
a33d9e56be Move admin config to config/admin.js 2021-10-26 12:12:02 +02:00
soupette
ac17df62dd Update snapshots 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-22 08:40:05 +02:00
soupette
d6c36b8f2a Rename Row by Flex 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-22 08:37:30 +02:00
soupette
b26a4fe66b Add back button to roles pages 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-21 15:50:17 +02:00