yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-07 14:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,648 Commits 104 Branches 502 Tags
Commit Graph

1325 Commits

Author SHA1 Message Date
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
Virginie Ky
c37f9e54df Attributes list & delete attribute in GroupPage 2019-07-04 12:00:35 +02:00
virginieky
f5a3ccbe38
Merge branch 'develop' into front/repeatable-homepage 2019-07-02 15:52:18 +02:00
Virginie Ky
3d74894214 ui review apply 2019-07-02 15:47:12 +02:00
Alexandre Bodin
9c1a834e27 v3.0.0-beta.9 2019-07-02 15:14:44 +02:00
soupette
6d7c1b90ac Fix lint 2019-07-02 14:44:13 +02:00
Alexandre Bodin
899144f717 Merge branch 'master' into develop 2019-07-02 08:45:15 +02:00
Virginie Ky
0c970973c5 PR review UI 2019-07-01 19:15:41 +02:00
Virginie Ky
cce49dc4b8 PR review 2019-07-01 19:14:57 +02:00
Alexandre Bodin
0112a9726a v3.0.0-beta.8 2019-06-27 19:40:33 +02:00
Alexandre Bodin
eee69452ea v3.0.0-beta.7 2019-06-21 14:34:56 +02:00
Alexandre Bodin
76d9fe8060 v3.0.0-beta.6 2019-06-18 14:54:45 +02:00
Fred Rivett
54fbe9cf0f Fix wording of welcome text 
The wording here is important as it's one of the first things the user
sees of the Strapi project having set it up, and it didn't quite make
sense (though everyone will understand what's meant to be said).

Tweaking this will improve the initial user experience of Strapi.
 2019-06-17 10:58:46 +01:00
Alexandre Bodin
4ec50ca3fc v3.0.0-beta.5 2019-06-13 17:19:33 +02:00
Alexandre Bodin
bbf5a405ec v3.0.0-beta.4 2019-06-12 20:30:45 +02:00
soupette
57493d2629 Fix conflicts 2019-06-12 16:07:19 +02:00
soupette
732cc1a22d Fix List box shadow 2019-06-12 15:19:28 +02:00
soupette
a7bf58e4b4 Fix conflicts 2019-06-12 14:41:43 +02:00