yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 09:56:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,868 Commits 119 Branches 507 Tags
Commit Graph

396 Commits

Author SHA1 Message Date
virginieky
49aa6954f2
Merge branch 'develop' into ctm/repeatable-edit-view 2019-08-01 16:52:23 +02:00
Virginie Ky
ef74880a6b prompt 2019-07-31 19:08:29 +02:00
soupette
e30d2be60d Change ctb menu link with uid instead of destination 2019-07-31 16:31:35 +02:00
Alexandre Bodin
ca5629e4f7 clean Article.settings.json 2019-07-31 16:13:00 +02:00
Alexandre Bodin
c530afa8a3 Validate content-type-buildeer group schema 2019-07-31 16:10:24 +02:00
soupette
0a3b692a87 Fixes #2866 2019-07-31 15:22:37 +02:00
soupette
2da64c084f Remove useless content types 2019-07-31 14:07:20 +02:00
soupette
7d0394070f Fix side effects for upload 2019-07-30 17:25:18 +02:00
Virginie Ky
ea77cdb587 ManyWay relation add and edit from a model 2019-07-30 16:31:40 +02:00
soupette
87ddd2980b Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-30 16:18:31 +02:00
soupette
91609cd713 Handle upload and send data 2019-07-30 16:18:11 +02:00
Virginie Ky
cb19e1e240 Add and edit new group attribute from ModelPage 2019-07-30 14:18:08 +02:00
Alexandre Bodin
f722348749 clean up 2019-07-30 13:06:43 +02:00
Alexandre Bodin
fd54e71baf bookshelf clean populate 2019-07-30 13:06:43 +02:00
Alexandre Bodin
72c7203e18 Init populate cleanup 2019-07-30 13:06:28 +02:00
Virginie Ky
dc8278fd1a merge develop 2019-07-30 11:15:47 +02:00
soupette
5e94cf56f7 Fix layout update from ctb 2019-07-30 09:08:10 +02:00
Alexandre Bodin
8e8433662b rename wysiwyg type to richtext for future plans 2019-07-29 18:05:18 +02:00
soupette
61c8e3cc96 Improve field form logic 2019-07-29 14:59:53 +02:00
soupette
fdb0f86fcc Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-29 13:53:13 +02:00
Alexandre Bodin
9245c32c70 Create relations in groups bookshelf 2019-07-29 08:15:17 +02:00
Alexandre Bodin
59523d47e7 Rename content manager configuration key an model uid changes 2019-07-26 17:53:03 +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
Alexandre Bodin
04d4b60056 Merge branch 'master' into develop 2019-07-25 15:05:07 +02:00
Alexandre Bodin
89f07bf37a Update content types when groups are updated 2019-07-25 14:05:06 +02:00
Alexandre Bodin
6a34fe519c 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
soupette
8a5361813a Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-24 16:55:26 +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
soupette
b790cb098d Fix conflicts 2019-07-24 11:16:40 +02:00
Alexandre Bodin
5c63405091 Refactor groups CTB and clean code. Support relations 2019-07-23 19:28:37 +02:00
soupette
cef035a3ca Add trads 2019-07-19 09:40:14 +02:00
Alexandre Bodin
fe2ad07df1 Delete exports schema.graphql 2019-07-18 20:04:34 +02:00
Alexandre Bodin
06a1b023c3 Clean up code 2019-07-18 19:37:32 +02:00
Alexandre Bodin
103b8c3964 Add group resolvers for nested relations 2019-07-18 19:37:30 +02:00
Alexandre Bodin
fbfe41e1d1 Create group type 2019-07-18 19:37:29 +02:00
Alexandre Bodin
a62f73fe5f Merge branch 'develop' into feature/groups 2019-07-18 19:37:09 +02:00
Alexandre Bodin
da5d02fb7c Merge branch 'master' into develop 2019-07-18 19:28:52 +02:00
Alexandre Bodin
7e60e4fccf fix model settings in example group 2019-07-16 21:03:21 +02:00
soupette
1157f6ae75 Created React select one 2019-07-16 19:00:00 +02:00
Alexandre Bodin
9612ff0f14 remove schema.graphql 2019-07-16 17:25:56 +02:00
Alexandre Bodin
45e6533941 Cleanup and remove upload plugin queries 2019-07-16 17:23:37 +02:00
Alexandre Bodin
cd19e04d6d Init queryManager 2019-07-16 17:23:24 +02:00
Alexandre Bodin
04f8632d3d fix models 2019-07-16 17:01:15 +02:00
Alexandre BODIN
cd634fc038
Merge branch 'master' into patch-1 2019-07-15 18:47:51 +02:00
Alexandre Bodin
1720445986 v3.0.0-beta.13 2019-07-15 17:07:07 +02:00
Abdón Rodríguez Davila
857cd6111a Update engines configuration from all files 2019-07-15 11:16:38 +02:00