yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-29 11:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,765 Commits 116 Branches 486 Tags
Commit Graph

58 Commits

Author SHA1 Message Date
soupette
646e9f220d Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-21 05:39:45 +02:00
Marvin Frachet
19c2d20388
Bump parts to alpha 32 (#10995) 2021-09-16 16:09:51 +02:00
soupette
715a1af676 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-16 09:23:18 +02:00
Marvin Frachet
cdc12adccb
Bump strapi parts to alpha 31 (#10977) 
* Bump strapi parts to alpha 31

* Fix tests
 2021-09-15 14:25:36 +02:00
soupette
d462f58666 Add missing translations 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-15 11:43:46 +02:00
soupette
b43986b959 Fix tests messages 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-15 11:29:13 +02:00
soupette
dc50d17e4a Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-15 09:45:52 +02:00
ronronscelestes
1bdb50e918 merge and updated email test snapshot 2021-09-14 14:34:27 +02:00
ronronscelestes
de64b1d51b refocus on input if form error 2021-09-14 10:18:53 +02:00
ronronscelestes
3f22cb306d notifyStatus implemented 2021-09-13 17:35:16 +02:00
ronronscelestes
c343bab43a Email plugin DS migration 2021-09-13 17:08:41 +02:00
Alexandre Bodin
ef12731bd3 Fix missing public access 2021-09-08 18:47:22 +02:00
Alexandre Bodin
0ff3269c3a Use the right api 2021-09-07 15:11:08 +02:00
Alexandre Bodin
08ee60791a split email routes 2021-09-07 15:11:07 +02:00
soupette
b7f521603e Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-07 13:55:15 +02:00
Alexandre Bodin
7f30925161 Merge branch 'v4/backend' into releases/v4 2021-08-25 14:45:59 +02:00
Alexandre Bodin
1ee2d2c483 Merge branch 'master' into releases/v4 2021-08-25 14:44:32 +02:00
soupette
f22d20e61b Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 16:13:02 +02:00
soupette
8cc31618b3 Merge branch 'releases/v4' of github.com:strapi/strapi into improve-bundle 2021-08-24 15:08:34 +02:00
Alexandre Bodin
f4a4e2ce26 Move routes to js when possible and refactor policies to be objects 2021-08-24 13:59:43 +02:00
Pierre Noël
bc56be3560 Merge branch 'pluginAPI/loadPlugin' of github.com:strapi/strapi into pluginAPI/loadPlugin 2021-08-20 16:32:14 +02:00
Pierre Noël
09945a46df fixes 2021-08-20 15:23:02 +02:00
Alexandre Bodin
575cbbdc7c Migrate plugin getters 2021-08-19 23:30:49 +02:00
Alexandre Bodin
c3642a4f10 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-19 23:29:55 +02:00
Pierre Noël
98719b6c64 migrate plugin structures to V4 2021-08-19 16:49:33 +02:00
Alexandre Bodin
f528a865cb Merge branch 'master' of github.com:strapi/strapi into releases/v4 2021-08-19 10:12:58 +02:00
soupette
393bf5f1be Fix PR feedback 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 09:42:19 +02:00
soupette
48239ab116 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-19 09:30:45 +02:00
mfrachet
304c98b41e Preparing the i18n settings list view 2021-08-13 10:13:10 +02:00
Pierre Noël
4790e28284 refactor with module approach 2021-08-06 18:09:49 +02:00
Pierre Noël
ce0e67830a Merge branch 'v4/backend' into v4/plugin-api/modules 2021-08-05 13:59:40 +02:00
Alexandre Bodin
805e7fdb4b Merge branch 'master' into releases/v4 2021-08-04 19:24:10 +02:00
Alexandre Bodin
a7fab84994 Merge branch 'v4/pluginAPI' into pluginAPI/loadPlugin 2021-07-30 10:15:50 +02:00
Pierre Noël
3b179169d4 wip 2021-07-29 16:39:26 +02:00
soupette
94be562a56 Lint code 
Signed-off-by: soupette <cyril@strapi.io>
 2021-07-28 09:52:32 +02:00
soupette
6e4604d662 Init dynamic load of plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-28 08:16:15 +02:00
soupette
900388755f Rename boot lifecycle to bootstrap 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-21 09:05:20 +02:00
Pierre Noël
2381e8c60b WIP 2021-07-20 12:12:36 +02:00
soupette
14a4e2b531 Clean trads 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-23 19:03:52 +02:00
Alexandre BODIN
eda51cc08a
Merge pull request #10518 from strapi/drop-node-10 
Drop support for node10
 2021-06-23 18:32:04 +02:00
Alexandre Bodin
356ee09ed2 Merge branch 'master' into releases/v4 2021-06-23 18:23:54 +02:00
Convly
13052049b0 Add support for node 16, update readme 2021-06-23 07:55:40 +02:00
Convly
1a39d934f8 Drop support for node10, set new oldest supported node version to 12.x.x 2021-06-21 10:56:57 +02:00
soupette
478ab7baf0 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-16 11:44:22 +02:00
soupette
b6f021ac15 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-09 12:22:02 +02:00
soupette
3806d3cbf8 Clean files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-09 12:11:51 +02:00
soupette
98b3a1c738 Load strapi plugins translations 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-09 11:47:56 +02:00
soupette
4c3493c16c Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-08 16:06:32 +02:00
soupette
31e9a6e481 Display plugins settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-08 09:37:14 +02:00
soupette
6752cb0aad Created Settings API 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-08 09:02:20 +02:00