yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-09 23:31:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,206 Commits 104 Branches 503 Tags
Commit Graph

13206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
soupette
e1f47b16e2 Use theme for bkg color 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-25 15:12:55 +01:00
Virginie Ky
7bc9b987f7 Filter button with translation 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-25 14:40:52 +01:00
soupette
795f4758ab Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-25 14:38:35 +01:00
soupette
94e7a3f5fc Add delete logic 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-25 14:35:48 +01:00
cyril lopez
e868dd93b8
Merge pull request #5243 from strapi/front/checkbox-description 
Realign DOM
 2020-02-25 13:04:30 +01:00
soupette
bfe923b1ee Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-25 13:01:56 +01:00
soupette
1f7f035da4 Add infos size box to cropper 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-25 09:45:42 +01:00
ELABBASSI Hicham
da7ebced8d
Merge pull request #5286 from strapi/single-types/uid 
add Uid attributes in CTB
 2020-02-25 09:05:24 +01:00
Edaly Ahmed
129edd66ee Signed-off-by: Edaly Ahmed <ahmed.edaly@oyez.fr> 
adding getConfig service and casting params before updating database
 2020-02-24 17:51:39 +01:00
soupette
de2946bae3 Rename compo 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 17:29:15 +01:00
soupette
351d15917e Add file size infos 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 17:27:34 +01:00
soupette
1a1f10e09b Add tests to reducer 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-24 16:47:31 +01:00
Derrick Mehaffy
a5a48d8348
Added information about body and files to request docs 
These paths to body and files differ from Koa's typical pathing, adding them to the docs temporarily until the docs are reworked.
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-02-24 08:34:04 -07:00
soupette
9abb0e6d7f Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-crop-new-asset 2020-02-24 16:25:29 +01:00
cyril lopez
48589b4b84
Merge pull request #5272 from strapi/features/media-lib-settings 
Media library settings api update
 2020-02-24 16:25:13 +01:00