yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-19 07:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,832 Commits 115 Branches 484 Tags
Commit Graph

364 Commits

Author SHA1 Message Date
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
soupette
fb1c404f56 Merge branch 'front/admin-new-hook-architecture' of github.com:strapi/strapi into front/admin-new-hook-architecture-lifecycle 2019-04-08 13:53:31 +02:00
soupette
f37f740aba Fix PR feedback 2019-04-05 00:50:14 +02:00
soupette
59587d02cd Fix forgot password views 2019-04-03 17:26:31 +02:00
soupette
95f936c8ce Add Onboarding in new Admin container 2019-04-03 14:10:42 +02:00
soupette
e1977d28ca Add test to App container 2019-04-02 17:44:25 +02:00
soupette
be95294bdc Add lifecycles to all plugins 2019-04-02 14:17:01 +02:00
soupette
55ac5d5179 Add initializer container to all plugins 2019-04-02 14:06:44 +02:00
Jim LAURIE
be36c280f3 Fix lint 2019-03-08 15:53:58 +01:00
Aurélien Georget
03d212d10f Fix conflicts 2019-02-28 14:44:01 +01:00
soupette
28bc9f23a8 Change paths in users-permissions 2019-02-22 11:16:42 +01:00
Aurélien Georget
4f322de0fd Add events on the users & permissions settings part 2019-02-21 16:48:59 +01:00
soupette
928971b1e3 Fix PR feedback and change stores name with <pluginId>_<containerName> 2019-02-14 09:48:39 +01:00
soupette
9e1084ed04 Harmonize pluginId between plugins 2019-02-11 18:56:17 +01:00
soupette
39934fd360 Remove single store for upload 2019-02-11 14:05:06 +01:00
soupette
72cc7d0837 Remove separate store for users-permissions 2019-02-11 13:55:49 +01:00
soupette
250adb1332 Merge branch 'master' of github.com:strapi/strapi into split-ctm-settings-view 2019-01-24 10:56:49 +01:00
soupette
7e79864259 Split content-manager setting view into tabs. 
Allow to change the textarea type so the wysiwyg can be displayed without having to set it back in the content type builder.
Fixes #2307
 2019-01-20 12:52:08 +01:00
soupette
925438d7b5 Fixes #2541 2019-01-17 17:18:54 +01:00
invader
7659bdb697 admin: update Russian translations in users and permissions plugin 2019-01-11 02:26:44 +03:00
Jim LAURIE
2b3af8300c Add migration of jwt.json file 2019-01-06 14:00:04 +01:00
Jim LAURIE
f2ec28907e
Merge branch 'master' into master 2018-11-29 11:45:42 +01:00
Jim LAURIE
7e00be7057
Merge branch 'master' into master 2018-11-22 12:57:16 +01:00
Jim LAURIE
ef0f40701f
Merge branch 'master' into fix/css-container-fluid 2018-11-21 11:56:19 +01:00
Jesús Pérez
e03fd96e1a Add missing Twitter provider redirect URI configuration 2018-11-20 16:55:20 +01:00
Alberto Maturano
8fcbb1978f refactor: Fix misuse of map method 
`map` should create a new Array so a `return` is expected inside the
callback param. `forEach` is the corrent method to use for just iterate
over array elements.
 2018-11-15 15:51:23 -06:00
Dimitri Nicolas
e18bf9198b Change containerFluid child margin for better grid alignement 2018-11-13 17:21:31 +01:00
Jim LAURIE
66a1e0c291
Merge branch 'master' into feature/2108_handle_redirect_after_password_reset 2018-11-08 11:28:44 +01:00