yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,813 Commits 127 Branches 497 Tags
Commit Graph

1097 Commits

Author SHA1 Message Date
Dieter Stinglhamber
a4d7b56bf9 update tests 2021-10-25 09:15:04 +02:00
Dieter Stinglhamber
d9b81e7f70 fix tests 2021-10-25 09:15:04 +02:00
Dieter Stinglhamber
65684c189c fix tests 2021-10-25 09:15:03 +02:00
Dieter Stinglhamber
ed83cc353c implement the ListView for the API Tokens 2021-10-25 09:15:03 +02:00
soupette
aefbb30f65 Merge branch 'releases/v4' of github.com:strapi/strapi into v4/ctb 2021-10-22 15:46:56 +02:00
soupette
91024f76ef Upgrade DS 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-22 15:45:13 +02:00
ronronscelestes
3fe2bd57ec updated tests + removed old Wrapper component file 2021-10-22 15:05:39 +02:00
soupette
fa51d648f4 Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-22 14:56:37 +02:00
Vladimir Tasic
0642a5a28e Update tests 2021-10-22 14:49:10 +02:00
Vladimir Tasic
c367f3f34b Dont show native password reveal on Edge browser 2021-10-22 14:47:47 +02:00
soupette
58790b682b Change icon type for menu Api 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-22 14:42:34 +02:00
soupette
fc42675233 Remove icon from ctb 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-22 14:30:30 +02:00
ronronscelestes
ba458fc50d fixed margin left 2021-10-22 14:04:41 +02:00
ronronscelestes
75a974a790 attempt to fix notification 2021-10-22 13:55:52 +02:00
Pierre Noël
6fd9f780c7 Merge branch 'v4/ctb' into v4/plural-name-in-CTB 2021-10-22 12:33:48 +02:00
soupette
0ee415d873 Merge branch 'v4/ctb' of github.com:strapi/strapi into ctb-singular-plural 2021-10-22 08:56:46 +02:00
soupette
fa756de974 Fix snapshots 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-22 08:56:02 +02:00
soupette
b3245898b2 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-22 08:54:42 +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
5ac69ecbe5 Upgrade parts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-22 08:04:21 +02:00
soupette
04bba53e20 Fix background permissions plugins 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-21 17:31:46 +02:00
cyril lopez
8da2f8a394
Merge pull request #11323 from strapi/webhooks/add-combobox 
[v4] Webhooks: add combobox and fix issues
 2021-10-21 17:16:56 +02:00
cyril lopez
654313d1f2
Merge pull request #11324 from strapi/ui-back-button 
[v4] Add missing back button
 2021-10-21 17:15:41 +02:00
Alexandre BODIN
f678d0e614
Merge pull request #11318 from strapi/v4/password-update-verify 
Add current password requirement to edit own profile password
 2021-10-21 17:05:37 +02:00
soupette
65e7752f9b Merge branch 'v4/ctb' of github.com:strapi/strapi into ctb-singular-plural 2021-10-21 16:05:00 +02:00
soupette
558a2190fa Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-21 16:04:26 +02:00
soupette
e1678fa3cd Add back button to users 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-21 15:53:28 +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
soupette
2be8a52b24 Fix webhooks 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-21 15:39:05 +02:00
Alexandre BODIN
bd5a1106e9
Update packages/core/admin/server/controllers/authenticated-user.js 2021-10-21 15:31:05 +02:00
soupette
c3d4d49482 Add combobox to webhooks 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-21 15:17:35 +02:00
soupette
5440e0b034 Fix CM sort on relation 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-21 14:53:47 +02:00
Alexandre Bodin
09b83c55f8 update snapshot 2021-10-21 14:46:28 +02:00
cyril lopez
11daf977ae
Merge pull request #11177 from strapi/v4/media-library 
Media library for the v4
 2021-10-21 14:14:10 +02:00
Alexandre Bodin
15e18be98c Add current password requirement to edit own profile password 2021-10-21 13:20:57 +02:00
soupette
4360333552 Update translations 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-21 12:37:16 +02:00
soupette
c89c2a044c Merge branch 'v4/ctb' of github.com:strapi/strapi into ctb-singular-plural 2021-10-21 12:29:18 +02:00
soupette
672ade8a3b Merge branch 'releases/v4' of github.com:strapi/strapi into v4/ctb 2021-10-21 12:28:04 +02:00
soupette
972f4fbb41 Use display name in CM 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-21 12:23:46 +02:00
cyril lopez
139cd0efdf
Merge pull request #11292 from strapi/cm-configure-view-lv 
Cm configure view lv
 2021-10-21 09:58:53 +02:00
mfrachet
07045008a4 Fix some A11y problems 2021-10-21 09:49:32 +02:00
Alexandre Bodin
3d04f9bfb2 Update the snapshots 2021-10-20 18:15:53 +02:00
Alexandre Bodin
37074ef490 Merge branch 'releases/v4' into v4/migrate-plugin-documentation 2021-10-20 09:53:12 +02:00
soupette
dc3de8fac7 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-20 09:32:54 +02:00
Alexandre Bodin
b4a32bc84e Fix error registring admin EE routes when feature is disabled 2021-10-19 15:58:15 +02:00
Alexandre Bodin
e9cd6f410d Merge branch 'releases/v4' into v4/migrate-plugin-documentation 2021-10-19 11:53:52 +02:00
Marvin Frachet
cef9eba80f
Bump parts to alpha 47 (#11297) 2021-10-19 11:26:13 +02:00
ronronscelestes
5cce0eb854 Merge branch 'cm-configure-view-lv' of https://github.com/strapi/strapi into cm-settings/drag-and-drop 2021-10-18 16:54:24 +02:00
ronronscelestes
bf68c91b95 Merge branch 'cm-configure-view-lv' of https://github.com/strapi/strapi into cm-configure-view-lv 2021-10-18 16:52:25 +02:00