12862 Commits

Author SHA1 Message Date
Long Nguyen
77e243f841 Refactor code convert GraphQL params to ORM conditions
Signed-off-by: Long Nguyen <olragon@gmail.com>
2020-03-31 16:01:39 +02:00
Long Nguyen
634592fb5b fix: GraphQL Aggregation Bookshelf where condition aren't applied to groupBy
Signed-off-by: Long Nguyen <olragon@gmail.com>
2020-03-31 16:01:39 +02:00
cyril lopez
72730fe9d1
Merge pull request #5660 from strapi/ml/quick-fix
Fix fetch error
2020-03-31 14:56:22 +02:00
soupette
de61549087 Fix fetch error
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-31 14:46:54 +02:00
Alexandre Bodin
168ceefa87 Add same filter logic to file count
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-31 14:32:00 +02:00
Ky
74c9caca66 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/front-fixes 2020-03-31 12:21:42 +02:00
Alexandre Bodin
ae143ef627 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib 2020-03-31 11:58:40 +02:00
Alexandre Bodin
087920fb47 Merge branch 'develop' into features/media-lib
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-31 11:58:31 +02:00
Ky
b5f930d3fa Unit tests and remove useDeepCompare hook
Signed-off-by: Ky <virginie.ky@gmail.com>
2020-03-31 11:57:03 +02:00
ELABBASSI Hicham
b2edf281e2
Merge pull request #5658 from strapi/media-lib/add-empty-view-results
Add empty view with filters
2020-03-31 11:55:16 +02:00
soupette
f62785e4cd Add empty view with filters
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-31 11:25:26 +02:00
HichamELBSI
f66804e780 Merge branch 'master' into develop 2020-03-31 10:27:55 +02:00
ELABBASSI Hicham
437d35aff8
Merge pull request #5649 from strapi/media-lib/content-manager
Drop files in input file
2020-03-31 10:25:02 +02:00
HichamELBSI
aeff7869aa Fix PR review 2020-03-31 10:05:13 +02:00
Chinh Do
a9ae7e24c2
Merge branch 'master' into fix/5555-quickStartGuide 2020-03-30 19:37:38 -04:00
Ky
41987c5c79 refetch on filter delete
Signed-off-by: Ky <virginie.ky@gmail.com>
2020-03-31 00:18:27 +02:00
Ky
8b0f4bb994 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/front-fixes
Signed-off-by: Ky <virginie.ky@gmail.com>
2020-03-30 23:00:49 +02:00
Ky
d9e7fd8087 modal list alignment
Signed-off-by: Ky <virginie.ky@gmail.com>
2020-03-30 22:54:55 +02:00
Virginie Ky
8674ed3576 filters
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-30 22:13:49 +02:00
Alexandre Bodin
f7a8d06f54 Add docker-compose.dev file to easily work with different databases in dev mode
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Remove old files not used anymore

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Added info about conflict with local db instances and how to change port configurations

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Fix typos

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-30 19:05:31 +02:00
HichamELBSI
210bb4985a Fix PR review
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
2020-03-30 18:49:49 +02:00
HichamELBSI
592e44bd43 Finalize content manager media lib 2020-03-30 17:18:10 +02:00
Convly
67187c38f2 Rename _type to type and type to nonRequiredType
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
2020-03-30 16:45:00 +02:00
Convly
1103d96500 Rename noRequired to nonRequired
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
2020-03-30 16:45:00 +02:00
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