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

8570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
c718e15513 Fix reorder 2019-07-26 12:24:15 +02:00
soupette
bdfcdb12b2 Fix search 2019-07-26 10:39:51 +02:00
soupette
fbf5bd851f Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-25 18:07:52 +02:00
soupette
c7354f72e8 Fix redirect for settingsview 2019-07-25 18:00:45 +02:00
soupette
30b7b88677 Fix baseline 2019-07-25 17:23:14 +02:00
soupette
afffc8d419 Fix nav between groupfield and group layout 2019-07-25 17:06:34 +02:00
soupette
69e3eeae4b Add memo where needed 2019-07-25 16:14:50 +02:00
soupette
cf01c6b4cc Rename ItemTypes file 2019-07-25 16:06:45 +02:00
soupette
9f4bb0cfe2 Remove useless files, fix json validations 2019-07-25 15:52:30 +02:00
Alexandre Bodin
04d4b60056 Merge branch 'master' into develop 2019-07-25 15:05:07 +02:00
Alexandre BODIN
799964d629
Merge pull request #3680 from strapi/feature/groups-content-type-builder-updates 
Feature/groups content type builder updates
 2019-07-25 15:02:56 +02:00
Alexandre Bodin
f6f201286e Remove unnecessary comment 2019-07-25 14:08:54 +02:00
Alexandre Bodin
82ab2a98e9 remove unused parameter 2019-07-25 14:07:58 +02:00
Alexandre Bodin
89f07bf37a Update content types when groups are updated 2019-07-25 14:05:06 +02:00
soupette
386c5a5776 Add disabled options to selects 2019-07-25 13:44:35 +02:00
soupette
fa5096e3c5 Fix failing tests 2019-07-25 12:22:41 +02:00
soupette
a2dc4b22d1 Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-25 12:07:01 +02:00
soupette
548a2809b9 Finish group and models setting 2019-07-25 12:06:40 +02:00
Alexandre Bodin
6a34fe519c v3.0.0-beta.14 v3.0.0-beta.14 2019-07-25 12:00:42 +02:00
Alexandre Bodin
76daff3284 Update groups when content types change 2019-07-25 11:55:58 +02:00
Alexandre Bodin
e7b7cf5198 remove capitalize group file 2019-07-25 11:52:40 +02:00
Alexandre Bodin
73e1a94b7e Fix broken onWays and manyWays on content type rename 2019-07-25 11:29:05 +02:00
soupette
ad18ff4cfe Retrieve the models from the main container and finish field form logic 2019-07-25 09:36:47 +02:00
Alexandre Bodin
06c2a9e79d Update schemaValidation in Content manager 2019-07-25 08:02:10 +02:00
soupette
e4cb76e054 Created FieldForm component 2019-07-25 00:26:56 +02:00
soupette
5dd3c9ed81 Init meta form 2019-07-24 18:27:30 +02:00
soupette
8a5361813a Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-24 16:55:26 +02:00
Jim LAURIE
6a3388267b
Merge pull request #3674 from strapi/docs/remote-i18n-example 
Remove i18n example
 2019-07-24 16:34:42 +02:00
Jim LAURIE
4540905d84 Remove i18n example 2019-07-24 16:28:38 +02:00
Alexandre Bodin
2efaa08394 Use wysiwyg in example article type 2019-07-24 14:37:50 +02:00
Alexandre Bodin
9876c339ce Recompute layout sizes 2019-07-24 14:35:21 +02:00
Alexandre BODIN
175fba4441
Merge pull request #3672 from strapi/content-manager/group-layout-updates 
Update content-manager schemas
 2019-07-24 13:59:11 +02:00
soupette
ad95c65eb8 Remove useless files 2019-07-24 12:06:13 +02:00
Alexandre Bodin
70bf99a65b Update content-manager schemas 2019-07-24 11:51:35 +02:00
soupette
b790cb098d Fix conflicts 2019-07-24 11:16:40 +02:00
soupette
73a8790b4e Fix migrztions bugs 2019-07-24 11:10:29 +02:00
soupette
8aae88bac5 Init backend migration 2019-07-24 10:16:44 +02:00
soupette
a898a0b300 Created groups setting view 2019-07-24 09:13:04 +02:00
Alexandre BODIN
59b3bca644
Merge pull request #3670 from strapi/groups/groups-ctb-relations 
Refactor groups CTB and clean code. Support relations
 2019-07-23 19:58:27 +02:00
Alexandre Bodin
4093fe46b1 Fix tests 2019-07-23 19:43:47 +02:00
Alexandre Bodin
fba38d2c6d Fix typos 2019-07-23 19:30:15 +02:00
Alexandre Bodin
5c63405091 Refactor groups CTB and clean code. Support relations 2019-07-23 19:28:37 +02:00
Alexandre BODIN
084a91300f
Merge pull request #3668 from strapi/chore/new-content-manager-schemas 
New content manager schemas + wysiwyg type
 2019-07-23 19:26:09 +02:00
Alexandre Bodin
d6255be74e Clear unnecessary comment 2019-07-23 18:58:46 +02:00
soupette
740f7ad3f4 Handle add and remove relations 2019-07-23 18:51:40 +02:00
soupette
bb2efb1252 Init relation sort 2019-07-23 18:38:43 +02:00
soupette
e8364a06b0 Handle add field item 2019-07-23 17:37:07 +02:00
soupette
eed622a624 Add preview for list reorder 2019-07-23 15:29:00 +02:00
soupette
e44c32f822 Handle reorder 2019-07-23 14:58:08 +02:00
Alexandre Bodin
263ebb4480 Add missing check 2019-07-23 14:26:55 +02:00