yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-24 16:04:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,883 Commits 125 Branches 497 Tags
Commit Graph

600 Commits

Author SHA1 Message Date
Virginie Ky
fe20425215 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-03-16 14:52:58 +01:00
Alexandre BODIN
9ab43d2c42
Merge branch 'master' into fix/#4901/findOneCantHaveMultipleParametersWhenThereIsAPK 2020-03-12 16:10:56 +01:00
virginieky
1698dfe98c Merge branch 'develop' into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-09 10:57:49 +01:00
Pierre Noël
b5ec9cb1c8 handle unexpected params from koa-router 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-06 19:16:51 +01:00
soupette
8a8929e97c v3.0.0-beta.19.3 2020-03-06 10:02:36 +01:00
Virginie Ky
b69d3f807d Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 19:18:35 +01:00
Alexandre Bodin
b3e18e1de6 v3.0.0-beta.19.2 2020-03-05 14:32:42 +01:00
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 2020-03-04 18:42:31 +01:00
Alexandre Bodin
e222792181 v3.0.0-beta.19 2020-03-04 14:24:23 +01:00
HichamELBSI
b5947621fc Merge branch 'master' into develop 2020-03-04 09:32:13 +01:00
soupette
3a695aeaac Merge branch 'develop' of github.com:strapi/strapi into chore/remove-saga-admin 2020-03-02 11:34:01 +01:00
soupette
ccc92b90a5 Add required info into the plugin object and update plugin generator 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 11:40:55 +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
Alexandre Bodin
3bcbde8f0b v3.0.0-beta.18.8 2020-02-26 12:01:37 +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
Edaly Ahmed
899ecb32a5 Signed-off-by: Edaly Ahmed <ahmed.edaly@oyez.fr> 
removing unecessary cast
 2020-02-25 20:11:53 +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
virginieky
10ba8df9db
Merge branch 'front/ui-improvements' into front/checkbox-description 2020-02-13 18:21:10 +01:00
Virginie Ky
054afad9e4 align the entire DOM 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 17:20:57 +01:00
cyril lopez
021f88c88f
Merge pull request #5241 from strapi/front/trash-icon 
Generalize all trash icon
 2020-02-13 13:31:07 +01:00
Edaly Ahmed
67f4712fa7 Signed-off-by: Edaly Ahmed <ahmed.edaly@oyez.fr> 
signing off
 2020-02-13 12:38:55 +01:00
Alexandre Bodin
8a6c48eb14 Merge branch 'develop' into features/single-types 2020-02-13 11:36:07 +01:00
Virginie Ky
25f83878da upload list trash icon 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-12 16:22:25 +01:00
soupette
f924a53a8a Add pluginLogo to the plugin object in order to prevent fetching the logo from github 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 17:15:53 +01:00
Alexandre Bodin
0c6d39297f Add graphql tests for single-types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:37 +01:00
Alexandre Bodin
8a970562c9 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 19:15:20 +01:00
Jim LAURIE
638ddd201e
Merge branch 'master' into update-zh-hans-translations 2020-02-07 09:56:09 +01:00
cyril lopez
8745d2373a
Merge branch 'master' into feat/update-pl-translations 2020-02-06 14:39:05 +01:00
ruibaby
ff489ce051 feat: updated zh-Hans translations. 
Signed-off-by: ruibaby <i@ryanc.cc>
 2020-02-04 15:55:02 +08:00
Virginie Ky
9c67340e42 Merge branch 'master' into develop 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-31 15:19:53 +01:00
Virginie Ky
bb9ff9e47a Merge branch 'master' into develop 2020-01-31 15:10:07 +01:00
virginieky
5acbb26573
Merge branch 'master' into webhooks/tests 2020-01-30 17:03:27 +01:00
Alexandre Bodin
761ad68392 v3.0.0-beta.18.7 2020-01-30 16:15:25 +01:00
Virginie Ky
4ff189ac00 Merge branch 'master' into develop 2020-01-29 11:35:55 +01:00
Virginie Ky
baf74d41b3 Merge branch 'master' into webhooks/tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-28 18:20:21 +01:00
Alexandre Bodin
4f5a0e7679 Cleanup eslint configs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-27 10:49:57 +01:00
soupette
96e092b300 Change the way we load plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-23 16:46:50 +01:00
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 2020-01-23 08:13:13 +01:00
Mariusz Wachowski
4e5326490e feat: updated pl translations 
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
 2020-01-22 21:54:08 +01:00
Alexandre Bodin
2ee13c0a12 v3.0.0-beta.18.5 2020-01-21 15:44:44 +01:00
Alexandre Bodin
dcc29b361b Merge branch 'develop' into features/webhooks 2020-01-13 09:41:20 +01:00
virginieky
50643f94b3
Merge branch 'master' into chore/eslint-config 2020-01-10 17:44:43 +01:00
Alexandre Bodin
d5d80ba407 Fix missing await in file remove 2020-01-10 12:04:58 +01:00
Alexandre Bodin
f28292b384 Merge branch 'develop' into features/webhooks 2020-01-09 11:09:26 +01:00
Jim LAURIE
df1fed99ec docs: update copyright date to 2020 2020-01-08 15:41:08 +01:00
soupette
c62dad2140 Improve eslint config fron front-end files 2020-01-08 12:21:47 +01:00
Alexandre Bodin
fb25e33383 Create an entity service to share between core service and content manager 2020-01-08 11:13:38 +01:00
Jaroslav Vrána
0215f64648
Merge branch 'master' into feature/adminTranslationCs 2020-01-07 19:32:32 +01:00
Alexandre Bodin
76b0dd7385 Merge branch 'features/webhooks' into webhooks/init 2020-01-07 19:17:12 +01:00