12264 Commits

Author SHA1 Message Date
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
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