yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-17 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,371 Commits 117 Branches 489 Tags
Commit Graph

15371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
5021aabfdc Fix trads typo 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 09:17:42 +02:00
Brian Dixon
0f8d150105 Fix Typo in AWS deployment documentation 
Following the instructions to install Node.js with npm will result in node version 10 being installed instead of version 12.

Signed-off-by: bjdixon <bjdixon@gmail.com>
 2020-04-24 13:51:27 +08:00
cyril lopez
024de9ac5e
Merge pull request #5923 from strapi/tracking/front-end-events 
Add front-end media lib usage events
 2020-04-23 18:13:16 +02:00
HichamELBSI
7a4a87fa68 Merge branch 'develop' of github.com:strapi/strapi into fix/single-types-issues 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-23 17:18:14 +02:00
Astraeus-
2dafb22b5e Update authentication error documentation 
Error has a "response" property that holds the data

Signed-off-by: Astraeus- <Astraeus-@users.noreply.github.com>
 2020-04-23 16:56:52 +02:00
HichamELBSI
f07dcf3f7f Fix single types navigation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-23 15:01:51 +02:00
soupette
221ad7975b Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-23 14:51:42 +02:00
Jim LAURIE
6ef4b17262
Merge pull request #5896 from strapi/doc/upload-provider-settings 
Add a simple example of using env vars in provider config files
 2020-04-23 14:46:39 +02:00
cyril lopez
76d5860d1f
Merge pull request #5917 from strapi/front/update-buffetjs 
Update buffetjs dependency
 2020-04-23 14:40:50 +02:00
soupette
c44dd2dbd8 Add front-end media lib usage events 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-23 14:18:58 +02:00
Ky
6060c3c3ee Merge branch 'front/update-buffetjs' of github.com:strapi/strapi into front/update-buffetjs 2020-04-23 14:02:55 +02:00
Ky
36695568e2 update snapshots 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-23 14:02:32 +02:00
Ky
7392bae6a2 Merge branch 'develop' of github.com:strapi/strapi into front/update-buffetjs 2020-04-23 13:50:19 +02:00
Ky
5bdb87d429 Merge branch 'master' of github.com:strapi/strapi into front/update-buffetjs 2020-04-23 12:36:15 +02:00
virginieky
3c0427ce60
Merge branch 'develop' into front/update-buffetjs 2020-04-23 12:33:44 +02:00
soupette
8fa8b2a086 Merge branch 'master' of github.com:strapi/strapi into develop 2020-04-23 12:31:31 +02:00
Ky
ccc452e5b2 update buffetjs dependency 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-23 10:07:53 +02:00
cyril lopez
c0e065f259
Merge branch 'develop' into chore/redux 2020-04-23 09:14:40 +02:00
cyril lopez
bbbd14fb4d
Merge pull request #5895 from strapi/front/global-improvements 
Some UI fixes
 2020-04-22 16:30:34 +02:00
cyril lopez
4bfcce0c0c
Merge branch 'develop' into front/global-improvements 2020-04-22 16:08:42 +02:00
soupette
8dcaf1b065 Fix styled compo lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 15:49:51 +02:00
Pierre Noël
4b7fbadef5
fix shadow crud breaking build when resolvers are not defined in a plugin (#5899) 
* fix shadow crud breaking build when resolvers are not defined in a plugin

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-22 15:41:40 +02:00
soupette
82402432a5 Add stylelint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 15:02:33 +02:00
soupette
81454df46f Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:12 +02:00
soupette
d71235a0c1 Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:11 +02:00
soupette
a34c0ca7d9 Remove react-datetime dep and Date compo in helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:11 +02:00
soupette
dc0da4a125 Upgrade react-redux 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:10 +02:00
soupette
71eec181fe Upagrade react helmet 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:10 +02:00
soupette
ec5f4e2e96 Update documentation about language customisation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:09 +02:00
soupette
6d9bc79726 Upgrade react-intl dependency to latest 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:08 +02:00
soupette
b71647a7d7 Remove unneeded packages 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:07 +02:00
soupette
58da5fd290 Fix react-select dep in alias and upgrade it 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:07 +02:00
soupette
cf3690d41c Update documentation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:06 +02:00
soupette
0faf75124f Add deprecation warnings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:05 +02:00
soupette
13d4c58bbe Update reducer injector in all plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:05 +02:00
soupette
76e63b8dd1 Upload reducer injection in admin and cm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:04 +02:00
cyril lopez
384edaf6ad
Merge pull request #5881 from strapi/enhancement/add-appid-ctm 
Add collection API ID in the content manager edit view header
 2020-04-22 14:00:42 +02:00
cyril lopez
a5221661d8
Merge branch 'develop' into enhancement/add-appid-ctm 2020-04-22 14:00:33 +02:00
Steven Raines
bec93f672f
updated arguments sent to role controller to (#5857) 
match the expected format

Signed-off-by: Steven Raines <stevenraines@gmail.com>
 2020-04-22 11:13:48 +02:00
Ky
7dc03b61a3 apply PR review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-21 18:22:31 +02:00
Ky
6b85cb28fa Merge branch 'front/global-improvements' of github.com:strapi/strapi into front/global-improvements 2020-04-21 18:15:12 +02:00
Ky
be5746dd41 apply PR review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-21 18:14:29 +02:00
Jim LAURIE
f63e6bfeb1 docs: remove blank issue template 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-04-21 16:33:09 +02:00
virginieky
37edd0f445
Merge branch 'develop' into front/global-improvements 2020-04-21 16:02:06 +02:00
Alexandre Bodin
c9cfc59566 Add a simple example of using env vars in provider config files 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-21 14:58:02 +02:00
virginieky
091281b53c
Merge branch 'develop' into front/global-improvements 2020-04-21 14:42:22 +02:00
Ky
bf21c7614f UI fixes 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-21 14:33:03 +02:00
Derrick Mehaffy
c91cb18d2b
Comment out bad links and fix read me, add link to update guide 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-04-20 22:58:14 -07:00
Alexandre BODIN
80242c8a06
Merge pull request #5886 from strapi/fix/countResultIsNotNumber 
fix count() result not a number
 2020-04-20 19:34:10 +02:00
Pierre Noël
17e8cba03e remove useless async 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-20 16:49:36 +02:00