yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 09:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,862 Commits 115 Branches 488 Tags
Commit Graph

12862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derrick Mehaffy
227388ac62
Add note that migration script for beta.19 to beta.20 is only for Mongo 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-17 02:38:44 -07:00
Jim LAURIE
a20fb4a5a1
Merge pull request #5843 from strapi/docs/gcp_deploy 
Re-add Google App Engine deployment docs
 2020-04-17 10:51:38 +02:00
Derrick Mehaffy
2e48e54f54
Re-add Google App Engine deployment docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-17 01:46:04 -07:00
Convly
183ef9f6ee Add warning about consequences of renaming models.settings.json files & globalId 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-04-16 17:02:26 +02:00
Alexandre Bodin
9d8944ebfe v3.0.0-beta.20 v3.0.0-beta.20 2020-04-16 15:10:53 +02:00
Alexandre BODIN
8675eae144
Merge pull request #5826 from strapi/develop 
Release beta.20
 2020-04-16 14:31:38 +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
Alexandre BODIN
d718888832
Merge pull request #5815 from epegzz/master 
Fix email confirmation redirect
 2020-04-16 13:16:26 +02:00
cyril lopez
46e5287ba1
Merge pull request #5824 from strapi/chore/fix-ui-issues 
Fix front-end issues
 2020-04-16 13:16:10 +02:00
cyril lopez
cc9398cbff
Merge branch 'develop' into chore/fix-ui-issues 2020-04-16 12:51:35 +02:00
cyril lopez
b10c81b339
Merge pull request #5825 from strapi/fix/deselect-not-allowed-files 
Allow deselect files
 2020-04-16 12:50:22 +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
b9115e4b67
Merge pull request #5750 from strapi/features/media-lib 
[Feature] Media library
 2020-04-16 11:02:15 +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
cyril lopez
89af73ca14
Merge pull request #5819 from strapi/media-lib/fix-select-all 
Fix toggle all
 2020-04-16 10:34:37 +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
cyril lopez
0c2cce5885
Merge pull request #5811 from strapi/fix/thumb-preview 
Fix/thumb preview
 2020-04-16 09:29:33 +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
cyril lopez
92f42a9e40
Merge pull request #5807 from strapi/media-lib/listview-pagination 
ML fix pagination count
 2020-04-15 17:22: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
Alexandre Bodin
d4058b25aa Fix typos 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-15 17:07:19 +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
Alexandre BODIN
1be24385a1
Merge pull request #5803 from strapi/core/custom-webpack 
Allow custom webpack config
 2020-04-15 16:33:06 +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
cyril lopez
ebd20c9d5a
Merge pull request #5784 from strapi/media-lib/front-fix 
Media lib front fixes
 2020-04-15 14:40:04 +02:00
Ky
7be8dbf1dd apply pr review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-15 14:34:19 +02:00