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
12,264 Commits 116 Branches 489 Tags
Commit Graph

1058 Commits

Author SHA1 Message Date
soupette
3eb635380a Fix ctb allowed types 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 14:15:24 +01:00
soupette
7840578474 Fix ctb 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 13:50:45 +01:00
HichamELBSI
998bfa9360 Merge branch 'features/media-lib-frontend' into media-lib/cm-modal 2020-03-24 09:56:55 +01:00
HichamELBSI
f19fb580ec Update after review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-23 23:28:30 +01:00
soupette
818927f7b5 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-23 14:33:17 +01:00
soupette
18772c98b8 Merge branch 'master' of github.com:strapi/strapi into develop 2020-03-23 14:19:34 +01:00
Mattias van den Belt
f8023cc66c
Update Dutch Translation and Typos [NL] (#5523) 
* Update Dutch Translation

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Add new translation keys

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update strapi-admin translation [NL]

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Sort translation [NL]

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update dutch content-types translations

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

Co-authored-by: Nikolay Tyurin <kolya_tyurin@mail.ru>
 2020-03-20 17:10:55 +01:00
Virginie Ky
59c567aa3c clean numberOfVisibleItems prop 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 16:40:55 +01:00
virginieky
4392eaff7e
Merge branch 'develop' into front/ui-fixes 2020-03-20 14:05:40 +01:00
Alexandre Bodin
ed2b973b99 Merge branch 'develop' into features/media-lib 2020-03-20 11:04:10 +01:00
Virginie Ky
83b326e9a5 leftmenu alignment and border listbutton 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 09:19:43 +01:00
Pierre Noël
c3f011ddba Merge branch 'master' into fix/#4556/nullWhenRequiringAComponentInRelationGraphQl 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-16 15:49:59 +01:00
Alexandre Bodin
243085dae1 Merge branch 'develop' into features/media-lib 2020-03-13 15:40:11 +01:00
Shabith Ishan Thennakone
fe19bcb2ea removed text-transform from variable name 2020-03-13 14:51:32 +01:00
soupette
1686cc051f Fix select all 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-13 11:13:26 +01:00
soupette
4ab399af48 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-13 10:28:57 +01:00
soupette
bbc13eb27a Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 17:41:27 +01:00
soupette
083e18ec52 Add allowed types to ctb 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 16:44:36 +01:00
soupette
f3bcddcf89 Identify front-end core files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 13:33:32 +01:00
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +01:00
soupette
7c12398df6 Fixes #5404 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 12:16:26 +01:00
soupette
46a65a9185 Fix stepper and console errors 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 11:48:44 +01:00
HichamELBSI
b5947621fc Merge branch 'master' into develop 2020-03-04 09:32:13 +01:00
Robin Venneman
6bfe1e84ed fix: don't show unique attribute for rich text fields #5305 
Signed-off-by: Robin Venneman <robin.venneman@gmail.com>
 2020-03-02 22:14:49 +01:00
HichamELBSI
14120fd98b Fix single types modal title 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-02 15:50:15 +01:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +01:00
soupette
3a695aeaac Merge branch 'develop' of github.com:strapi/strapi into chore/remove-saga-admin 2020-03-02 11:34:01 +01:00
HichamELBSI
92632be70d Fix all single types feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-28 16:03:38 +01:00
soupette
ccc92b90a5 Add required info into the plugin object and update plugin generator 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 11:40:55 +01:00
cyril lopez
d5d5c0fb4f
Merge pull request #5344 from strapi/ctb/prevent-polymorph-relations 
Fixes #3864
 2020-02-28 09:35:45 +01:00
soupette
725a0940ab Fixes #5343 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 17:10:20 +01:00
soupette
6e24c526f9 Fixes #3864 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-27 16:55:34 +01:00
HichamELBSI
e450d3613b Add UID in CTM 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-25 21:44:02 +01:00
Virginie Ky
9f354b05bb apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 21:15:26 +01:00
soupette
2f3bbcb2db Fix timestamp dipslay 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 10:05:15 +01:00
soupette
e232287152 fix links to ctm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 09:42:35 +01:00
soupette
7ab7ebda51 Fix loading state and ctb setup 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 08:53:34 +01:00
soupette
761675253e Fix delete uid field by removing all field attached to it 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 08:38:09 +01:00
HichamELBSI
0349c078c5 Update the state after removing field 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-21 11:04:43 +01:00
HichamELBSI
901472f527 add Uid attributes in CTB 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-20 22:16:31 +01:00
soupette
ad2af42291 Fix stepper 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-20 12:42:19 +01:00
HichamELBSI
f5c6ef0a44 Add single type navigation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-19 17:07:03 +01:00
HichamELBSI
79870fbd15 Fix content manager initializer updates 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-19 17:04:09 +01:00
cyril lopez
f9a788de61
Merge pull request #5236 from strapi/single-types/fix-edition 
Single types/fix edition
 2020-02-13 13:28:58 +01:00
Alexandre Bodin
8a6c48eb14 Merge branch 'develop' into features/single-types 2020-02-13 11:36:07 +01:00
HichamELBSI
7616edf8e3 Fix PR comments 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-13 10:35:52 +01:00
HichamELBSI
88f8b94fee Add notification to kind edition 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-12 20:12:28 +01:00
soupette
f924a53a8a Add pluginLogo to the plugin object in order to prevent fetching the logo from github 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 17:15:53 +01:00
Alexandre Bodin
de9521ce6b Merge branch 'develop' into features/single-types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:09:50 +01:00
Alexandre Bodin
8a970562c9 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 19:15:20 +01:00