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
10,619 Commits 129 Branches 498 Tags
Commit Graph

724 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Alexandre Bodin
c8b17ff752 optimization 2019-04-30 14:47:49 +02:00
soupette
5008038f53 Clean helper plugin and admin scripts 2019-04-25 14:32:50 +02:00
soupette
adf4e88ebb Fix front unit tests 2019-04-23 15:18:57 +02:00
soupette
f14ad13481 Build users-permissions plugin 2019-04-18 00:32:21 +02:00
soupette
c539dbce35 Fix build helper plugin 2019-04-17 11:18:40 +02:00
soupette
a9886f3105 Load ctm 2019-04-16 17:48:17 +02:00
soupette
61f115fbee Load users and email 2019-04-16 16:55:53 +02:00
soupette
e1d619065b Update peerdependencies and fix duplicate modules 2019-04-16 12:54:16 +02:00
soupette
751a794ca8 Change imports with helper plugin 2019-04-16 11:53:29 +02:00
soupette
b68a04d0fc Add rollup to strapi-helper-plugin 2019-04-16 09:38:15 +02:00
soupette
1f83ef123e Init rollup 2019-04-15 18:35:01 +02:00
soupette
e56e46e030 Split admin and users. 
Co-authored-by: lauriejim
 2019-04-09 12:09:03 +02:00
soupette
fcbd7f9ec6 Fix cypress test 2019-04-03 19:02:19 +02:00
soupette
59587d02cd Fix forgot password views 2019-04-03 17:26:31 +02:00
soupette
0f554234d8 Created PluginDispatcher component 2019-04-02 20:11:31 +02:00
soupette
b8c9c0ef3e Created the injectHooks HOC 2019-04-02 17:48:19 +02:00
soupette
4b483ce6d8 Merge branch 'master' of github.com:strapi/strapi into improve/ctb 2019-03-29 15:56:53 +01:00
soupette
003b9a7ef8 Fixes #1325 2019-03-27 19:30:47 +01:00
soupette
c1464f73be Apply desgin feedback 2019-03-23 08:15:06 +01:00
soupette
0a5341890e Init Relation modal 2019-03-22 17:00:56 +01:00
soupette
15b227df9b Add tests to modelpage 2019-03-21 11:53:44 +01:00
soupette
afb3628f2f Add tests to attributesModal 2019-03-12 16:53:10 +01:00
soupette
ac80b5bbdc Add AttributeModal 2019-03-12 15:29:03 +01:00
soupette
6d28361cce Add tests, modify PluginHeader so we can pass icons 2019-03-09 12:31:40 +01:00