yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 23:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,705 Commits 138 Branches 514 Tags
Commit Graph

8874 Commits

Author SHA1 Message Date
Pierre Noël
40df780663 remove console.log 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-20 15:20:56 +02:00
Pierre Noël
134fba1229 rename DEFAULT_PERMISSIONS 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-20 15:19:12 +02:00
Pierre Noël
ddc5bb5ac3 fix missing permissions at startup 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-20 15:19:11 +02:00
virginieky
259d2d90e1
Merge branch 'master' into upgrade/reactstrap 2020-04-20 10:29:58 +02:00
Alexandre BODIN
d55da7d9e5
Merge pull request #5853 from epegzz/master 
Fix AWS SES not working in eu-central-1 region
 2020-04-20 09:28:30 +02:00
Leon
beb6e74f80
typo fixes (#5795) 
Signed-off-by: ierehon1905 <ierehon1905@gmail.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-04-17 17:10:31 +02:00
cyril lopez
db39065c0c
Merge branch 'master' into upgrade/reactstrap 2020-04-17 16:59:15 +02:00
Marvin König
4e70d6665c
Fix relation detection for components (#5713) 
This fixes the deleteOldComponents function in the
strapi-connector-mongoose package. This needs to be done, as the id can
be either a string or a Buffer at this point.

Signed-off-by: Marvin König <dev@mkqavi.com>
 2020-04-17 16:51:25 +02:00
Alexandre BODIN
29f5d299f6
Fix rackspace upload to use hash (#5855) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-17 16:38:46 +02:00
Daniel
b89eed3beb Fix AWS SES not working in eu-central-1 region 
Signed-off-by: Daniel <epegzz@gmail.com>
 2020-04-17 15:06:50 +02:00
soupette
bf1040f9b9 Upgrade reactstrap dependency. Fixes #5837 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-17 14:00:53 +02:00
cyril lopez
a82e999e88
Merge branch 'master' into enhancement/usage 2020-04-17 13:09:44 +02:00
Aurélien Georget
06f9561f86 Check package manager 
Signed-off-by: Aurélien Georget <aurelsicoko@gmail.com>
 2020-04-17 12:42:02 +02:00
Aurélien Georget
bc9ba3d2a7 Add events to improve installation process 
Signed-off-by: Aurélien Georget <aurelsicoko@gmail.com>
 2020-04-17 12:42:02 +02:00
soupette
68fc1e2bed Fix register new fields in content manager 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-17 12:01:55 +02:00
Alexandre BODIN
771325f691
Merge pull request #5716 from strapi/fix/5564 
Fixes #5564
 2020-04-17 11:50:19 +02:00
Alexandre Bodin
9d8944ebfe v3.0.0-beta.20 2020-04-16 15:10:53 +02:00
Alexandre Bodin
94dbf10adc Merge branch 'master' into develop 2020-04-16 14:05:23 +02:00
soupette
5d57fcc1b5 Fix date display in ctm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-16 13:56:07 +02:00
soupette
2b8cae78c6 Fix date display 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-16 13:46:36 +02:00
cyril lopez
cc9398cbff
Merge branch 'develop' into chore/fix-ui-issues 2020-04-16 12:51:35 +02:00
HichamELBSI
2f7f9f5f25 Allow deselect files 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-16 12:43:55 +02:00
soupette
8b443e179a Merge branch 'develop' of github.com:strapi/strapi into chore/fix-ui-issues 2020-04-16 12:00:42 +02:00
soupette
8ddf955af2 Fixes #5781 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-16 12:00:26 +02:00
soupette
0e3fdfc0ca Change format in input file 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-16 11:52:51 +02:00
soupette
873f810099 Fixes #5771 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-16 11:32:24 +02:00
soupette
eab4312b82 Fixes #5805 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-16 11:13:38 +02:00
Alexandre Bodin
b44a57d408 Use path.extname if mime-type doesnt find extension 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-16 10:50:18 +02:00
HichamELBSI
bbd4fcb7e3 Fix toggle all 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-16 10:29:25 +02:00
HichamELBSI
0c3f402b70 Fix snapshot 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-16 10:18:08 +02:00
Alexandre Bodin
506811f198 Add some doc for maxFielSize 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-16 10:04:36 +02:00
soupette
535c449aa7 Merge branch 'features/media-lib' of github.com:strapi/strapi into fix/thumb-preview 2020-04-16 09:27:24 +02:00
Daniel
f56158b684 Fix email confirmation redirect which got broken in #5580 
Signed-off-by: Daniel <epegzz@gmail.com>
 2020-04-15 22:25:27 +02:00
cyril lopez
67b3a8418f
Merge pull request #5809 from strapi/fix/link-ml-plugin 
Remove useless link in installed plugins
 2020-04-15 19:41:14 +02:00
soupette
0d01faba77 Enable edit media webhook 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-15 19:30:39 +02:00
soupette
a61b397bb5 Merge branch 'features/media-lib' of github.com:strapi/strapi into fix/thumb-preview 2020-04-15 19:21:53 +02:00
soupette
e6dd1a73b4 Fix thumbnail preview 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-15 19:21:24 +02:00
Alexandre Bodin
e8bac9c9a9 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib 2020-04-15 19:15:26 +02:00
Alexandre Bodin
7123f68737 Allow to create the media.update webhook + fix default width and height 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-15 19:15:21 +02:00
virginieky
94eca0a21e
Merge pull request #5810 from strapi/media-lib/cm-delete-file 
Fix input media delete
 2020-04-15 19:04:09 +02:00
Ky
82347ba913 fix input media delete 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-15 18:42:10 +02:00
soupette
c5d669c1da Remove useless link in installed plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-15 18:17:14 +02:00
soupette
3a0219033f Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-04-15 17:30:49 +02:00
cyril lopez
6ce046b71d
Merge pull request #5808 from strapi/fix/password-input 
Remove validations statement for input password
 2020-04-15 17:24:40 +02:00
soupette
73c4160d21 Remove validations statement for input password 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-15 17:19:23 +02:00
Ky
a09e92ea3a fix pagination count 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-15 17:01:14 +02:00
Ky
9b46ff9ce6 toString lodash import 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-15 16:48:34 +02:00
soupette
8a2580222f Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-15 15:03:53 +02:00
Alexandre Bodin
d615bf9b7f Fix svg and gif formatting 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-15 14:54:33 +02:00
soupette
8da7154e46 Fix copy link 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-15 14:41:08 +02:00