yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 02:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,740 Commits 121 Branches 507 Tags
Commit Graph

17740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mfrachet
18e7477efd Fix snapshot 2021-09-20 09:39:28 +02:00
mfrachet
331e952721 Update tests 2021-09-20 08:40:54 +02:00
mfrachet
3623fa3186 Make add URL work with pending step 2021-09-20 08:40:54 +02:00
cyril lopez
66e7e857c0
Merge pull request #11002 from strapi/advanced-settings-trad 
Migration/ Advanced Settings trad
 2021-09-20 07:59:08 +02:00
ronronscelestes
0b9cb955fa fixed getTrad 2021-09-17 17:16:31 +02:00
Marvin Frachet
19c2d20388
Bump parts to alpha 32 (#10995) 2021-09-16 16:09:51 +02:00
soupette
b213928796 Revert 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-16 14:03:09 +02:00
cyril lopez
df59a89a5b
Merge pull request #10978 from strapi/advanced-settings 
Migration/Advanced settings
 2021-09-16 13:27:28 +02:00
soupette
d48dd8575d Fix webpack dev config startup 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-16 13:04:05 +02:00
cyril lopez
942cdf8fc9
Merge pull request #10990 from strapi/cm/body-layout 
CM init body layout
 2021-09-16 12:56:18 +02:00
ronronscelestes
0530b36124 updated test 2021-09-16 11:01:24 +02:00
ronronscelestes
44704b3cea feedback fixes 2021-09-16 10:44:44 +02:00
ronronscelestes
f74373d403 wip feedback fix 2021-09-16 10:27:16 +02:00
soupette
5afb369da3 Add D&P badge 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-16 09:26:16 +02:00
soupette
53cc79b3dd Merge branch 'cm/edit-layout' of github.com:strapi/strapi into cm/header-modals 2021-09-16 09:25:09 +02:00
soupette
9728cb07d3 Merge branch 'v4/ds-migration' of github.com:strapi/strapi into cm/edit-layout 2021-09-16 09:24:11 +02:00
soupette
715a1af676 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-16 09:23:18 +02:00
soupette
6408048dfa Add snapshot test 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-16 07:44:32 +02:00
soupette
4cdf8bed21 Add confirm modals 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-16 07:12:27 +02:00
soupette
f4c7473e84 Fix snapshots 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-16 05:44:44 +02:00
soupette
ca7544e4ee Init layout edit view 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-16 05:43:31 +02:00
cyril lopez
c762f0785d
Merge pull request #10980 from strapi/pending-asset-step 
Init the pending asset step in the ML add asset
 2021-09-16 05:34:13 +02:00
mfrachet
8e6c04c887 Removing withPadding 2021-09-15 17:58:05 +02:00
Rémi de Juvigny
b6e1e7a9a1 Add display name to sentry plugin 2021-09-15 16:44:19 +02:00
Rémi de Juvigny
8064e468a0 Format Sentry plugin name in kebab-case 2021-09-15 16:44:19 +02:00
ronronscelestes
18a295eeec merge commit + updated advanced settings test 2021-09-15 15:58:51 +02:00
mfrachet
751d2e0c83 Pending asset step init 2021-09-15 15:47:16 +02:00
mfrachet
5c478a41ed Pending asset step init 2021-09-15 15:40:20 +02:00
ronronscelestes
70e4bc1bf6 Merge branch 'v4/ds-migration' of https://github.com/strapi/strapi into advanced-settings 2021-09-15 15:28:14 +02:00
ronronscelestes
69da3c6138 added snapshot 2021-09-15 15:10:26 +02:00
soupette
9a11062baa Merge branch 'v4/ds-migration' of github.com:strapi/strapi into v4/ds-migration 2021-09-15 14:33:08 +02:00
soupette
566de24d88 Fix react-intl in table head 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-15 14:32:50 +02:00
ronronscelestes
1ba15d6a1c ds integrated + axios/useQuery in advanced settings 2021-09-15 14:29:59 +02:00
Alexandre BODIN
eabbdc5a13
Merge pull request #10966 from strapi/v4/fix-preview-many-relations 
fix previewManyRelations
 2021-09-15 14:28:12 +02:00
Marvin Frachet
cdc12adccb
Bump strapi parts to alpha 31 (#10977) 
* Bump strapi parts to alpha 31

* Fix tests
 2021-09-15 14:25:36 +02:00
cyril lopez
2496f2559b
Merge pull request #10973 from strapi/init-asset-upload-dialog 
Init the upload asset dialog
 2021-09-15 12:13:01 +02:00
cyril lopez
8c6a9dea8b
Merge pull request #10949 from strapi/ds-migration/roles-delete 
[v4] add delete roles
 2021-09-15 12:08:07 +02:00
cyril lopez
830c635acc
Merge pull request #10975 from strapi/improve/filters 
Improve/filters
 2021-09-15 11:44:31 +02:00
soupette
d462f58666 Add missing translations 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-15 11:43:46 +02:00
soupette
b43986b959 Fix tests messages 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-15 11:29:13 +02:00
soupette
73e19acd22 Improve tests for translations 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-15 11:15:45 +02:00
soupette
54d0ed97f1 Update tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-15 10:56:51 +02:00
mfrachet
c5ddd9a039 Init the upload asset dialog 2021-09-15 10:56:26 +02:00
soupette
a591a5d1e1 Translate filters 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-15 10:54:25 +02:00
cyril lopez
bab10b0ef2
Merge pull request #10962 from strapi/asset-cards-ml 
Initialize asset cards in ML
 2021-09-15 10:17:42 +02:00
Mark Kaylor
6e1d839cc0 format labels 2021-09-15 10:09:31 +02:00
mfrachet
5f022f865e Fix review comments 2021-09-15 09:57:23 +02:00
cyril lopez
fc3cbef9b7
Merge pull request #10970 from strapi/cm/change-displayed-fields 
Cm/change displayed fields
 2021-09-15 09:51:29 +02:00
soupette
c0e1c790e7 Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-15 09:50:36 +02:00
soupette
41d8a8d0bc Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-15 09:50:28 +02:00