yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 09:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,075 Commits 115 Branches 488 Tags
Commit Graph

6261 Commits

Author SHA1 Message Date
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
Alexandre Bodin
9788034ab4 Update content-type generator cli 2021-10-22 14:28:44 +02:00
Marvin Frachet
a6418ff465
Fix search, drag state (#11322) 2021-10-22 14:19:48 +02:00
ronronscelestes
ba458fc50d fixed margin left 2021-10-22 14:04:41 +02:00
Pierre Noël
2d565b2dc0
typo 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2021-10-22 14:01:42 +02:00
ronronscelestes
75a974a790 attempt to fix notification 2021-10-22 13:55:52 +02:00
Alexandre BODIN
ec8a2e0ca8
Merge pull request #11311 from strapi/v4APIPrefixLoc 
[v4] Adjust api prefix location
 2021-10-22 13:39:13 +02:00
Pierre Noël
6fd9f780c7 Merge branch 'v4/ctb' into v4/plural-name-in-CTB 2021-10-22 12:33:48 +02:00
Alexandre Bodin
577e5d8997 Fix push middleware order 2021-10-22 12:01:00 +02:00
ronronscelestes
ed58ca2f7f Merge branch 'ctb-singular-plural' of https://github.com/strapi/strapi into ctb/simplify-code 2021-10-22 11:23:29 +02:00
ronronscelestes
e2f40ddcad removed unnecessary log 2021-10-22 11:22:36 +02:00
ronronscelestes
d52279ac75 removed snapshot 2021-10-22 11:13:21 +02:00
ronronscelestes
01d197ebd4 cleaning + edit dz attribute 2021-10-22 11:09:25 +02:00
ronronscelestes
001abcb571 add component to dz done 2021-10-22 10:41:24 +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
ronronscelestes
e928ffe6ad dz attribute done 2021-10-22 08:10:27 +02:00
soupette
5ac69ecbe5 Upgrade parts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-22 08:04:21 +02:00
ronronscelestes
7e652c3e15 init dz attribute 2021-10-22 07:37:03 +02:00
ronronscelestes
702e0c870e finished component attribute second step 2021-10-22 07:23:57 +02:00
ronronscelestes
fb46aed098 init component attribute second step 2021-10-21 19:52:50 +02:00
ronronscelestes
a891d1f70f init component attribute first step 2021-10-21 19:48:10 +02:00
ronronscelestes
0368e09f42 create - edit a component 2021-10-21 18:56:15 +02:00
ronronscelestes
273e45e0f8 edit content type 2021-10-21 18:39:17 +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
soupette
f5228a0da3 Init EndActions 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-21 17:11:42 +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
cyril lopez
cae639a20f
Merge pull request #11314 from strapi/ctb/create-cat 
[V4] CTB: Add combobox in CTB to create component category
 2021-10-21 16:02:18 +02:00
cyril lopez
fe2bf3d06d
Merge pull request #11321 from strapi/cm/list-view-fix-sort-relations 
[V4] CM: Fix sort on relation
 2021-10-21 16:01:20 +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
6d8b85ecaf Merge branch 'releases/v4' of github.com:strapi/strapi into webhooks/add-combobox 2021-10-21 15:41:30 +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
Dieter Sting
ba9fb1379b
Merge pull request #11320 from strapi/v4/remove-count-route-from-ml 
remove count route from the upload plugin
 2021-10-21 14:47:15 +02:00
Alexandre Bodin
09b83c55f8 update snapshot 2021-10-21 14:46:28 +02:00
Alexandre BODIN
64c9c5c57c
Merge pull request #11316 from strapi/v4/fix-publication-state-populate 
[V4] Fix a bug preventing the filters to be passed in the populate params
 2021-10-21 14:43:23 +02:00
Dieter Stinglhamber
7e89f091da remove count route from the upload plugin 2021-10-21 14:33:22 +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
soupette
4ddff7d3ff Remove uid statement 
Signed-off-by: soupette <cyril@strapi.io>
 2021-10-21 14:01:35 +02:00