Alexandre Bodin
|
b3e18e1de6
|
v3.0.0-beta.19.2
v3.0.0-beta.19.2
|
2020-03-05 14:32:42 +01:00 |
|
soupette
|
267cc069e3
|
Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-03-05 14:26:00 +01:00 |
|
cyril lopez
|
0f1d1ad627
|
Merge pull request #5425 from strapi/chore/improve-left-menu
Fix menu scrollbar feedback from designer
|
2020-03-05 14:23:52 +01:00 |
|
cyril lopez
|
7e29328ed8
|
Merge branch 'master' into chore/improve-left-menu
|
2020-03-05 14:22:52 +01:00 |
|
ELABBASSI Hicham
|
d4c10a9839
|
Merge pull request #5427 from strapi/fix/5424
Fixes #5424
|
2020-03-05 14:20:19 +01:00 |
|
soupette
|
e9063f1a6d
|
Fix scrollbar and alignment
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-03-05 14:15:46 +01:00 |
|
Alexandre Bodin
|
c722b0db00
|
Implement file replace
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
|
2020-03-05 13:51:15 +01:00 |
|
soupette
|
d1acb7df39
|
Fixes #5424
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-03-05 13:38:04 +01:00 |
|
ELABBASSI Hicham
|
9502b3ab67
|
Merge pull request #5423 from strapi/features/media-lib-add-file-infos
Add file info
|
2020-03-05 13:35:04 +01:00 |
|
soupette
|
02dc3640d8
|
Fix PR feedback
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-03-05 12:15:11 +01:00 |
|
soupette
|
9d25a0167d
|
Fix menu scrollbar feedback from designer
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-03-05 12:11:28 +01:00 |
|
Virginie Ky
|
d425afd90b
|
code review
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-03-05 11:21:23 +01:00 |
|
soupette
|
4855f244bc
|
Add file info
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-03-05 10:56:05 +01:00 |
|
Alexandre Bodin
|
7cd34b725a
|
wip
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
|
2020-03-05 10:29:08 +01:00 |
|
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 |
|