12264 Commits

Author SHA1 Message Date
virginieky
a60a209234
Merge branch 'features/media-lib' into front/media-lib-filters 2020-02-27 15:08:03 +01:00
Virginie Ky
24c07727da Replace carret with buffet icon
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-27 14:39:10 +01:00
cyril lopez
e2d54bf907
Merge branch 'develop' into fix/ctm-related-redirect 2020-02-27 12:04:43 +01:00
cyril lopez
e397855a67
Merge pull request #5341 from strapi/fix/polymorphic-relation-ctm
Fix polymorphic relations in the content manager
2020-02-27 12:04:26 +01:00
soupette
4c8fc44832 Fix redirect url when navigating between views
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-27 11:56:27 +01:00
Virginie Ky
81cc30680a apply PR review
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-27 11:55:51 +01:00
soupette
caeeb97f7d Fixes #3247
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-27 11:35:35 +01:00
Virginie Ky
a6f73e0647 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/img-preview
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-27 11:33:27 +01:00
soupette
9c638f5351 Fixes #5053
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-27 11:20:04 +01:00
soupette
23746e8ad7 Handle side effects
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-27 10:55:24 +01:00
soupette
d9a05672fe Add tests
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-27 10:12:00 +01:00
soupette
6e3ca74aee Created settings page
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-27 09:53:50 +01:00
soupette
2f307a007e Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib 2020-02-27 08:28:59 +01:00
soupette
77e0e83b27 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-02-27 08:28:09 +01:00
Pouya Miralayi
6cde79bc3c
Update frontend-development.md 2020-02-27 01:23:01 +03:30
soupette
94bab08947 Update buffetjs dep
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-26 18:05:04 +01:00
Virginie Ky
235322f780 clean data model
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-26 17:59:40 +01:00
Virginie Ky
d796e16b77 clean data model
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-26 17:55:03 +01:00
Virginie Ky
357e197605 Merge branch 'front/media-lib-filters' of github.com:strapi/strapi into front/media-library-filter 2020-02-26 17:45:02 +01:00
cyril lopez
0bb347f79b
Merge pull request #5322 from strapi/single-types/uid-ctm
Add UID in CTM and fix Single types alignments
2020-02-26 17:40:00 +01:00
HichamELBSI
6821fe8d63 Fix PR feedbacks
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
2020-02-26 17:33:18 +01:00
Virginie Ky
87cbcc8f58 Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-lib-filters
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-26 17:32:07 +01:00
cyril lopez
54a36e6b36
Merge pull request #5290 from strapi/front-media-lib-search
Front Media lib search & sort by
2020-02-26 17:30:26 +01:00
Virginie Ky
efc34d5c20 sort button color as props
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-26 16:57:34 +01:00
Virginie Ky
87f32f3f71 Merge branch 'front/media-lib-filters' of github.com:strapi/strapi into front/media-library-filter 2020-02-26 16:23:29 +01:00
Virginie Ky
2d63d2015a Merge branch 'front-media-lib-search' of github.com:strapi/strapi into front/media-lib-filters
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-26 16:22:40 +01:00
Virginie Ky
6160e89475 SortButton as Text compo
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-26 16:19:25 +01:00
Alexandre Bodin
2568898eb6 Merge branch 'single-types/endpoint-doc' into features/single-types 2020-02-26 16:12:07 +01:00
Alexandre BODIN
b613c10e86
Merge pull request #5332 from strapi/single-types/migration-guide
Single types migration guide and policy doc update
2020-02-26 16:11:46 +01:00
Virginie Ky
8da7bd21a0 Merge branch 'front-media-lib-search' of github.com:strapi/strapi into front/media-lib-filters
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-26 15:58:02 +01:00
Virginie Ky
23e4ab38bd PR review
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-26 15:52:19 +01:00
Virginie Ky
22cd052a90 sortlistitem extract
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-26 15:50:12 +01:00
Virginie Ky
5dee34b4c4 Filter size UI and default values
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-26 15:07:47 +01:00
HichamELBSI
e8b9017219 Merge branch 'features/single-types' into single-types/uid-ctm 2020-02-26 14:56:27 +01:00
HichamELBSI
ff870e7aa0 Merge branch 'develop' into features/single-types 2020-02-26 14:54:33 +01:00
HichamELBSI
48f5c5f418 Fix PR feedbacks 2020-02-26 14:53:32 +01:00
ELABBASSI Hicham
721ec829ae
Merge pull request #5327 from strapi/admin/update-buffetjs
Update Buffet.js dependency
2020-02-26 14:49:13 +01:00
Alexandre BODIN
6b9e19d9a7
Merge pull request #5294 from sanvit/patch-1
edited some minor typos
2020-02-26 14:32:03 +01:00
virginieky
db69b50662
Merge branch 'develop' into admin/update-buffetjs 2020-02-26 14:31:16 +01:00
Alexandre BODIN
c16a0a8241
Merge pull request #5320 from MattieBelt/docs/extend-service
Update docs about Extending a Model Service
2020-02-26 14:30:54 +01:00
Alexandre BODIN
d5de85e58f
Merge branch 'master' into docs/extend-service 2020-02-26 14:29:40 +01:00
Alexandre Bodin
fe5edf52bb Update policy documentations and add migration guide
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-02-26 13:39:05 +01:00
MattieBelt
0a22790e7b Fix 'Extending a Model Service' docs (create & update)
Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
2020-02-26 13:11:12 +01:00
Alexandre Bodin
3bcbde8f0b v3.0.0-beta.18.8 v3.0.0-beta.18.8 2020-02-26 12:01:37 +01:00
Alexandre Bodin
ab2aab4cd5 Init migration guide
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-02-26 12:01:04 +01:00
Virginie Ky
2dac5e4141 Merge branch 'front/media-lib-filters' of github.com:strapi/strapi into front/media-library-filter
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-26 11:27:06 +01:00
Virginie Ky
cfc4473c6e Merge branch 'front-media-lib-search' of github.com:strapi/strapi into front/media-lib-filters
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-26 11:25:03 +01:00
Virginie Ky
b244d565c5 Apply PR review
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-26 11:10:23 +01:00
Virginie Ky
301893cb5e remove filter
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-26 10:44:27 +01:00
Alexandre Bodin
2a0becb9b0 Merge branch 'master' into develop
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-02-26 10:12:25 +01:00