yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-29 08:04:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,926 Commits 138 Branches 514 Tags
Commit Graph

17926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
94d6abafaa Use strapi-admin as reference to load frontend of the plugins 2021-09-23 14:33:19 +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
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
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
soupette
b009fd59bc Fix multiple rerenders 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 06:18:14 +02:00
soupette
c475c96722 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-23 05:54:12 +02:00
cyril lopez
faf776b017
Merge pull request #11046 from strapi/ds-migration/roles-edit-policies 
[v4] Migrate BoundRoutes component to Parts in users-permissions
 2021-09-23 05:35:41 +02:00
Alexandre BODIN
24c8baf4f9
Merge pull request #11053 from strapi/v4/fix-distinct 
Fix distinct
 2021-09-22 20:30:29 +02:00
Alexandre Bodin
704ff5a612 Fix components ordering 2021-09-22 20:10:48 +02:00
Rémi de Juvigny
e0048be1fa Delete unused translated keys 2021-09-22 19:08:24 +02:00
Rémi de Juvigny
c44eb8c9e6 Delete more unused components 2021-09-22 18:59:53 +02:00
Alexandre Bodin
549773698a Fix distinct 2021-09-22 18:49:04 +02:00
Rémi de Juvigny
94a21d6ac6 Remove policies from tests 2021-09-22 18:45:39 +02:00
Rémi de Juvigny
6245b7d4bb Delete unused files 2021-09-22 18:41:44 +02:00
Rémi de Juvigny
4880b64744 Merge remote-tracking branch 'origin/v4/ds-migration' into ds-migration/roles-edit-policies 2021-09-22 18:13:02 +02:00
Rémi de Juvigny
a62b117edb Update tests 2021-09-22 18:10:27 +02:00
Alexandre BODIN
b23f090709
Merge pull request #11050 from strapi/v4/db-column-naming 
Column naming convention
 2021-09-22 18:00:48 +02:00
ronronscelestes
ef98a2391b remove label select + tooltip on file badge 2021-09-22 17:35:48 +02:00
Alexandre Bodin
7855b7acbb Fix merge error 2021-09-22 17:20:31 +02:00
Alexandre Bodin
c5f9d16105 Rename creator fields 2021-09-22 17:06:16 +02:00
Alexandre Bodin
65eba8f63b Rename timestamps in front 2021-09-22 17:06:16 +02:00
Alexandre Bodin
fe85273301 Move published_at to publishedAt in frontend 2021-09-22 17:06:15 +02:00
Alexandre Bodin
58e024d3ad use columnName snake casing and rename timestamp attributes 2021-09-22 17:05:30 +02:00
Rémi de Juvigny
45251bf395 Remove unused policy selector 2021-09-22 16:56:31 +02:00
cyril lopez
5ec7a14250
Merge pull request #11049 from strapi/ml-iteration-2 
Pending state, error state, uploads
 2021-09-22 16:51:30 +02:00
cyril lopez
fa07ff3895
Merge pull request #11048 from strapi/cm/components 
Cm/components
 2021-09-22 16:46:45 +02:00
mfrachet
9e9c35a657 fix tests 2021-09-22 16:43:17 +02:00
cyril lopez
3743dd6584
Merge pull request #11040 from strapi/qa-board-smo 
QA Board - fixes
 2021-09-22 16:34:25 +02:00
soupette
73287b519f Update snapshots 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-22 16:34:03 +02:00
soupette
db86bc3f2e Merge branch 'v4/ds-migration' of github.com:strapi/strapi into qa-board-smo 2021-09-22 16:32:21 +02:00
mfrachet
b519373202 fix tests 2021-09-22 16:30:37 +02:00
mfrachet
955a98eeb0 Cancelling assets 2021-09-22 16:30:37 +02:00
mfrachet
d7a2affe48 Cancelling assets 2021-09-22 16:30:37 +02:00
mfrachet
2213d36f9c ml iterations 2021-09-22 16:30:36 +02:00
soupette
77a335c65b Merge branch 'v4/ds-migration' of github.com:strapi/strapi into cm/components 2021-09-22 16:21:32 +02:00
cyril lopez
9099409692
Merge pull request #11047 from strapi/bump-parts-alpha-37 
Bump parts alpha 37
 2021-09-22 16:21:14 +02:00
soupette
7dd1515c6d Add repeatable components 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-22 16:16:24 +02:00
soupette
fc0e27eb7e Add component initializer 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-22 15:35:22 +02:00
bulby97
d474a05c94 Fix issue in CM 2021-09-22 15:28:40 +02:00
bulby97
8faab4c825 RBAC roles - horizontal fix 2021-09-22 15:28:40 +02:00
bulby97
3633f5be40 Add click on row in tables 2021-09-22 15:28:40 +02:00
bulby97
cfb9a293c0 Table headers neutral600 colors 2021-09-22 15:28:39 +02:00