yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,378 Commits 127 Branches 497 Tags
Commit Graph

1008 Commits

Author SHA1 Message Date
Alexandre Bodin
63a6452830 Merge branch 'develop' into feature/groups 2019-07-15 10:21:22 +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
Alexandre Bodin
5eba276f0c Merge branch 'master' into feature/groups 2019-07-11 10:14:50 +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
Virginie Ky
84ecec8140 merge from develop 2019-06-11 18:34:09 +02:00
soupette
6c99392747 Update HP to display both groups ans cts 2019-06-11 18:12:57 +02:00
Alexandre Bodin
2311f7de3d Done 2019-06-11 17:53:01 +02:00
Virginie Ky
6ae5ffdeb0 merge develop 2019-06-11 12:18:11 +02:00
Virginie Ky
b961ef38b7 ModelPage Unit tests with context 2019-06-10 18:02:14 +02:00
Virginie Ky
7db8366492 CTB LeftMenu refont with groups 2019-06-10 17:38:10 +02:00
soupette
02e8ca86f9 Init design HomePage. 
Created List related components in strapi-helper-plugin.
Update trads
 2019-06-07 19:08:33 +02:00
Alexandre Bodin
0414e9f25b v3.0.0-beta.3 2019-06-07 15:45:00 +02:00
Alexandre Bodin
7d63600e21 v3.0.0-beta.2 2019-06-04 17:03:17 +02:00
Alexandre Bodin
30908ce649 v3.0.0-beta.1 2019-06-03 14:09:14 +02:00
Alexandre Bodin
5ca7513c45 v3.0.0-beta.0 2019-05-31 17:48:31 +02:00
Alexandre Bodin
7d01234e80 Fix and set warning in eslint error to fix later in the front 2019-05-29 17:25:56 +02:00
Alexandre Bodin
31a222ecb1 Start lint fixes 2019-05-29 17:25:56 +02:00
soupette
5a087173a7 Prevent the users from uninstalling a core plugin. 
Prevent the user from adding/removing a plugin with the UI if the env is not development
 2019-05-24 17:03:01 +02:00
Alexandre Bodin
a1878617a2 Set node engines to v10 only 2019-05-15 16:02:17 +02:00
Alexandre Bodin
5e77287cc8 Rename strapi dev to strapi develop 2019-05-15 16:00:06 +02:00
Alexandre Bodin
5f50b90483 Use autoReload with strapi dev only 2019-05-13 17:33:08 +02:00