15371 Commits

Author SHA1 Message Date
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
Alexandre BODIN
53061dad7c
Merge pull request #5242 from 7mioda/strap-plugin-upload-file-size-comparaison-issue#5233
fix(plugin-upload): size limit comparison issue
2020-02-26 10:08:16 +01:00
Alexandre BODIN
e06e8ee2fd
Merge branch 'master' into strap-plugin-upload-file-size-comparaison-issue#5233 2020-02-26 09:47:22 +01:00
Alexandre Bodin
3e0fa37669 Update yarn lockfile
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-02-26 09:46:54 +01:00
Alexandre BODIN
5c3420a0fc
Merge pull request #5308 from strapi/docs/requests
Added information about body and files to request docs
2020-02-26 09:42:40 +01:00
soupette
23710b5fc2 Update Buffet.js so we can test the single types feature
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-26 08:05:37 +01:00
Gambhiro
ba6520a00e upd 2020-02-26 07:00:21 +00:00
Gambhiro
0dc06354c9
Update docs/3.0.0-beta.x/guides/deployment.md
Co-Authored-By: João Belo <joaobelo.dev@gmail.com>
2020-02-26 06:52:39 +00:00
Virginie Ky
83fb72736f 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 03:34:04 +01:00
Virginie Ky
53defe021e coma automatically removed in merge
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-25 22:49:53 +01:00
Virginie Ky
ba23fa4cf8 fix lint
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-25 22:12:03 +01:00
Virginie Ky
45c8deac4d 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-25 22:09:01 +01:00
HichamELBSI
e450d3613b Add UID in CTM
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
2020-02-25 21:44:02 +01:00
Virginie Ky
28a91e8a21 Merge branch 'front-media-lib-search' of github.com:strapi/strapi into front-media-lib-search 2020-02-25 21:35:07 +01:00
Virginie Ky
0fc0783770 handleChange as a single function
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-25 21:34:22 +01:00
virginieky
85cf0468d1
Merge branch 'features/media-lib' into front-media-lib-search 2020-02-25 21:16:52 +01:00
Virginie Ky
9f354b05bb apply PR review
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-02-25 21:15:26 +01:00
Edaly Ahmed
899ecb32a5 Signed-off-by: Edaly Ahmed <ahmed.edaly@oyez.fr>
removing unecessary cast
2020-02-25 20:11:53 +01:00
Alexandre Bodin
5c4151c8d8 Add single type endpoint doc
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-02-25 18:13:24 +01:00
cyril lopez
5a17ffe17f
Merge pull request #5316 from strapi/features/media-lib-compo-enhancement
Use theme in backbutton
2020-02-25 16:39:36 +01:00
soupette
994afe14ed Use theme in backbutton
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-02-25 16:00:24 +01:00
cyril lopez
93e72c4d2d
Merge pull request #5307 from strapi/features/media-lib-crop-new-asset
Media lib edit file
2020-02-25 15:13:21 +01:00