14807 Commits

Author SHA1 Message Date
Alexandre Bodin
b084cb1c65 Return type list and mimeTypes for filters
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-05 10:29:08 +01:00
Alexandre Bodin
196160dc1c Add allowedType in ctb and init getMediaTypes api
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-05 10:29:07 +01:00
soupette
f1de079d77 Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-05 10:22:49 +01:00
cyril lopez
37d6a3464d
Merge pull request #5419 from wysher/feat/menu-scrollbars
Fit Left menu + scrollbars
2020-03-05 09:15:15 +01:00
Mariusz Wachowski
bfa0795d2c list of many relations with scrollbar
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
2020-03-04 21:27:09 +01:00
Mariusz Wachowski
7c8885d031 added custom scrollbar styles
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
2020-03-04 21:27:09 +01:00
Mariusz Wachowski
da328f7c96 fix: separate menu sections + fit sections to available space
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
2020-03-04 21:27:09 +01:00
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 v3.0.0-beta.19.1 2020-03-04 18:42:31 +01:00
Alexandre BODIN
634faa8333
Merge pull request #5395 from strapi/media-lib/upload-with-infos
Media lib/upload with infos
2020-03-04 18:40:55 +01:00
Alexandre BODIN
df7069a424
Merge pull request #5413 from strapi/fix/docs-migration-guide
Update migration guide
2020-03-04 18:34:49 +01:00
Alexandre BODIN
16c9327c3b
Merge branch 'master' into fix/docs-migration-guide 2020-03-04 18:34:40 +01:00
Alexandre BODIN
97e01f24f2
Merge pull request #5412 from strapi/fix/media-entity-validator
Fix entity validator for media
2020-03-04 18:33:58 +01:00
Alexandre BODIN
2bfcf1ca4d
Merge branch 'master' into fix/media-entity-validator 2020-03-04 18:32:40 +01:00
Alexandre BODIN
010e055a82
Merge pull request #5411 from strapi/fix/load-component
Fix component globalId
2020-03-04 18:32:24 +01:00
Alexandre BODIN
0c88357f70
Merge branch 'master' into fix/media-entity-validator 2020-03-04 18:32:03 +01:00
Alexandre Bodin
c9a81f6e98 Fix entity validator for media
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-04 18:30:53 +01:00
soupette
80cedb9014 Add fix for previous app using config.js override
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-04 17:46:55 +01:00
soupette
9dec284470 Update migration guide
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-04 17:39:40 +01:00
Virginie Ky
c6a577b2ff clean code
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-04 17:29:31 +01:00
Virginie Ky
14e7e07c23 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-library-filter
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-04 17:17:36 +01:00
Alexandre BODIN
1c58c447e0
Merge branch 'master' into fix/load-component 2020-03-04 17:11:58 +01:00
Alexandre BODIN
fa28037c48
Merge pull request #5400 from kubuntux/fix-selectwrapper-zindex3
Fix SelectWrapper stack order
2020-03-04 17:10:35 +01:00
Alexandre BODIN
76f550cb4a
Merge pull request #5396 from z1digitalstudio/fix/number-input
fix(EditViewDataManagerProvider): allow to reset number input
2020-03-04 17:10:02 +01:00
Virginie Ky
0301861f74 use Text compo
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-04 17:08:35 +01:00
Alexandre Bodin
823d87c2e9 Fix component globalId
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-04 17:07:02 +01:00
cyril lopez
38fab7f064
Merge pull request #5394 from strapi/features/media-lib-add-field-to-ctm
Features/media lib add field to ctm
2020-03-04 17:05:44 +01:00
Virginie Ky
dbcb66d98b Fetch data
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-03-04 15:46:02 +01:00
Scott Agirs
c63662cd29
Minor typo fixes 2020-03-04 09:19:49 -05:00
soupette
6efcd1c48f Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-add-field-to-ctm 2020-03-04 14:54:40 +01:00
soupette
d6bc4e1941 Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-04 14:52:29 +01:00
cyril lopez
9761cbe19a
Merge branch 'master' into fix-selectwrapper-zindex3 2020-03-04 14:39:04 +01:00
Alexandre Bodin
e222792181 v3.0.0-beta.19 v3.0.0-beta.19 2020-03-04 14:24:23 +01:00
Alexandre BODIN
bec2ce7b2e
Merge pull request #5405 from strapi/fix/issues
Fix/issues
2020-03-04 14:16:12 +01:00
soupette
3a49f51fa9 Merge branch 'master' of github.com:strapi/strapi into fix/issues 2020-03-04 13:13:35 +01:00
soupette
86d70aee39 Fix ctm table on safari and repeatable compo on firefox
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-04 13:11:06 +01:00
James Alvarez
3c75bcdf35 Merge branch 'master' into fix-selectwrapper-zindex3
Updated master from strapi/strapi
2020-03-04 19:55:36 +08:00
soupette
7c12398df6 Fixes #5404
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-04 12:16:26 +01:00
soupette
46a65a9185 Fix stepper and console errors
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-04 11:48:44 +01:00
Alexandre BODIN
c3a339f24b
Merge pull request #5403 from strapi/fix/uid-display
Fix uid display
2020-03-04 10:42:21 +01:00
soupette
88d9bfc2b2 Fix uid display
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-03-04 10:40:58 +01:00
Alexandre BODIN
611284bc02
Merge pull request #5195 from strapi/develop
Develop
2020-03-04 10:31:16 +01:00
Alexandre BODIN
604fc6d0ac
Merge pull request #5397 from strapi/fix/plugins-page
Fix baseline
2020-03-04 10:24:18 +01:00
Derrick Mehaffy
cc9d693f22
Add documentation reference for AWS SES URLs
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
2020-03-04 02:23:57 -07:00
cyril lopez
2bdd29fe1f
Merge branch 'develop' into fix/plugins-page 2020-03-04 10:18:17 +01:00
HichamELBSI
b5947621fc Merge branch 'master' into develop 2020-03-04 09:32:13 +01:00
Alexandre BODIN
378a11d146
Merge pull request #5382 from strapi/fix/single-type-modal-title
Fix/single type modal title
2020-03-04 09:11:28 +01:00
Alexandre BODIN
6b69c58581
Merge branch 'develop' into fix/single-type-modal-title 2020-03-04 09:11:16 +01:00
Alexandre BODIN
ed6595dab9
Merge pull request #5370 from nwaelkens/docs/broken-links
Updated links in docs to referenced document pages
2020-03-04 09:10:39 +01:00
Alexandre BODIN
9f8387d6a9
Merge branch 'master' into docs/broken-links 2020-03-04 09:10:31 +01:00
Alexandre BODIN
58d343ae76
Merge pull request #5383 from strapi/bookshelf/fixEnumTemp
Fix enumeration on SQL databases
2020-03-04 09:09:05 +01:00