1042 Commits

Author SHA1 Message Date
soupette
857ec1ca70 Rename lifecycle hooks 2019-08-13 11:31:10 +02:00
soupette
d52d4f603f Upgrade react deps 2019-08-13 11:22:36 +02:00
cyril lopez
c89a898e49
Merge branch 'develop' into ctm/edit-view-update 2019-08-12 09:43:58 +02:00
Alexandre Bodin
ebf3922905 Merge branch 'master' into develop 2019-08-12 09:39:59 +02:00
Alexandre Bodin
fe2c2dccb3 v3.0.0-beta.15 2019-08-12 09:35:27 +02:00
soupette
b36079124b Fix baseline with current inputs 2019-08-08 15:29:45 +02:00
Virginie Ky
0449d9dc3f all modals title and subtitle fixes 2019-08-02 18:12:51 +02:00
Virginie Ky
336902384e Merge branch 'develop' into front/repeatable-field-create 2019-08-01 17:51:47 +02:00
Virginie Ky
8342dc79a7 ListRow and ListRowCollapse UI 2019-07-31 23:25:34 +02:00
soupette
0a3b692a87 Fixes #2866 2019-07-31 15:22:37 +02:00
soupette
53d0014dc2 Clean code 2019-07-29 18:02:45 +02:00
soupette
fdd0b0f63d Fix UI 2019-07-29 17:11:53 +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
Virginie Ky
4180313360 merge with conflicts fix 2019-07-25 16:07:28 +02:00
Alexandre Bodin
04d4b60056 Merge branch 'master' into develop 2019-07-25 15:05:07 +02:00
Alexandre Bodin
6a34fe519c v3.0.0-beta.14 2019-07-25 12:00:42 +02:00
soupette
73a8790b4e Fix migrztions bugs 2019-07-24 11:10:29 +02:00
Virginie Ky
dff69ece4a merge develop 2019-07-24 10:17:28 +02:00
Virginie Ky
27c38cd959 Group relation creation without UT 2019-07-23 18:40:47 +02:00
Virginie Ky
a312d6da15 Relation modal ip 2019-07-22 18:32:25 +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
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
soupette
c74cbd9126 Fix request tasks for selects 2019-07-18 14:07:22 +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
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
Virginie Ky
e432a2d639 Add attributes 2019-07-12 18:34:12 +02:00
soupette
7b7fe93875 Fix helper plugin 2019-07-11 18:13:09 +02:00
soupette
5acb46c54a Merge branch 'develop' of github.com:strapi/strapi into ctm/repeatable-list-view 2019-07-11 17:20: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
3ebf82c5a1 Display filters 2019-07-10 17:07:19 +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
soupette
ea32c05976 Created filterpicker 2019-07-09 12:31:18 +02:00
virginieky
a5a9319ba9
Merge branch 'develop' into front/repeatable-fieldslist 2019-07-09 09:56:11 +02:00
Alexandre Bodin
abef483bc4 v3.0.0-beta.10 2019-07-09 09:05:35 +02:00
Virginie Ky
b6a5ae5644 Review apply 2019-07-08 18:58:29 +02:00
Louis Augry
a3fe9d5a38 Fix documention typo 2019-07-08 15:10:17 +02:00
soupette
9b5dd83117 Fix conflicts 2019-07-04 18:50:31 +02:00
soupette
61fb728986 Fix conflicts 2019-07-04 18:43:30 +02:00
Virginie Ky
b7a8a8cbcc Some changes before PR 2019-07-04 15:19:32 +02:00
Virginie Ky
b74d080c1b back button path 2019-07-04 13:58:38 +02:00