yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 04:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,394 Commits 116 Branches 489 Tags
Commit Graph

18394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
b8d388b4a7 Prefix route in U&P with /api 2021-09-24 09:55:01 +02:00
Dieter Stinglhamber
bc9bc1c498 remove commented code 2021-09-24 09:44:53 +02:00
Dieter Stinglhamber
3c1dcbe76d refactor policy API 2021-09-24 09:35:25 +02:00
Alexandre BODIN
b97dff15ee
Merge pull request #11063 from strapi/v4/cleanup-cm 
Move CM files into the new structure
 2021-09-24 09:26:02 +02:00
Alexandre Bodin
7cf05bfb10 Move CM files into the new structure 2021-09-24 09:04:44 +02:00
soupette
ddffdf947d Add component picker 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-24 08:40:37 +02:00
soupette
fa479708d7 Init picker 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-24 07:46:45 +02:00
soupette
c8a9219a45 Add label to DZ 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-24 07:24:10 +02:00
soupette
8bd115d21e Created Button for DZ 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-24 06:54:26 +02:00
ronronscelestes
603ab8753c wip input uid 2021-09-23 23:13:44 +02:00
soupette
6841434077 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 19:48:16 +02:00
soupette
be4b4bcd79 Fix snapshot 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 19:25:05 +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
Alexandre BODIN
88bff3cb27
Merge pull request #11043 from strapi/v4/disable-template 
Disable templates for the moment
 2021-09-23 17:42:07 +02:00
Convly
4737eff9f9 Fix PR review comments 2021-09-23 17:25:25 +02:00
Alexandre BODIN
67af23d827
Merge pull request #11056 from strapi/v4/migrate-user-functions 
Migrate user functions folder
 2021-09-23 17:18:20 +02:00
Pierre Noël
03110962d6 disable template question 2021-09-23 16:53:32 +02:00
soupette
e36f45f5fc Fix badge 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 16:51:15 +02:00
Pierre Noël
2d307f4d65 remove functions folder in generator 2021-09-23 16:47:24 +02:00
cyril lopez
df102e8355
Merge pull request #11061 from strapi/v4/strapi-admin-js 
Use strapi-admin for front of plugins
 2021-09-23 16:41:44 +02:00
soupette
17e5e835b1 Fix dev mode 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 16:39:42 +02:00
Convly
fa7467dbf8 Remove typo 2021-09-23 16:35:59 +02:00
cyril lopez
5839e3a9d5
Merge pull request #11059 from strapi/cm/repeatable-components 
CM add repeatable components
 2021-09-23 16:35:26 +02:00
Pierre Noël
932536e534 pass strapi through params instead of creating a wrapping function 2021-09-23 15:55:02 +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
ronronscelestes
a1959ac741 fix merge 2021-09-23 14:11:35 +02:00
ronronscelestes
40b1169241 fixed grid and padding bottom layout 2021-09-23 14:07:48 +02:00
soupette
7b2ab717bf Add dnd preview 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 13:54:39 +02:00
ronronscelestes
41057fc8d5 profile page passwords fix + select size 2021-09-23 13:50:29 +02:00
soupette
02570c9060 Add repeatable components + dnd 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 13:24:28 +02:00
soupette
625a3e1284 Use ComponentInitializer for both compos 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 12:28:11 +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
42ef399868 Merge branch 'v4/ds-migration' of github.com:strapi/strapi into cm/repeatable-components 2021-09-23 11:41:24 +02:00
cyril lopez
cb05941671
Merge pull request #11057 from strapi/fix/build 
Fix build
 2021-09-23 11:41:11 +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
Pierre Noël
6adf460b63 cron registry becomes cron service 2021-09-23 10:40:17 +02:00
soupette
3fb4e7a9b5 Add EmptyComponent and button to repeatable compos 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 10:33:28 +02:00
Convly
033d3274d2 Merge branch 'releases/v4' into v4/graphql-schema-generation-refactor 2021-09-23 10:05:31 +02:00
Pierre Noël
199dd54e42 migrate user functions folder 2021-09-23 09:14:09 +02:00
ronronscelestes
42756ae054 feedback fix 2021-09-23 08:49:34 +02:00
soupette
ea24390355 Upgrade parts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 08:23:33 +02:00
soupette
3fb4297cae Upgrade parts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 08:19:53 +02:00
cyril lopez
ce708cfc9a
Merge pull request #11052 from strapi/cm-lv-fix 
Migration/ CM LV fix
 2021-09-23 07:44:41 +02:00
soupette
43ad5ca083 Fix pageSize compo 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 07:44:09 +02:00
cyril lopez
9ddeb1c37e
Merge pull request #11055 from strapi/cm/fix-rerenders 
Fix multiple rerenders
 2021-09-23 07:38:14 +02:00
soupette
522dce5b8a Add count remaining files 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 07:37:46 +02:00
soupette
1cf1a6655b Merge branch 'v4/ds-migration' of github.com:strapi/strapi into cm-lv-fix 2021-09-23 07:16:02 +02:00