15371 Commits

Author SHA1 Message Date
soupette
2676113a89 Fix lint
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-06 11:42:15 +01:00
soupette
8a8929e97c v3.0.0-beta.19.3 v3.0.0-beta.19.3 2020-03-06 10:02:36 +01:00
cyril lopez
9d155b35c8
Merge pull request #5440 from MattieBelt/fix/5439
Fix/5439
2020-03-06 10:00:23 +01:00
cyril lopez
06ba800a1b
Merge branch 'master' into fix/5439 2020-03-06 09:59:28 +01:00
Alexandre BODIN
29dbf11042
Merge pull request #5436 from strapi/fix/boom-middleware
Fix boom middleware logging < 500
2020-03-06 09:50:21 +01:00
soupette
12d12fbf08 Merge branch 'core/admin-field-api' of github.com:strapi/strapi into core/admin-field-api 2020-03-06 09:20:31 +01:00
soupette
2eef042ffd Fix PR feedback
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-06 09:11:48 +01:00
Pierre Noël
c0d9dd26d1 Fix findOne with PK as one of the params
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
2020-03-06 09:08:20 +01:00
Mattias van den Belt
0f9a912aca Revert excludeEmptyString option
Signed-off-by: Mattias van den Belt <mattias@taskhero.nl>
2020-03-06 08:54:03 +01:00
MattieBelt
01579c21a1 Update strapi-utils yup v0.28.1
Signed-off-by: Mattias van den Belt <mattias@taskhero.nl>
2020-03-06 08:52:16 +01:00
MattieBelt
43e8a65957 Fixes #5439
Signed-off-by: MattieBelt <mattias@taskhero.nl>
Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
2020-03-05 23:50:23 +01:00
MattieBelt
1703beff8e Fixes #5439
Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
2020-03-05 23:50:23 +01:00
Alexandre Bodin
8e93b864d2 Merge branch 'fix/boom-middleware' of github.com:strapi/strapi into fix/boom-middleware 2020-03-05 20:17:19 +01:00
Alexandre Bodin
50eb322d2d Add message when necessary
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-05 20:17:07 +01:00
Dimitris
d80d7b593e fixes typo on mongo image
Signed-off-by: Dimitrios Strantsalis <dstrants@gmail.com>
2020-03-05 21:06:18 +02:00
Alexandre BODIN
a17352f64b
Merge branch 'master' into fix/boom-middleware 2020-03-05 19:18:38 +01:00
Virginie Ky
b69d3f807d Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-05 19:18:35 +01:00
Alexandre BODIN
635795d424
Merge pull request #5432 from strapi/fix/plugin-generator
Fix plugin generator
2020-03-05 19:16:52 +01:00
Alexandre BODIN
f7530da383
Merge branch 'master' into fix/boom-middleware 2020-03-05 19:15:34 +01:00
Alexandre Bodin
10e85d6038 Fix boom middleware logging < 500 errors and delete message when not necessary
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-05 19:07:12 +01:00
Nazır Doğan
666b3c6ed8 fix typo
Signed-off-by: Nazir Dogan <nazrdogan@gmail.com>
2020-03-05 20:21:19 +03:00
virginieky
f3bfdb40fb
Merge pull request #5381 from strapi/front/img-preview
Media library - Card component & Card img wrapper
2020-03-05 18:03:45 +01:00
virginieky
2634d0ace8
Merge branch 'features/media-lib' into front/img-preview 2020-03-05 17:59:22 +01:00
ScottAgirs
7e4a892772 Merge branch 'patch-1' of https://github.com/ScottAgirs/strapi into patch-1
Signed-off-by: ScottAgirs <scott@ijs.to>
2020-03-05 11:51:01 -05:00
ScottAgirs
8939471aec Merge branch 'patch-1' of https://github.com/ScottAgirs/strapi into patch-1 2020-03-05 11:49:23 -05:00
ScottAgirs
0a7c75d859 Typofix
Signed-off-by: ScottAgirs <scott@ijs.to>
2020-03-05 11:44:18 -05:00
soupette
5909b2c222 Merge branch 'features/media-lib' of github.com:strapi/strapi into core/admin-field-api
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-05 17:41:54 +01:00
ScottAgirs
657a9f3322 Typofix
Signed-off-by: ScottAgirs <scott@ijs.to>
2020-03-05 11:41:39 -05:00
soupette
8359ab3430 Merge branch 'features/media-lib' of github.com:strapi/strapi into core/admin-field-api
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-05 17:41:14 +01:00
Scott Agirs
9d7a267f41 Typofix
convetion > convetion

Signed-off-by: ScottAgirs <scott@ijs.to>
2020-03-05 11:40:44 -05:00
soupette
86876cff00 Fix plugin generator
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-05 17:40:40 +01:00
soupette
e34aa517db Created a new guide about the Field API
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-05 17:32:53 +01:00
cyril lopez
268fa19f0c
Merge pull request #5354 from strapi/front/media-library-filter
Media library Filters
2020-03-05 17:32:31 +01:00
soupette
d1de5f588d Add documentation
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-05 17:04:42 +01:00
Virginie Ky
0deb976d81 code review
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-05 17:02:50 +01:00
Virginie Ky
1ea86fb158 search query with state
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-05 16:51:42 +01:00
Jim LAURIE
abdbb4adb3
Merge pull request #5336 from pouyamiralayi/patch-4
Update frontend-development.md
2020-03-05 16:24:33 +01:00
soupette
307fcb5b41 Merge branch 'features/media-lib' of github.com:strapi/strapi into core/admin-field-api 2020-03-05 16:21:46 +01:00
soupette
4355464954 Remove JSON from field api
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-05 16:21:36 +01:00
Virginie Ky
aaead39d38 homepage reducer unit tests and some code review apply
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-05 16:13:44 +01:00
Jim LAURIE
501d9a9211
Merge pull request #5222 from strapi/docs/awsURLs
Add documentation reference for AWS SES URLs
2020-03-05 15:37:25 +01:00
Jim LAURIE
e718947657
Merge branch 'master' into docs/awsURLs 2020-03-05 15:37:01 +01:00
Virginie Ky
8f24f1537c Merge branch 'features/media-lib' of github.com:strapi/strapi into front/img-preview 2020-03-05 15:15:04 +01:00
virginieky
7583b035a9
Merge branch 'features/media-lib' into front/media-library-filter 2020-03-05 14:48:55 +01:00
soupette
d50b8c5fed Add JSON input to the available fields 2020-03-05 14:44:55 +01:00
soupette
3f8a487fab Created field API and added it to the content manager
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-05 14:43:00 +01:00
Virginie Ky
c250984631 todo comment for file types api
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-05 14:40:17 +01:00
Alexandre Bodin
e1a7074a4e Merge branch 'develop' into features/media-lib 2020-03-05 14:39:29 +01:00
Virginie Ky
0efc25bb90 img description as text compo
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-05 14:38:51 +01:00
Virginie Ky
1bac7e3d87 Code review apply
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-05 14:34:05 +01:00