440 Commits

Author SHA1 Message Date
soupette
2e7e7def33 Fix context in Edipage and children 2019-10-03 12:58:20 +02:00
soupette
743545606b Remove useless lifecycle in App and update its suffixURL 2019-10-03 11:54:23 +02:00
soupette
590ef49ec1 Fix HomePage contexts and update context api 2019-10-03 11:48:24 +02:00
soupette
5c42e43d4f Merge branch 'develop' of github.com:strapi/strapi into styled-component/ctb 2019-10-03 11:09:48 +02:00
Jim LAURIE
088653a9b9 Review the auth email template doc 2019-09-23 16:59:20 +02:00
Virginie Ky
2c67635b38 InputSearch as a func component 2019-09-19 16:37:26 +02:00
Virginie Ky
0f26597a92 InputSearch func component 2019-09-19 14:49:18 +02:00
Virginie Ky
1a1809006b Search refacto ip 2019-09-19 10:13:03 +02:00
Virginie Ky
c06b0d9031 components refacto ip 2019-09-18 17:39:54 +02:00
Natalia Tsvetkova
a4a26be4b3 Merge branch 'master' into feature/instagram_provider 2019-09-18 14:36:18 +02:00
Virginie Ky
b5a18e27bc EditForm refacto 2019-09-17 18:48:28 +02:00
Virginie Ky
28426555b6 users permissions plugin refacto ip 2019-09-17 17:36:03 +02:00
Virginie Ky
88a11cef3c node-sass removed 2019-09-17 16:20:45 +02:00
Virginie Ky
a6b57689fb styled components migration 2019-09-17 15:24:22 +02:00
Virginie Ky
4f45134dd1 Users permissions styled compo ip 2019-09-16 19:18:35 +02:00
Virginie Ky
39230ed2ac Remove node-sass ip 2019-09-13 15:17:24 +02:00
soupette
b3bc4a0941 Remove willSecure and didGetSecured data hooks 2019-09-09 18:44:41 +02:00
Natalia Tsvetkova
92f00de254 Merge branch 'master' into feature/instagram_provider 2019-09-09 14:59:21 +02:00
soupette
1cd7084a94 Move auth views to the admin 2019-09-09 13:58:07 +02:00
Natalia Tsvetkova
6a3409891c Added instagram social auth provider 2019-09-06 09:19:23 +02:00
soupette
fb3e266d16 Move auth trads to the admin 2019-09-05 16:41:23 +02:00
Virginie Ky
56b93581d8 Some UI fixes 2019-08-26 13:44:04 +02:00
Alexandre BODIN
ad1cee6469
Merge branch 'master' into develop 2019-08-22 16:06:05 +02:00
soupette
14157f73b9 Update trads and add links to terms and privacy policy 2019-08-21 10:06:09 +02:00
Vladislav Umrikhin
ea42bf1e63 fix capital letter in word email 2019-08-20 16:51:08 +10:00
Vladislav Umrikhin
ff5c091c2b Fixed context of paper letters 2019-08-19 04:38:18 +10:00
Vladislav Umrikhin
f4d5317264 Update RU translation in strapi-plugin-users-permissions 2019-08-19 04:35:18 +10:00
soupette
857ec1ca70 Rename lifecycle hooks 2019-08-13 11:31:10 +02:00
soupette
25d7fad468 Add option to change the logo of the login page 2019-08-09 17:21:39 +02:00
Alexandre Bodin
da5d02fb7c Merge branch 'master' into develop 2019-07-18 19:28:52 +02:00
Louis Augry
08e2f47800
Merge branch 'master' into fix-documentation-typo 2019-07-10 15:11:52 +02:00
Louis Augry
a3fe9d5a38 Fix documention typo 2019-07-08 15:10:17 +02:00
soupette
61fc2ca7dc fix lint 2019-07-08 10:20:44 +02:00
soupette
61fb728986 Fix conflicts 2019-07-04 18:43:30 +02:00
soupette
2d8f520ba7 Init SettingsView 2019-07-04 11:32:51 +02:00
Alexandre Bodin
6cad390d97 Merge branch 'master' into chore/strapi-new-improvments 2019-07-02 15:09:59 +02:00
soupette
6d7c1b90ac Fix lint 2019-07-02 14:44:13 +02:00
soupette
37ed213b6d Fixes #3472 2019-06-19 11:51:44 +02:00
Alexandre Bodin
9c2a90246b Fix Role CRUD with users 2019-05-14 12:42:03 +02:00
Alexandre Bodin
918fc8b05d Fix test:front 2019-05-03 16:49:10 +02:00
soupette
5dd8106aa0 Move css import to admin and build ctm 2019-04-18 19:54:21 +02:00
soupette
8fb7608226 Use build for ctb upload us but not stm 2019-04-18 17:50:23 +02:00
soupette
06eeca0f65 Build upload 2019-04-18 01:10:38 +02:00
soupette
f14ad13481 Build users-permissions plugin 2019-04-18 00:32:21 +02:00
soupette
554fc7654a Clean files 2019-04-17 11:45:55 +02:00
soupette
61f115fbee Load users and email 2019-04-16 16:55:53 +02:00
soupette
1544cdf877 Fix PR feedback 2019-04-09 18:35:49 +02:00
soupette
e56e46e030 Split admin and users.
Co-authored-by: lauriejim
2019-04-09 12:09:03 +02:00
soupette
3c108fe555 Fix PR feedback 2019-04-08 20:04:30 +02:00
soupette
e5393acf66 Merge branch 'front/admin-new-hook-architecture' of github.com:strapi/strapi into front/admin-new-hook-architecture-admin-rework 2019-04-08 16:20:21 +02:00