yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-24 16:04:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 125 Branches 497 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Convly
98b5b4a029 GraphQL Aggregation: Remove required marker when checking for number types (int/float) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-30 16:45:00 +02:00
Alexandre BODIN
4ebcd12f7c
Merge pull request #5627 from strapi/fix/#3409/relationTablesCantHaveLongNames 
improve joinTable customization + test collectionName duplicates
 2020-03-30 16:41:51 +02:00
HichamELBSI
0b7872e0a8 Add Drop file into input media 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-30 16:40:46 +02:00
HichamELBSI
1276bf9767 Add input allowed types in filters 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-30 16:40:03 +02:00
cyril lopez
a97b884ac7
Merge pull request #5628 from strapi/media-lib/cm-finalization 
Input file Actions
 2020-03-30 16:26:15 +02:00
HichamELBSI
332fce9e49 Format file id 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-30 16:24:40 +02:00
Alexandre Bodin
b3a6114328 Defer pulibc and uplaod middlewares 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 16:05:29 +02:00
Alexandre Bodin
5a259ddf41 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 16:00:24 +02:00
Virginie Ky
7917b163c4 apply PR review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-30 15:58:03 +02:00
Virginie Ky
7f7542a5ca homepage reducer unit test 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-30 15:54:11 +02:00
Pierre Noël
1535735eb6 Merge branch 'master' into fix/#3409/relationTablesCantHaveLongNames 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-30 15:42:08 +02:00
Virginie Ky
911285bf84 PR review apply and pagination default value 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-30 15:23:32 +02:00
Virginie Ky
0b1b3f2a59 pagination default value 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-30 15:19:17 +02:00
Alexandre Bodin
24802af0e0 Merge branch 'master' into develop 2020-03-30 15:08:45 +02:00
Alexandre BODIN
7b50291353
Merge pull request #5444 from strapi/fix/#4881/cantDisableOrOverrideRootPage 
Add possibility to delete index.html + remove use of production.html
 2020-03-30 15:02:01 +02:00
Pierre Noël
9d7e78d528 remove useless use of stopWithError 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-30 15:02:01 +02:00
Alexandre BODIN
687673cd19
Merge pull request #5629 from strapi/chore/strapi-metrics 
Make strapi analytics simpler
 2020-03-30 14:51:27 +02:00
Alexandre Bodin
d60578c875 Update is truthy fn 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:51:03 +02:00
Alexandre Bodin
24000818f4 Add tests on middleware 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:51:03 +02:00
Alexandre Bodin
0888c3788b Add tests and avoid blocking in middleware 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:51:03 +02:00
Alexandre Bodin
5129a21d0b Cleanup unnecessary files 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:51:02 +02:00
Alexandre Bodin
a3d22e3f59 Move to strapi package directly 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:51:02 +02:00
Alexandre Bodin
86312ecbaf Add content-type kind property 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:50:45 +02:00
Alexandre Bodin
a8f909f4e3 Add dependencies 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:50:45 +02:00
Alexandre Bodin
6f2103a402 Init sender and middleware, ping 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:50:19 +02:00
Alexandre Bodin
6e3de95656 Init telemetry pkg 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:50:19 +02:00
Pierre Noël
ab79327577 move function checkDuplicatedTableNames in its own file 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-30 14:39:31 +02:00
Virginie Ky
6e060d18d8 PR review apply 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-30 14:13:11 +02:00
Pierre Noël
053714c7be refacto 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-30 12:50:48 +02:00
Virginie Ky
4fde5d4d63 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/front-fixes 2020-03-30 12:04:55 +02:00
Alexandre Bodin
50df7365d6 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 12:04:04 +02:00
Alexandre Bodin
1ff48a8e60 Merge branch 'master' into develop 2020-03-30 11:27:20 +02:00
HichamELBSI
fada750b28 Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-30 10:58:42 +02:00
HichamELBSI
da3347c50b Merge branch 'features/media-lib' into media-lib/cm-finalization 2020-03-30 10:21:55 +02:00
Alexandre Bodin
24bd311678 v3.0.0-beta.19.4 v3.0.0-beta.19.4 2020-03-30 09:57:05 +02:00
soupette
a41a1b1d8b Merge branch 'master' of github.com:strapi/strapi into develop 2020-03-30 09:56:26 +02:00
cyril lopez
c18f33ee02
Merge pull request #5624 from strapi/ml/fix-img-cache 
ML/fix img cache
 2020-03-30 09:54:57 +02:00
Casey Collins
4a3ebe619a
Changed add new entity button to just use getName for consistency (#5632) (#5633) 
Signed-off-by: Casey Collins <4412526+cacodev@users.noreply.github.com>
 2020-03-30 09:54:05 +02:00
Daniel Karski
3a24755873
Set searching by properties (#5623) 
Signed-off-by: Daniel Karski <daniel.karski@polidea.com>
 2020-03-30 09:52:38 +02:00
cyril lopez
0730d91094
Fixes #5570 (#5620) 
Signed-off-by: soupette <cyril.lpz@gmail.com>

Co-authored-by: virginieky <3142866+virginieky@users.noreply.github.com>
 2020-03-30 09:51:47 +02:00
David Ye
9ec7d9066e
Fix typo (#5596) 2020-03-30 09:51:14 +02:00
Aviskar KC
ac1ade9073
Fix the button name for configuring layout in docs (#5390) 
Signed-off-by: Aviskar KC <aviskarkc10@gmail.com>
 2020-03-30 09:49:47 +02:00
soupette
ec5e960758 Fix tests labels 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-30 09:49:12 +02:00
soupette
123704024c Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-30 07:43:15 +02:00
soupette
32266e042c Merge branch 'features/media-lib' of github.com:strapi/strapi into ml/fix-img-cache 2020-03-30 07:42:01 +02:00
HichamELBSI
b4dd5ef7f5 Merge branch 'features/media-lib' into media-lib/cm-finalization 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-29 17:10:20 +02:00
Chinh Do
de97f68b85 Correct "content-type" to "collection type" in Quick Start Tutorial/Guide to match UI 
There needs to be a review of the docs. This pull request is intended to fix obvious incorrect
references that may confuse or frustrate people brand new to Strapi, trying to go through
the Quick Start Guide or Tutorial.

Change "content type" to "collection type" where appropriate

Signed-off-by: Chinh Do <cdo@vienxu.com>
 2020-03-28 13:18:59 -04:00
Virginie Ky
cec4875f43 play icon and size filter 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-28 14:13:20 +01:00
Virginie Ky
85409813f4 confirm on deleteAll cancel 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-28 13:35:56 +01:00
soupette
fb7e8f3db8 Fix fr trad for float and decimal 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 19:08:24 +01:00