yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-06 07:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,520 Commits 120 Branches 493 Tags
Commit Graph

17520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
42c1865471 Fix update notifier message typo 2021-08-25 15:20:49 +02:00
Alexandre Bodin
8f5cb90863 Migrate admin policies 2021-08-25 15:16:17 +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
Alexandre Bodin
ddd6747a20 Remove old comment 2021-08-25 14:32:07 +02:00
soupette
81c290a53c Add tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-25 11:04:43 +02:00
soupette
10353d3d6d Add useNotification documentation 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-25 10:17:33 +02:00
soupette
14d9533516 Add notifications 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-25 10:07:30 +02:00
Alexandre BODIN
0a33c2fe03
Merge pull request #10793 from strapi/v4/remove-old-db-code 
Remove old db code
 2021-08-24 20:17:26 +02:00
Alexandre Bodin
476d5d4ae7 Remove old db code 2021-08-24 18:55:33 +02:00
Alexandre BODIN
a8d8d4863f
Merge pull request #10791 from strapi/v4/routing 
Move routes to js when possible and refactor policies to be objects
 2021-08-24 18:38:39 +02:00
Alexandre Bodin
9d7d43b9ec Check policies folder exists 2021-08-24 18:19:28 +02:00
Alexandre Bodin
03ba7cf3d9 Migrate loaders and cleanups 2021-08-24 17:56:49 +02:00
soupette
87b8a3b4e2 Remove old files 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 17:04:13 +02:00
soupette
f22d20e61b Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 16:13:02 +02:00
cyril lopez
e895ac5ef5
Merge pull request #10789 from strapi/core/build-helper 
Build helper plugin using webpack.
 2021-08-24 15:52:53 +02:00
soupette
055c3d5bba Remove old component 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 15:51:34 +02:00
cyril lopez
87c93b19d6
Merge pull request #10661 from strapi/improve-bundle 
Proposal load plugins when needed
 2021-08-24 15:18:08 +02:00
soupette
d986ed9c97 Remove rollup 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 15:12:49 +02:00
soupette
b5bfac5ab2 Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 15:12:49 +02:00
soupette
fc9b84166b Migrated LoadingIndicatorPage component to new DS 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 15:12:48 +02:00
soupette
3468cbfa35 Fix tests 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 15:12:48 +02:00
soupette
21e18660eb Fix CM hook api and temporarily display the cm in the admin panel 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 15:12:48 +02:00
cyril lopez
d55df4fc8f
Merge pull request #10754 from strapi/migration/forgot-password 
DS Migration : Auth pages (Forgot/reset password, Oops page)
 2021-08-24 15:11:04 +02:00
soupette
8cc31618b3 Merge branch 'releases/v4' of github.com:strapi/strapi into improve-bundle 2021-08-24 15:08:34 +02:00
HichamELBSI
971f30f897 Fix test mock 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-08-24 14:22:22 +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
HichamELBSI
8b982f3822 Merge branch 'v4/ds-migration' into migration/forgot-password 2021-08-24 13:32:53 +02:00
HichamELBSI
9789deed73 Add tests & default messages 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-08-24 13:30:42 +02:00
Alexandre Bodin
8972d78e8d v3.6.8 v3.6.8 2021-08-24 11:00:41 +02:00
Alexandre BODIN
e69ab291d5
Merge pull request #10766 from strapi/feature/socialLogos 
Update Landing page social links
 2021-08-24 10:54:37 +02:00
Alexandre BODIN
40ce999645
Merge pull request #10747 from mikebolt/master 
fix grammar
 2021-08-24 10:47:09 +02:00
Alexandre BODIN
9648ac1729
Merge pull request #10787 from strapi/fix/10776 
Fix blocked users being able to sign in using forgot password
 2021-08-24 10:45:04 +02:00
Alexandre Bodin
d598cfaf71 Use same error format 2021-08-24 10:14:42 +02:00
Alexandre BODIN
c72d0a651a
Merge pull request #10786 from strapi/v4/v3-cleanup 
Start to do some cleanup
 2021-08-24 09:39:52 +02:00
Derrick Mehaffy
c1329f2284 Fix blocked users being able to sign in using forgot password 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2021-08-23 15:11:15 -07:00
Alexandre Bodin
0b3c7392c6 Keep on migrating admin to new structure 2021-08-23 22:41:22 +02:00
Alexandre Bodin
47c3900c07 Update createContentType to expose a simpler object 2021-08-23 22:25:31 +02:00
Alexandre Bodin
5f1dc39c65 More cleanup 2021-08-23 22:12:29 +02:00
Alexandre Bodin
56600eca2a Move admin lifecycle functions and rename models to content-types 2021-08-23 22:04:15 +02:00
Alexandre Bodin
3de76e484c Start to do some cleanup 2021-08-23 21:50:13 +02:00
Alexandre BODIN
eedab35068
Merge pull request #10784 from strapi/v4/fix/reload 
fix bad reloading when UP JWT was written in .env
 2021-08-23 19:42:16 +02:00
Pierre Noël
b592b855a3 fix bad reloading when UP JWT was written in .env 2021-08-23 19:26:13 +02:00
Alexandre Bodin
5d7e6cdc67 Put modelType back 2021-08-23 18:41:07 +02:00
Mark Kaylor
4e7afbd0da start fix for generate api in ctb 2021-08-23 18:23:21 +02:00
Alexandre Bodin
fd255077e3 Fix merge conflicts 2021-08-23 16:45:44 +02:00
markkaylor
b1ff616fd5 add generators to cli (#10779) 
* add generators to cli

* add strapi generate comment

* remove old generators

* rename generator-cli -> generate

* list generators alphabetically

* update package description

* add check for strapi app in cwd
 2021-08-23 16:17:54 +02:00
Rémi de Juvigny
439103e4cf Add API plop generator (#10769) 2021-08-23 16:11:37 +02:00
Mark Kaylor
ef028c983d move dot files to files folder 2021-08-23 16:11:37 +02:00
Mark Kaylor
10bf5d3987 add plugin generator 2021-08-23 16:11:37 +02:00