yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-16 02:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,897 Commits 107 Branches 504 Tags
Commit Graph

1616 Commits

Author SHA1 Message Date
Alexandre Bodin
e1a7074a4e Merge branch 'develop' into features/media-lib 2020-03-05 14:39:29 +01:00
Alexandre Bodin
b3e18e1de6 v3.0.0-beta.19.2 2020-03-05 14:32:42 +01:00
soupette
f1de079d77 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 10:22:49 +01:00
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 2020-03-04 18:42:31 +01:00
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +01:00
Alexandre Bodin
e222792181 v3.0.0-beta.19 2020-03-04 14:24:23 +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
Alexandre Bodin
3bcbde8f0b v3.0.0-beta.18.8 2020-02-26 12:01:37 +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
Alexandre Bodin
3cb66f6566 Update snapshots 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-19 12:16:59 +01:00
Alexandre Bodin
193bd5af0e Add apiId in content type infos 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-19 11:02:20 +01:00
Alexandre Bodin
db03d9d07d Add UID validation routes for CTM livechecks 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-19 10:54:44 +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
Alexandre Bodin
5d1e7c101e Handles clearing defaults and non existing targetField on update 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-12 11:28:08 +01:00
Alexandre Bodin
63c248bfde Add maxLength rules to UID validators 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-12 10:57:37 +01:00
Alexandre Bodin
f9a4b94040 Add default uid value validation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-12 10:46:56 +01:00
Alexandre Bodin
9012e7a0ca Add UID in CTB validators 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-12 09:06:38 +01:00
Alexandre Bodin
5e79e9c275 Add appropriate tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-11 18:15:56 +01:00
Alexandre Bodin
aff529d09e Check db count when switching kind 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-11 18:15:56 +01:00
Alexandre Bodin
fc8d72baaa Handle switching between single type and collection type. This rebuilds the api entierly 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-11 18:15:55 +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
dbca2ef5d9 Add ctb tests for single type relation diff 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:35 +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
soupette
d2e2cc9356 Fixes #3914 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-07 16:36:55 +01:00
HichamELBSI
f534ec32a9 Update list item limitation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-02-07 14:48:32 +01:00