yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,581 Commits 129 Branches 498 Tags
Commit Graph

963 Commits

Author SHA1 Message Date
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
855a923ca0 Fix tests 2019-07-28 19:27:53 +02:00
Alexandre Bodin
59523d47e7 Rename content manager configuration key an model uid changes 2019-07-26 17:53:03 +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
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
fa5096e3c5 Fix failing tests 2019-07-25 12:22:41 +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
73e1a94b7e Fix broken onWays and manyWays on content type rename 2019-07-25 11:29:05 +02:00
soupette
b790cb098d Fix conflicts 2019-07-24 11:16:40 +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
e68f230baa Fix tests 2019-07-23 11:21:16 +02:00
Alexandre Bodin
85762551aa Cleanup old code 2019-07-23 11:21:15 +02:00
Alexandre Bodin
6fbacc629d Add new missing attributes on server start 2019-07-23 11:21:14 +02:00
Alexandre Bodin
7d7a5f3223 Merge branch 'develop' into feature/groups 2019-07-22 18:16:38 +02:00
soupette
af84bb5116 Fix conflicts 2019-07-22 17:10:23 +02:00
virginieky
411aa211d5
Merge branch 'develop' into front/repeatable-field-create 2019-07-19 13:39:52 +02:00
soupette
cef035a3ca Add trads 2019-07-19 09:40:14 +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
Virginie Ky
9fc54cd8f9 Edit attributes Unit tests 2019-07-18 16:34:27 +02:00
Virginie Ky
8a2122cd13 Edit attribute 2019-07-18 15:23:06 +02:00
Virginie Ky
822b4f840f create group unit test 2019-07-17 11:54:30 +02:00
Virginie Ky
aa81ebf21e fix lint 2019-07-17 10:29:15 +02:00
Virginie Ky
4007579579 LeftMenu and GroupPage update after save 2019-07-16 19:24:14 +02:00
Virginie Ky
1e2f6ba05c Save new group 2019-07-16 19:02:44 +02:00
Virginie Ky
3feecacdad Create temporary group 2019-07-16 16:54:56 +02:00
Virginie Ky
ae1c622eda UI fixes 2019-07-16 15:06:42 +02:00
Alexandre BODIN
cd634fc038
Merge branch 'master' into patch-1 2019-07-15 18:47:51 +02:00
Virginie Ky
752786a01e unit test fix 2019-07-15 18:18:09 +02:00
Virginie Ky
4701ea2681 Attributes creation 2019-07-15 17:32:50 +02:00
Alexandre Bodin
1720445986 v3.0.0-beta.13 2019-07-15 17:07:07 +02:00
Virginie Ky
3b1a7c5789 Attributes 2019-07-15 15:00:05 +02:00
Abdón Rodríguez Davila
857cd6111a Update engines configuration from all files 2019-07-15 11:16:38 +02:00
Alexandre Bodin
b087cbab34 v3.0.0-beta.12 2019-07-15 10:24:28 +02:00
Alexandre Bodin
63a6452830 Merge branch 'develop' into feature/groups 2019-07-15 10:21:22 +02:00
Virginie Ky
e432a2d639 Add attributes 2019-07-12 18:34:12 +02:00
soupette
950168b8bf Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-edit-view 2019-07-11 17:13:35 +02:00
soupette
8309f527f9 Display external links 2019-07-11 16:53:00 +02:00
Alexandre Bodin
1b130f7a7b Init group inserts 2019-07-11 13:52:21 +02:00
Alexandre Bodin
5eba276f0c Merge branch 'master' into feature/groups 2019-07-11 10:14:50 +02:00
Alexandre Bodin
f0829f6f7c Merge branch 'master' into feature/groups 2019-07-10 15:18:14 +02:00
Louis Augry
08e2f47800
Merge branch 'master' into fix-documentation-typo 2019-07-10 15:11:52 +02:00
Alexandre Bodin
3a94c7ea90 v3.0.0-beta.11 2019-07-10 15:09:03 +02:00
Alexandre Bodin
3759582ccc Test node v12 engine 2019-07-10 10:21:12 +02:00