yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-06 05:44:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,325 Commits 106 Branches 501 Tags
Commit Graph

1659 Commits

Author SHA1 Message Date
Alexandre Bodin
5a259ddf41 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 16:00:24 +02:00
Alexandre Bodin
24802af0e0 Merge branch 'master' into develop 2020-03-30 15:08:45 +02:00
Alexandre Bodin
0888c3788b Add tests and avoid blocking in middleware 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:51:03 +02:00
Alexandre Bodin
86312ecbaf Add content-type kind property 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:50:45 +02:00
Alexandre Bodin
6f2103a402 Init sender and middleware, ping 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 14:50:19 +02:00
Alexandre Bodin
50df7365d6 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 12:04:04 +02:00
Alexandre Bodin
1ff48a8e60 Merge branch 'master' into develop 2020-03-30 11:27:20 +02:00
Alexandre Bodin
24bd311678 v3.0.0-beta.19.4 2020-03-30 09:57:05 +02:00
soupette
a41a1b1d8b Merge branch 'master' of github.com:strapi/strapi into develop 2020-03-30 09:56:26 +02:00
soupette
fb7e8f3db8 Fix fr trad for float and decimal 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-27 19:08:24 +01:00
soupette
3eb635380a Fix ctb allowed types 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 14:15:24 +01:00
soupette
7840578474 Fix ctb 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-26 13:50:45 +01:00
soupette
38b7823b34 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-26 08:01:22 +01:00
HichamELBSI
998bfa9360 Merge branch 'features/media-lib-frontend' into media-lib/cm-modal 2020-03-24 09:56:55 +01:00
Alexandre Bodin
e49caedd8e Merge branch 'master' into develop 2020-03-24 09:40:08 +01:00
HichamELBSI
f19fb580ec Update after review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-23 23:28:30 +01:00
Alexandre BODIN
ea77e6c8f9
Merge branch 'master' into fix/#3889/wrongPathGenerateModelInPlugin 2020-03-23 18:05:28 +01:00
soupette
818927f7b5 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-23 14:33:17 +01:00
soupette
18772c98b8 Merge branch 'master' of github.com:strapi/strapi into develop 2020-03-23 14:19:34 +01:00
Pierre Noël
74625b0ec7 remove strapi-utils from front + remove use of idPluralized 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 11:28:07 +01:00
Pierre Noël
be6517c02d refacto strapi-generate-* + move nameToSlug to strapi-utils 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 10:42:34 +01:00
Mattias van den Belt
f8023cc66c
Update Dutch Translation and Typos [NL] (#5523) 
* Update Dutch Translation

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Add new translation keys

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update strapi-admin translation [NL]

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Sort translation [NL]

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update dutch content-types translations

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

Co-authored-by: Nikolay Tyurin <kolya_tyurin@mail.ru>
 2020-03-20 17:10:55 +01:00
Virginie Ky
59c567aa3c clean numberOfVisibleItems prop 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 16:40:55 +01:00
virginieky
4392eaff7e
Merge branch 'develop' into front/ui-fixes 2020-03-20 14:05:40 +01:00
Alexandre Bodin
ed2b973b99 Merge branch 'develop' into features/media-lib 2020-03-20 11:04:10 +01:00
Virginie Ky
83b326e9a5 leftmenu alignment and border listbutton 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 09:19:43 +01:00
Pierre Noël
c3f011ddba Merge branch 'master' into fix/#4556/nullWhenRequiringAComponentInRelationGraphQl 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-16 15:49:59 +01:00
Alexandre Bodin
243085dae1 Merge branch 'develop' into features/media-lib 2020-03-13 15:40:11 +01:00
Shabith Ishan Thennakone
fe19bcb2ea removed text-transform from variable name 2020-03-13 14:51:32 +01:00
Pierre Noël
1227bfeba4 add possibility to set a relation "private" 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-13 12:23:11 +01:00
soupette
1686cc051f Fix select all 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-13 11:13:26 +01:00
soupette
4ab399af48 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-13 10:28:57 +01:00
soupette
bbc13eb27a Add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 17:41:27 +01:00
soupette
82cde9a194 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-ctb-option 2020-03-12 16:44:49 +01:00
soupette
083e18ec52 Add allowed types to ctb 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-12 16:44:36 +01:00
Alexandre Bodin
c4bf0cdb67 Add allowedTypes in media type meta 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-12 09:44:04 +01:00
Alexandre Bodin
32c021db37 Remove allowedType all option 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-12 09:29:01 +01:00
soupette
34bf5c43fa Merge branch 'features/media-lib' of github.com:strapi/strapi into chore/identify-doc-frontend-file-to-update 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 13:58:01 +01:00
soupette
f3bcddcf89 Identify front-end core files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 13:33:32 +01:00
Alexandre BODIN
d867e55533
Merge pull request #5430 from strapi/media-lib/upload-allowed-type 
Add Upload allowed type parameter and option to replace an image
 2020-03-06 13:28:45 +01:00
soupette
bdc2758613 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-06 11:44:20 +01:00
soupette
8a8929e97c v3.0.0-beta.19.3 2020-03-06 10:02:36 +01:00
Alexandre Bodin
e1a7074a4e Merge branch 'develop' into features/media-lib 2020-03-05 14:39:29 +01:00
Alexandre Bodin
b3e18e1de6 v3.0.0-beta.19.2 2020-03-05 14:32:42 +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
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 2020-03-04 18:42:31 +01:00
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +01:00
Alexandre Bodin
e222792181 v3.0.0-beta.19 2020-03-04 14:24:23 +01:00
soupette
7c12398df6 Fixes #5404 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 12:16:26 +01:00